Index: trunk/source/GNUmakefile
===================================================================
--- trunk/source/GNUmakefile	(revision 1227)
+++ trunk/source/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.90 2009/01/23 11:06:13 gcosmo Exp $
+# $Id: GNUmakefile,v 1.95 2009/11/27 10:55:26 gcosmo Exp $
 # -----------------------------------------------------------------
 # "gmake" makes default libraries for each subdomain.
@@ -110,5 +110,10 @@
 	@$(CC) $(CCFLAGS) -o $(G4LIBDIR)/liblist $(G4INSTALL)/config/liblist.c
 
-dll: banner win32def
+clean_tmps:
+	@$(ECHO) "Clearing temporary objects ..."
+	@rm -rf $(G4LIBDIR)/*.def $(G4LIBDIR)/*.exp
+	@rm -rf $(G4TMPDIR)/*
+
+dll_build: banner win32def
 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
 	@$(ECHO) "Verifying existence of global libraries for DLLs ..."
@@ -116,7 +121,4 @@
 	@$(ECHO) "Building Windows DLL libraries ..."
 	@$(MAKE) kernel_global G4LIB_BUILD_DLL=1 G4LIB_BUILD_SHARED=1
-	@$(ECHO) "Clearing temporary DLL objects and temporaries ..."
-	@rm -rf $(G4LIBDIR)/*.def $(G4LIBDIR)/*.exp
-	@rm -rf $(G4TMPDIR)/*
 ifdef G4LIB_USE_G3TOG4
 	@for dir in $(SUBDIR4); do (cd $$dir && $(MAKE)); done;:
@@ -124,4 +126,10 @@
 endif
 	@$(ECHO) "Done !"
+endif
+
+dll:
+ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+	@$(MAKE) dll_build
+	@$(MAKE) clean_tmps
 else
 	@$(ECHO) "Sorry !"
@@ -150,5 +158,5 @@
 banner:
 	@$(ECHO) "*************************************************************"
-	@$(ECHO) " Installation Geant4 version $$Name: geant4-09-02-ref-02 $ "
+	@$(ECHO) " Installation Geant4 version $$Name: geant4-09-03 $ "
 	@$(ECHO) " Copyright (C) 1994-2009 Geant4 Collaboration                            "
 	@$(ECHO) "*************************************************************"
@@ -169,4 +177,6 @@
 	@rm -rf $(G4LIBDIR)
 	@rm -rf $(G4BINDIR)
+	@rm -rf $(G4INSTALL)/source/interfaces/*/moc
+	@rm -rf $(G4INSTALL)/source/visualization/*/moc
 	@rm -rf $(G4INSTALL)/.config/bin/$(G4SYSTEM)
 ifdef CFRONT
@@ -187,4 +197,7 @@
 	@$(ECHO) Removing $(G4INCLUDE) ...
 	@rm -rf $(G4INCLUDE)
+	@$(ECHO) Removing Qt moc source files ...
+	@rm -rf $(G4INSTALL)/source/interfaces/*/moc
+	@rm -rf $(G4INSTALL)/source/visualization/*/moc
 	@$(ECHO) Removing installation configurations ...
 	@rm -rf $(G4INSTALL)/.config
Index: trunk/source/digits_hits/History
===================================================================
--- trunk/source/digits_hits/History	(revision 1227)
+++ trunk/source/digits_hits/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.37 2008/12/28 21:13:34 asaim Exp $
+$Id: History,v 1.41 2009/11/23 18:13:28 asaim Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,25 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Nov 23, 2009, M.Asai (digits_hits-V09-02-04)
+- G4VReadOutGeometry.hh:
+  Add "virtual" to CheckROVolume() and FindROTouchable() methods and
+  change ROnavigator and touchableHistory from private to protected.
+
+Nov 13, 2009, M.Asai (digits_hits-V09-02-03)
+- Fixing the way of counting the flux and current passing through
+  a curved surface
+  - affected classes:
+      G4PSCylinderSurfaceCurrent.cc
+      G4PSCylinderSurfaceFlux.cc
+      G4PSSphereSurfaceCurrent.cc
+      G4PSSphereSurfaceFlux.cc
+
+Oct 11, 2009, M.Asai (digits_hits-V09-02-02)
+- G4VScoringMesh : Add a few Get-methods for visualization.
+
+May 06, 2009, M.Asai (digits_hits-V09-02-01)
+- Replaced usage of non-Standard calls to 'sprintf' with ostringstream,
+  to fix compilation errors reported by gcc-4.4.0 compiler.
 
 Dec 28, 2008, M.Asai (digits_hits-V09-02-00)
Index: trunk/source/digits_hits/detector/include/G4CellScoreComposer.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4CellScoreComposer.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4CellScoreComposer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScoreComposer.hh,v 1.2 2006/06/29 18:05:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/include/G4CellScoreValues.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4CellScoreValues.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4CellScoreValues.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScoreValues.hh,v 1.2 2006/06/29 18:05:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/include/G4CollectionNameVector.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4CollectionNameVector.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4CollectionNameVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CollectionNameVector.hh,v 1.2 2006/06/29 18:05:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4HCtable.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4HCtable.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4HCtable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HCtable.hh,v 1.3 2006/06/29 18:05:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4MultiFunctionalDetector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiFunctionalDetector.hh,v 1.3 2006/06/29 18:05:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4SDManager.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4SDManager.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4SDManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDManager.hh,v 1.4 2006/06/29 18:05:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4SDStructure.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4SDStructure.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4SDStructure.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDStructure.hh,v 1.3 2006/06/29 18:05:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4SDmessenger.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4SDmessenger.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4SDmessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDmessenger.hh,v 1.2 2006/06/29 18:05:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SensitiveVolumeList.hh,v 1.2 2006/06/29 18:05:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.icc
===================================================================
--- trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.icc	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4SensitiveVolumeList.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SensitiveVolumeList.icc,v 1.2 2006/06/29 18:05:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------
Index: trunk/source/digits_hits/detector/include/G4TrackLogger.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4TrackLogger.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4TrackLogger.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4TrackLogger.hh,v 1.2 2006/06/29 18:05:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/include/G4VPrimitiveScorer.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4VPrimitiveScorer.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4VPrimitiveScorer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPrimitiveScorer.hh,v 1.3 2007/08/28 07:51:45 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4VReadOutGeometry.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4VReadOutGeometry.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4VReadOutGeometry.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4VReadOutGeometry.hh,v 1.2 2006/06/29 18:05:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VReadOutGeometry.hh,v 1.3 2009/11/23 18:13:30 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
@@ -59,8 +59,8 @@
       // the G4Navigator used to navigate inside this ROGeometry.
       void BuildROGeometry();
-      G4bool CheckROVolume(G4Step*,G4TouchableHistory*&);
+      virtual G4bool CheckROVolume(G4Step*,G4TouchableHistory*&);
 
   protected:
-      G4bool FindROTouchable(G4Step*);
+      virtual G4bool FindROTouchable(G4Step*);
 
       G4VPhysicalVolume* ROworld;
@@ -69,5 +69,5 @@
       G4String name;
 
-  private:
+  protected:
       G4Navigator*        ROnavigator;
       G4TouchableHistory* touchableHistory;
Index: trunk/source/digits_hits/detector/include/G4VSDFilter.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4VSDFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4VSDFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSDFilter.hh,v 1.2 2006/06/29 18:05:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/include/G4VSensitiveDetector.hh
===================================================================
--- trunk/source/digits_hits/detector/include/G4VSensitiveDetector.hh	(revision 1227)
+++ trunk/source/digits_hits/detector/include/G4VSensitiveDetector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSensitiveDetector.hh,v 1.4 2006/06/29 18:05:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/src/G4CellScoreComposer.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4CellScoreComposer.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4CellScoreComposer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScoreComposer.cc,v 1.3 2006/06/29 18:05:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/src/G4HCtable.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4HCtable.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4HCtable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HCtable.cc,v 1.4 2006/06/29 18:05:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiFunctionalDetector.cc,v 1.5 2008/03/06 23:31:12 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4MultiFunctionalDetector
Index: trunk/source/digits_hits/detector/src/G4SDManager.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4SDManager.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4SDManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDManager.cc,v 1.4 2006/06/29 18:05:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/src/G4SDStructure.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4SDStructure.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4SDStructure.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDStructure.cc,v 1.3 2006/06/29 18:05:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/src/G4SDmessenger.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4SDmessenger.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4SDmessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDmessenger.cc,v 1.2 2006/06/29 18:05:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/src/G4SensitiveVolumeList.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4SensitiveVolumeList.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4SensitiveVolumeList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SensitiveVolumeList.cc,v 1.2 2006/06/29 18:05:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/digits_hits/detector/src/G4TrackLogger.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4TrackLogger.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4TrackLogger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackLogger.cc,v 1.3 2006/06/29 18:06:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/digits_hits/detector/src/G4VPrimitiveScorer.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4VPrimitiveScorer.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4VPrimitiveScorer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPrimitiveScorer.cc,v 1.2 2006/06/29 18:06:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VPrimitiveScorer
Index: trunk/source/digits_hits/detector/src/G4VReadOutGeometry.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4VReadOutGeometry.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4VReadOutGeometry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VReadOutGeometry.cc,v 1.2 2006/06/29 18:06:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/detector/src/G4VSDFilter.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4VSDFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4VSDFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSDFilter.cc,v 1.2 2006/06/29 18:06:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/detector/src/G4VSensitiveDetector.cc
===================================================================
--- trunk/source/digits_hits/detector/src/G4VSensitiveDetector.cc	(revision 1227)
+++ trunk/source/digits_hits/detector/src/G4VSensitiveDetector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSensitiveDetector.cc,v 1.3 2006/06/29 18:06:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/digits/include/G4DCofThisEvent.hh
===================================================================
--- trunk/source/digits_hits/digits/include/G4DCofThisEvent.hh	(revision 1227)
+++ trunk/source/digits_hits/digits/include/G4DCofThisEvent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DCofThisEvent.hh,v 1.5 2006/06/29 18:06:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/include/G4TDigiCollection.hh
===================================================================
--- trunk/source/digits_hits/digits/include/G4TDigiCollection.hh	(revision 1227)
+++ trunk/source/digits_hits/digits/include/G4TDigiCollection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TDigiCollection.hh,v 1.6 2006/06/29 18:06:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/include/G4VDigi.hh
===================================================================
--- trunk/source/digits_hits/digits/include/G4VDigi.hh	(revision 1227)
+++ trunk/source/digits_hits/digits/include/G4VDigi.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDigi.hh,v 1.4 2006/06/29 18:06:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/include/G4VDigiCollection.hh
===================================================================
--- trunk/source/digits_hits/digits/include/G4VDigiCollection.hh	(revision 1227)
+++ trunk/source/digits_hits/digits/include/G4VDigiCollection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDigiCollection.hh,v 1.3 2006/06/29 18:06:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/src/G4DCofThisEvent.cc
===================================================================
--- trunk/source/digits_hits/digits/src/G4DCofThisEvent.cc	(revision 1227)
+++ trunk/source/digits_hits/digits/src/G4DCofThisEvent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DCofThisEvent.cc,v 1.4 2006/06/29 18:06:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/src/G4TDigiCollection.cc
===================================================================
--- trunk/source/digits_hits/digits/src/G4TDigiCollection.cc	(revision 1227)
+++ trunk/source/digits_hits/digits/src/G4TDigiCollection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TDigiCollection.cc,v 1.4 2006/06/29 18:06:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/src/G4VDigi.cc
===================================================================
--- trunk/source/digits_hits/digits/src/G4VDigi.cc	(revision 1227)
+++ trunk/source/digits_hits/digits/src/G4VDigi.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDigi.cc,v 1.2 2006/06/29 18:06:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/digits/src/G4VDigiCollection.cc
===================================================================
--- trunk/source/digits_hits/digits/src/G4VDigiCollection.cc	(revision 1227)
+++ trunk/source/digits_hits/digits/src/G4VDigiCollection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDigiCollection.cc,v 1.2 2006/06/29 18:06:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/include/G4HCofThisEvent.hh
===================================================================
--- trunk/source/digits_hits/hits/include/G4HCofThisEvent.hh	(revision 1227)
+++ trunk/source/digits_hits/hits/include/G4HCofThisEvent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HCofThisEvent.hh,v 1.5 2006/06/29 18:06:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/include/G4THitsCollection.hh
===================================================================
--- trunk/source/digits_hits/hits/include/G4THitsCollection.hh	(revision 1227)
+++ trunk/source/digits_hits/hits/include/G4THitsCollection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4THitsCollection.hh,v 1.5 2006/06/29 18:06:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/include/G4THitsMap.hh
===================================================================
--- trunk/source/digits_hits/hits/include/G4THitsMap.hh	(revision 1227)
+++ trunk/source/digits_hits/hits/include/G4THitsMap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4THitsMap.hh,v 1.9 2007/08/30 05:13:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4THitsMap_h
Index: trunk/source/digits_hits/hits/include/G4VHit.hh
===================================================================
--- trunk/source/digits_hits/hits/include/G4VHit.hh	(revision 1227)
+++ trunk/source/digits_hits/hits/include/G4VHit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHit.hh,v 1.3 2006/06/29 18:06:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/include/G4VHitsCollection.hh
===================================================================
--- trunk/source/digits_hits/hits/include/G4VHitsCollection.hh	(revision 1227)
+++ trunk/source/digits_hits/hits/include/G4VHitsCollection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHitsCollection.hh,v 1.2 2006/06/29 18:06:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/src/G4HCofThisEvent.cc
===================================================================
--- trunk/source/digits_hits/hits/src/G4HCofThisEvent.cc	(revision 1227)
+++ trunk/source/digits_hits/hits/src/G4HCofThisEvent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HCofThisEvent.cc,v 1.4 2006/06/29 18:06:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/src/G4THitsCollection.cc
===================================================================
--- trunk/source/digits_hits/hits/src/G4THitsCollection.cc	(revision 1227)
+++ trunk/source/digits_hits/hits/src/G4THitsCollection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4THitsCollection.cc,v 1.4 2006/06/29 18:06:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/src/G4VHit.cc
===================================================================
--- trunk/source/digits_hits/hits/src/G4VHit.cc	(revision 1227)
+++ trunk/source/digits_hits/hits/src/G4VHit.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHit.cc,v 1.2 2006/06/29 18:06:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/hits/src/G4VHitsCollection.cc
===================================================================
--- trunk/source/digits_hits/hits/src/G4VHitsCollection.cc	(revision 1227)
+++ trunk/source/digits_hits/hits/src/G4VHitsCollection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHitsCollection.cc,v 1.2 2006/06/29 18:06:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCellCharge.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCellCharge.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCellCharge.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellCharge.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCellCharge3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCellCharge3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCellCharge3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellCharge3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCellFlux.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCellFlux.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCellFlux.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCellFlux3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCellFlux3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCellFlux3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceCurrent.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceFlux.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSDirectionFlag.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSDirectionFlag.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSDirectionFlag.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSDirectionFlag.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/digits_hits/scorer/include/G4PSDoseDeposit.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSDoseDeposit.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSDoseDeposit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSDoseDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSDoseDeposit3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSEnergyDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSEnergyDeposit3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSMinKinEAtGeneration.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSMinKinEAtGeneration3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofCollision.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofCollision.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofCollision.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofCollision.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofCollision3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofCollision3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofCollision3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofCollision3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofSecondary.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofSecondary.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofSecondary.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofSecondary.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofSecondary3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofSecondary3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofSecondary3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofSecondary3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofStep.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofStep.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofStep.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofStep.hh,v 1.2 2007/08/29 06:36:41 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSNofStep3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSNofStep3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSNofStep3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofStep3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellCurrent.hh,v 1.1 2007/08/14 21:30:45 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageTrackLength.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPopulation.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPopulation.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPopulation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPopulation.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSPopulation3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSPopulation3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSPopulation3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPopulation3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTermination.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTermination.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTermination.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTermination.hh,v 1.2 2007/12/10 16:29:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTermination3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTermination3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTermination3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTermination3D.hh,v 1.3 2007/12/10 16:29:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTrackCounter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTrackCounter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTrackCounter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackCounter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTrackCounter3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTrackCounter3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTrackCounter3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackCounter3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTrackLength.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTrackLength.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTrackLength.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackLength.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4PSTrackLength3D.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4PSTrackLength3D.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4PSTrackLength3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4SDChargedFilter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4SDChargedFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4SDChargedFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDChargedFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4SDKineticEnergyFilter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4SDKineticEnergyFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4SDKineticEnergyFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDKineticEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4SDNeutralFilter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4SDNeutralFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4SDNeutralFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDNeutralFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4SDParticleFilter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4SDParticleFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4SDParticleFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDParticleFilter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/include/G4SDParticleWithEnergyFilter.hh
===================================================================
--- trunk/source/digits_hits/scorer/include/G4SDParticleWithEnergyFilter.hh	(revision 1227)
+++ trunk/source/digits_hits/scorer/include/G4SDParticleWithEnergyFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDParticleWithEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/scorer/src/G4PSCellCharge.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCellCharge.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCellCharge.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PSCellCharge.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellCharge
Index: trunk/source/digits_hits/scorer/src/G4PSCellCharge3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCellCharge3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCellCharge3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellCharge3D.cc,v 1.3 2007/08/29 06:36:41 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellCharge3D
Index: trunk/source/digits_hits/scorer/src/G4PSCellFlux.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCellFlux.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCellFlux.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellFlux
Index: trunk/source/digits_hits/scorer/src/G4PSCellFlux3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCellFlux3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCellFlux3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCellFlux3D
Index: trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PSCylinderSurfaceCurrent.cc,v 1.2 2008/12/28 21:10:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSCylinderSurfaceCurrent.cc,v 1.3 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceCurrent
@@ -87,4 +87,5 @@
 
   G4int dirFlag =IsSelectedSurface(aStep,tubsSolid);
+  G4cout << " pos " << preStep->GetPosition() <<" dirFlag " << G4endl;
   if ( dirFlag > 0 ) {
     if ( fDirection == fCurrent_InOut || fDirection == dirFlag ){
@@ -121,7 +122,11 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
     if ( std::fabs(localpos1.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( (localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y())
-		  -(tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()) )
-       < kCarTolerance ){
+    //if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y()
+    //	  -(tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //       < kCarTolerance ){
+    G4double localR2 = localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_In;
     }
@@ -134,7 +139,11 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos2);
     if ( std::fabs(localpos2.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( (localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y()) 
-		  - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()) )
-       <kCarTolerance ){
+    //if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y() 
+    //	  - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //       <kCarTolerance ){
+    G4double localR2 = localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_Out;
     }
Index: trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceCurrent3D
Index: trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PSCylinderSurfaceFlux.cc,v 1.3 2008/12/28 21:10:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSCylinderSurfaceFlux.cc,v 1.4 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // // G4PSCylinderSurfaceFlux
@@ -144,6 +144,11 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos1);
     if ( std::fabs(localpos1.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y() ) 
-       - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())<kCarTolerance ){
+    //if(std::fabs( localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y()  
+    //   - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius()))
+    //   <kCarTolerance ){
+    G4double localR2 = localpos1.x()*localpos1.x()+localpos1.y()*localpos1.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_In;
     }
@@ -156,6 +161,11 @@
       theTouchable->GetHistory()->GetTopTransform().TransformPoint(stppos2);
     if ( std::fabs(localpos2.z()) > tubsSolid->GetZHalfLength() ) return -1;
-    if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y() ) 
-       - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())<kCarTolerance ){
+    //if(std::fabs( localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y()  
+    //   - (tubsSolid->GetInnerRadius()*tubsSolid->GetInnerRadius())) 
+    // <kCarTolerance ){
+    G4double localR2 = localpos2.x()*localpos2.x()+localpos2.y()*localpos2.y();
+    G4double InsideRadius = tubsSolid->GetInnerRadius();
+    if (localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	&&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_Out;
     }
Index: trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSCylinderSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSCylinderSurfaceFlux3D
Index: trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSDoseDeposit.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSDoseDeposit
Index: trunk/source/digits_hits/scorer/src/G4PSDoseDeposit3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSDoseDeposit3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSDoseDeposit3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSDoseDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSDoseDeposit3D
Index: trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSEnergyDeposit.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSEnergyDeposit
Index: trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSEnergyDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSEnergyDeposit3D
Index: trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceCurrent
Index: trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceCurrent3D
Index: trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceFlux
Index: trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSFlatSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSFlatSurfaceFlux3D
Index: trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSMinKinEAtGeneration.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSMinKinEAtGeneration
Index: trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSMinKinEAtGeneration3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSMinKinEAtGeneration3D
Index: trunk/source/digits_hits/scorer/src/G4PSNofCollision.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofCollision.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofCollision.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofCollision.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofCollision
Index: trunk/source/digits_hits/scorer/src/G4PSNofCollision3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofCollision3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofCollision3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofCollision3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofCollision3D
Index: trunk/source/digits_hits/scorer/src/G4PSNofSecondary.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofSecondary.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofSecondary.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofSecondary.cc,v 1.2 2007/08/14 21:23:51 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofSecondary
Index: trunk/source/digits_hits/scorer/src/G4PSNofSecondary3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofSecondary3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofSecondary3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofSecondary3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofSecondary3D
Index: trunk/source/digits_hits/scorer/src/G4PSNofStep.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofStep.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofStep.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofStep.cc,v 1.2 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofStep
Index: trunk/source/digits_hits/scorer/src/G4PSNofStep3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSNofStep3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSNofStep3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSNofStep3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSNofStep3D
Index: trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellCurrent.cc,v 1.1 2007/08/14 21:30:46 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellCurrent
Index: trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellCurrent3D
Index: trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellFlux
Index: trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageCellFlux3D
Index: trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageTrackLength
Index: trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPassageTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPassageTrackLength3D
Index: trunk/source/digits_hits/scorer/src/G4PSPopulation.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPopulation.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPopulation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPopulation.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPopulation
Index: trunk/source/digits_hits/scorer/src/G4PSPopulation3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSPopulation3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSPopulation3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSPopulation3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSPopulation3D
Index: trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PSSphereSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSSphereSurfaceCurrent.cc,v 1.4 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceCurrent
@@ -121,7 +121,10 @@
                       +localpos1.y()*localpos1.y()
                       +localpos1.z()*localpos1.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	 &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_In;
     }
@@ -136,7 +139,10 @@
                       +localpos2.y()*localpos2.y()
                       +localpos2.z()*localpos2.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	 &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fCurrent_Out;
     }
Index: trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceCurrent3D
Index: trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PSSphereSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PSSphereSurfaceFlux.cc,v 1.3 2009/11/14 00:01:13 asaim Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceFlux
@@ -149,7 +149,10 @@
                       +localpos1.y()*localpos1.y()
                       +localpos1.z()*localpos1.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	 &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_In;
     }
@@ -164,7 +167,10 @@
                       +localpos2.y()*localpos2.y()
                       +localpos2.z()*localpos2.z();
-    G4double InsideRadius2 = 
-      sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
-    if(std::fabs( localR2 - InsideRadius2 ) < kCarTolerance ){
+    //G4double InsideRadius2 = 
+    //  sphereSolid->GetInsideRadius()*sphereSolid->GetInsideRadius();
+    //if(std::facb(localR2 - InsideRadius2) ) < kCarTolerance ){
+    G4double InsideRadius = sphereSolid->GetInsideRadius();
+    if ( localR2 > (InsideRadius-kCarTolerance)*(InsideRadius-kCarTolerance)
+	 &&localR2 < (InsideRadius+kCarTolerance)*(InsideRadius+kCarTolerance)){
       return fFlux_Out;
     }
Index: trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSSphereSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSSphereSurfaceFlux3D
Index: trunk/source/digits_hits/scorer/src/G4PSTermination.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTermination.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTermination.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTermination.cc,v 1.2 2007/12/10 16:29:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTermination
Index: trunk/source/digits_hits/scorer/src/G4PSTermination3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTermination3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTermination3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTermination3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTermination3D
Index: trunk/source/digits_hits/scorer/src/G4PSTrackCounter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTrackCounter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTrackCounter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackCounter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackCounter
Index: trunk/source/digits_hits/scorer/src/G4PSTrackCounter3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTrackCounter3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTrackCounter3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackCounter3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackCounter3D
Index: trunk/source/digits_hits/scorer/src/G4PSTrackLength.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTrackLength.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTrackLength.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackLength
Index: trunk/source/digits_hits/scorer/src/G4PSTrackLength3D.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4PSTrackLength3D.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4PSTrackLength3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PSTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PSTrackLength3D
Index: trunk/source/digits_hits/scorer/src/G4SDChargedFilter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4SDChargedFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4SDChargedFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDChargedFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/scorer/src/G4SDKineticEnergyFilter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4SDKineticEnergyFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4SDKineticEnergyFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDKineticEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/scorer/src/G4SDNeutralFilter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4SDNeutralFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4SDNeutralFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDNeutralFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/scorer/src/G4SDParticleFilter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4SDParticleFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4SDParticleFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDParticleFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/scorer/src/G4SDParticleWithEnergyFilter.cc
===================================================================
--- trunk/source/digits_hits/scorer/src/G4SDParticleWithEnergyFilter.cc	(revision 1227)
+++ trunk/source/digits_hits/scorer/src/G4SDParticleWithEnergyFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SDParticleWithEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VSensitiveDetector
Index: trunk/source/digits_hits/utils/include/G4DefaultLinearColorMap.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4DefaultLinearColorMap.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4DefaultLinearColorMap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DefaultLinearColorMap.hh,v 1.1 2007/11/04 04:06:08 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4ScoreLogColorMap.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoreLogColorMap.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoreLogColorMap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoreLogColorMap.hh,v 1.1 2008/03/25 02:18:39 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4ScoreQuantityMessenger.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoreQuantityMessenger.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoreQuantityMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoreQuantityMessenger.hh,v 1.4 2007/11/06 17:17:14 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // (HISTORY)
Index: trunk/source/digits_hits/utils/include/G4ScoringBox.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoringBox.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoringBox.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringBox.hh,v 1.18 2007/11/06 09:41:34 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4ScoringCylinder.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoringCylinder.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoringCylinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringCylinder.hh,v 1.2 2008/03/23 14:32:12 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4ScoringManager.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoringManager.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoringManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringManager.hh,v 1.23 2007/11/14 20:41:17 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4ScoringMessenger.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4ScoringMessenger.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4ScoringMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringMessenger.hh,v 1.22 2008/02/29 12:23:14 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // (HISTORY)
Index: trunk/source/digits_hits/utils/include/G4VScoreColorMap.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4VScoreColorMap.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4VScoreColorMap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoreColorMap.hh,v 1.5 2008/08/29 02:50:05 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4VScoreWriter.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4VScoreWriter.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4VScoreWriter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoreWriter.hh,v 1.2 2007/11/06 09:41:34 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/include/G4VScoringMesh.hh
===================================================================
--- trunk/source/digits_hits/utils/include/G4VScoringMesh.hh	(revision 1227)
+++ trunk/source/digits_hits/utils/include/G4VScoringMesh.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoringMesh.hh,v 1.29 2009/10/12 04:11:25 akimura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4DefaultLinearColorMap.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4DefaultLinearColorMap.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4DefaultLinearColorMap.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DefaultLinearColorMap.cc,v 1.3 2008/08/29 02:50:05 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4ScoreLogColorMap.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoreLogColorMap.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoreLogColorMap.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoreLogColorMap.cc,v 1.3 2009/05/04 15:57:33 akimura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4ScoreQuantityMessenger.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoreQuantityMessenger.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoreQuantityMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoreQuantityMessenger.cc,v 1.8 2007/11/07 04:12:07 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------------
Index: trunk/source/digits_hits/utils/src/G4ScoreQuantityMessengerQCmd.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoreQuantityMessengerQCmd.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoreQuantityMessengerQCmd.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoreQuantityMessengerQCmd.cc,v 1.6 2007/11/07 04:12:07 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------------
Index: trunk/source/digits_hits/utils/src/G4ScoringBox.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoringBox.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoringBox.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringBox.cc,v 1.54 2008/08/29 02:50:05 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4ScoringCylinder.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoringCylinder.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoringCylinder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringCylinder.cc,v 1.6 2008/08/29 02:50:05 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4ScoringManager.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoringManager.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoringManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringManager.cc,v 1.31 2008/03/25 02:18:38 akimura Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4ScoringMessenger.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4ScoringMessenger.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4ScoringMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ScoringMessenger.cc,v 1.39 2008/11/26 21:27:35 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------------
Index: trunk/source/digits_hits/utils/src/G4VScoreColorMap.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4VScoreColorMap.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4VScoreColorMap.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoreColorMap.cc,v 1.4 2009/05/04 15:57:33 akimura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4VScoreWriter.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4VScoreWriter.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4VScoreWriter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoreWriter.cc,v 1.5 2008/03/04 23:19:09 taso Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/digits_hits/utils/src/G4VScoringMesh.cc
===================================================================
--- trunk/source/digits_hits/utils/src/G4VScoringMesh.cc	(revision 1227)
+++ trunk/source/digits_hits/utils/src/G4VScoringMesh.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VScoringMesh.cc,v 1.37 2009/10/12 04:11:25 akimura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/error_propagation/History
===================================================================
--- trunk/source/error_propagation/History	(revision 1227)
+++ trunk/source/error_propagation/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.13 2007/11/14 17:03:06 gcosmo Exp $
+$Id: History,v 1.15 2009/11/11 17:12:10 arce Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,10 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+11 November 2009 - P.Arce (error_propagation-V09-02-02)
+- Avoid G4ThreeVector(double) constructor in G4ErrorMagFieldLimitProcess.cc
+
+14 May 2008 - P.Arce (error_propagation-V09-02-01) 
+- Inclusion of pion+/- and proton in physics list
+- Possibility to account for error deflation (needed to make 'smoothing')
 
 14 November 2007 - G.Cosmo (error_propagation-V09-00-02)
Index: trunk/source/error_propagation/include/G4ErrorFreeTrajParam.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorFreeTrajParam.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorFreeTrajParam.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorFreeTrajParam.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorFreeTrajState.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorFreeTrajState.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorFreeTrajState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorFreeTrajState.hh,v 1.4 2007/05/31 20:27:06 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorGeomVolumeTarget.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorGeomVolumeTarget.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorGeomVolumeTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorGeomVolumeTarget.hh,v 1.3 2007/05/31 15:28:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorMagFieldLimitProcess.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorMagFieldLimitProcess.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorMagFieldLimitProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorMagFieldLimitProcess.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/error_propagation/include/G4ErrorMatrix.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorMatrix.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorMatrix.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorMatrix.hh,v 1.2 2007/06/01 12:43:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorMatrix.icc
===================================================================
--- trunk/source/error_propagation/include/G4ErrorMatrix.icc	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorMatrix.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorMatrix.icc,v 1.2 2007/06/01 12:43:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/include/G4ErrorMessenger.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorMessenger.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorMessenger.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorPhysicsList.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorPhysicsList.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorPhysicsList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPhysicsList.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorPropagator.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorPropagator.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorPropagator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagator.hh,v 1.3 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorPropagatorManager.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorPropagatorManager.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorPropagatorManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagatorManager.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorRunManagerHelper.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorRunManagerHelper.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorRunManagerHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorRunManagerHelper.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorStepLengthLimitProcess.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorStepLengthLimitProcess.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorStepLengthLimitProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorStepLengthLimitProcess.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorSurfaceTrajParam.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorSurfaceTrajParam.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorSurfaceTrajParam.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorSurfaceTrajParam.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorSurfaceTrajState.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorSurfaceTrajState.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorSurfaceTrajState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorSurfaceTrajState.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorSymMatrix.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorSymMatrix.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorSymMatrix.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorSymMatrix.hh,v 1.2 2007/06/01 12:43:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/error_propagation/include/G4ErrorSymMatrix.icc
===================================================================
--- trunk/source/error_propagation/include/G4ErrorSymMatrix.icc	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorSymMatrix.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorSymMatrix.icc,v 1.2 2007/06/01 12:43:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/include/G4ErrorTrackLengthTarget.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorTrackLengthTarget.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorTrackLengthTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTrackLengthTarget.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorTrajErr.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorTrajErr.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorTrajErr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTrajErr.hh,v 1.3 2007/05/31 20:27:07 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4ErrorTrajState.hh
===================================================================
--- trunk/source/error_propagation/include/G4ErrorTrajState.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4ErrorTrajState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTrajState.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/include/G4VErrorLimitProcess.hh
===================================================================
--- trunk/source/error_propagation/include/G4VErrorLimitProcess.hh	(revision 1227)
+++ trunk/source/error_propagation/include/G4VErrorLimitProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VErrorLimitProcess.hh,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/error_propagation/src/G4ErrorFreeTrajParam.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorFreeTrajParam.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorFreeTrajParam.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorFreeTrajParam.cc,v 1.3 2007/09/24 16:24:45 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorFreeTrajState.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorFreeTrajState.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorFreeTrajState.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4ErrorFreeTrajState.cc,v 1.7 2007/09/24 16:25:57 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ErrorFreeTrajState.cc,v 1.8 2009/05/14 13:53:06 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
@@ -203,4 +203,6 @@
 {
   G4double stepLengthCm = aTrack->GetStep()->GetStepLength()/cm;
+  if( G4ErrorPropagatorData::GetErrorPropagatorData()->GetStage() == G4ErrorStage_Deflation ) stepLengthCm *= -1.;
+
   G4double kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
 
Index: trunk/source/error_propagation/src/G4ErrorGeomVolumeTarget.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorGeomVolumeTarget.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorGeomVolumeTarget.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorGeomVolumeTarget.cc,v 1.3 2007/05/31 15:28:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorMagFieldLimitProcess.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorMagFieldLimitProcess.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorMagFieldLimitProcess.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4ErrorMagFieldLimitProcess.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ErrorMagFieldLimitProcess.cc,v 1.3 2009/11/11 17:10:33 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
@@ -78,5 +78,5 @@
     G4ThreeVector BVec(h1[0],h1[1],h1[2]);
     G4double pmag = aTrack.GetMomentum().mag();
-    G4double BPerpMom = BVec.cross( pmag ).mag() / pmag;
+    G4double BPerpMom = BVec.cross( G4ThreeVector(pmag,0.,0.) ).mag() / pmag;
 
     theStepLength = theStepLimit * pmag / BPerpMom; 
Index: trunk/source/error_propagation/src/G4ErrorMatrix.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorMatrix.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorMatrix.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorMatrix.cc,v 1.3 2007/06/21 15:04:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorMessenger.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorMessenger.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorMessenger.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorPhysicsList.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorPhysicsList.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorPhysicsList.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4ErrorPhysicsList.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ErrorPhysicsList.cc,v 1.3 2009/05/14 13:54:34 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
@@ -95,4 +95,11 @@
   G4MuonPlus::MuonPlusDefinition();
   G4MuonMinus::MuonMinusDefinition();
+
+  // pi+/-
+  G4PionPlus::PionPlusDefinition();
+  G4PionMinus::PionMinusDefinition();
+
+  // proton
+  G4Proton::ProtonDefinition();
 
 }
Index: trunk/source/error_propagation/src/G4ErrorPropagator.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorPropagator.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorPropagator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorPropagator.cc,v 1.7 2007/11/14 17:01:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorPropagatorManager.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorPropagatorManager.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorPropagatorManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorPropagatorManager.cc,v 1.3 2007/05/31 15:28:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorRunManagerHelper.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorRunManagerHelper.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorRunManagerHelper.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorRunManagerHelper.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorStepLengthLimitProcess.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorStepLengthLimitProcess.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorStepLengthLimitProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorStepLengthLimitProcess.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorSurfaceTrajParam.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorSurfaceTrajParam.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorSurfaceTrajParam.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorSurfaceTrajParam.cc,v 1.3 2007/05/31 20:22:45 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorSurfaceTrajState.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorSurfaceTrajState.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorSurfaceTrajState.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorSurfaceTrajState.cc,v 1.6 2007/06/21 15:04:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorSymMatrix.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorSymMatrix.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorSymMatrix.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorSymMatrix.cc,v 1.3 2007/06/21 15:04:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorTrackLengthTarget.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorTrackLengthTarget.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorTrackLengthTarget.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorTrackLengthTarget.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4ErrorTrajState.cc
===================================================================
--- trunk/source/error_propagation/src/G4ErrorTrajState.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4ErrorTrajState.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ErrorTrajState.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/error_propagation/src/G4VErrorLimitProcess.cc
===================================================================
--- trunk/source/error_propagation/src/G4VErrorLimitProcess.cc	(revision 1227)
+++ trunk/source/error_propagation/src/G4VErrorLimitProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VErrorLimitProcess.cc,v 1.2 2007/05/29 14:41:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/event/History
===================================================================
--- trunk/source/event/History	(revision 1227)
+++ trunk/source/event/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.120 2008/09/02 09:56:49 gcosmo Exp $
+$Id: History,v 1.127 2009/11/18 17:57:59 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,36 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Movember 18th, 2009, G.Cosmo (event-V09-02-05)
+- Fixes to "Adjoint" classes to allow build of DLLs on Windows: renamed all
+  methods and data holding "External" as keyword to "Ext".
+  Cleanup of the code: use "const G4String&" instead of "G4String" wherever
+  possible; use G4 types in consistent way; avoid usage of "isNan"; code
+  formatting cleanup; added Geant4 disclaimer.
+
+November 6, 2009, L.Desorgher (event-V09-02-04)
+- First commit of G4Adjoint calsses for event category
+  New classes are G4AdjointPosOnPhysVolGenerator,G4AdjointPrimaryGenerator, G4AdjointStackingAction
+
+September 16, 2009, M.Asai (event-V09-02-03)
+- Improved the logic in G4SmartTrackStack. 
+- Added /event/stack/verbose to have a short report of peak number of tracks in
+  the urgent stack.
+
+August 17, 2009, M.Asai (event-V09-02-02)
+- Introducing G4SmartTrackStack class. By using this new stack as the urgent stack of
+  G4StackManager, the next track poped up from the stack is not necessarily the last
+  track stored in the stack, but the track of same particle type as the previous one, 
+  as long as such a track exists in the urgent stack. This mechanism is expected to 
+  improve the performance for ultra-large scale simulation such as LHC, by increasing
+  the cashe hit rate of the physics tables.
+- The use of G4SmartTrackStack is optional. To use it, uncomment the "#define" line
+  in include/evmandefs.hh.
+
+June 29, 2009, M.Asai (event-V09-02-01)
+- Fix warning message in G4SPSEneDistribution.cc.
+
+February 17, 2009, F. Lei (event-V09-02-00)
+- Minor chnages to G4GeneralParticleSourceMessenger.cc. It now uses the full ranges of units pre-defined in G4 for length, energy and angle.
 
 September 02, 2008, G.Cosmo (event-V09-01-01)
Index: trunk/source/event/include/G4AdjointPosOnPhysVolGenerator.hh
===================================================================
--- trunk/source/event/include/G4AdjointPosOnPhysVolGenerator.hh	(revision 1227)
+++ trunk/source/event/include/G4AdjointPosOnPhysVolGenerator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointPosOnPhysVolGenerator.hh,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/include/G4AdjointPrimaryGenerator.hh
===================================================================
--- trunk/source/event/include/G4AdjointPrimaryGenerator.hh	(revision 1227)
+++ trunk/source/event/include/G4AdjointPrimaryGenerator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointPrimaryGenerator.hh,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/include/G4AdjointStackingAction.hh
===================================================================
--- trunk/source/event/include/G4AdjointStackingAction.hh	(revision 1227)
+++ trunk/source/event/include/G4AdjointStackingAction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointStackingAction.hh,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/include/G4CellScorer.hh
===================================================================
--- trunk/source/event/include/G4CellScorer.hh	(revision 1227)
+++ trunk/source/event/include/G4CellScorer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScorer.hh,v 1.2 2006/06/29 18:08:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/event/include/G4CellScorerStore.hh
===================================================================
--- trunk/source/event/include/G4CellScorerStore.hh	(revision 1227)
+++ trunk/source/event/include/G4CellScorerStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScorerStore.hh,v 1.3 2006/06/29 18:08:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/event/include/G4ClassificationOfNewTrack.hh
===================================================================
--- trunk/source/event/include/G4ClassificationOfNewTrack.hh	(revision 1227)
+++ trunk/source/event/include/G4ClassificationOfNewTrack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ClassificationOfNewTrack.hh,v 1.6 2006/06/29 18:08:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4EvManMessenger.hh
===================================================================
--- trunk/source/event/include/G4EvManMessenger.hh	(revision 1227)
+++ trunk/source/event/include/G4EvManMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvManMessenger.hh,v 1.6 2006/11/03 03:11:13 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4Event.hh
===================================================================
--- trunk/source/event/include/G4Event.hh	(revision 1227)
+++ trunk/source/event/include/G4Event.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Event.hh,v 1.17 2007/03/08 23:56:12 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4EventManager.hh
===================================================================
--- trunk/source/event/include/G4EventManager.hh	(revision 1227)
+++ trunk/source/event/include/G4EventManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EventManager.hh,v 1.22 2007/03/08 23:56:12 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4HEPEvtInterface.hh
===================================================================
--- trunk/source/event/include/G4HEPEvtInterface.hh	(revision 1227)
+++ trunk/source/event/include/G4HEPEvtInterface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPEvtInterface.hh,v 1.8 2006/06/29 18:08:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4HEPEvtParticle.hh
===================================================================
--- trunk/source/event/include/G4HEPEvtParticle.hh	(revision 1227)
+++ trunk/source/event/include/G4HEPEvtParticle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPEvtParticle.hh,v 1.9 2006/06/29 18:08:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4ParticleGun.hh
===================================================================
--- trunk/source/event/include/G4ParticleGun.hh	(revision 1227)
+++ trunk/source/event/include/G4ParticleGun.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParticleGun.hh,v 1.11 2007/11/07 17:13:19 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4ParticleGunMessenger.hh
===================================================================
--- trunk/source/event/include/G4ParticleGunMessenger.hh	(revision 1227)
+++ trunk/source/event/include/G4ParticleGunMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParticleGunMessenger.hh,v 1.10 2007/10/02 00:45:17 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/event/include/G4PrimaryTransformer.hh
===================================================================
--- trunk/source/event/include/G4PrimaryTransformer.hh	(revision 1227)
+++ trunk/source/event/include/G4PrimaryTransformer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PrimaryTransformer.hh,v 1.12 2006/06/29 18:08:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4RayShooter.hh
===================================================================
--- trunk/source/event/include/G4RayShooter.hh	(revision 1227)
+++ trunk/source/event/include/G4RayShooter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RayShooter.hh,v 1.2 2006/06/29 18:08:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4SmartTrackStack.hh
===================================================================
--- trunk/source/event/include/G4SmartTrackStack.hh	(revision 1227)
+++ trunk/source/event/include/G4SmartTrackStack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartTrackStack.hh,v 1.3 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4StackChecker.hh
===================================================================
--- trunk/source/event/include/G4StackChecker.hh	(revision 1227)
+++ trunk/source/event/include/G4StackChecker.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackChecker.hh,v 1.2 2006/06/29 18:09:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4StackManager.hh
===================================================================
--- trunk/source/event/include/G4StackManager.hh	(revision 1227)
+++ trunk/source/event/include/G4StackManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackManager.hh,v 1.13 2009/08/15 15:45:50 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4StackedTrack.hh
===================================================================
--- trunk/source/event/include/G4StackedTrack.hh	(revision 1227)
+++ trunk/source/event/include/G4StackedTrack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackedTrack.hh,v 1.10 2006/06/29 18:09:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4StackingMessenger.hh
===================================================================
--- trunk/source/event/include/G4StackingMessenger.hh	(revision 1227)
+++ trunk/source/event/include/G4StackingMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackingMessenger.hh,v 1.6 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4TrackStack.hh
===================================================================
--- trunk/source/event/include/G4TrackStack.hh	(revision 1227)
+++ trunk/source/event/include/G4TrackStack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackStack.hh,v 1.8 2009/09/10 21:31:41 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4TrajectoryContainer.hh
===================================================================
--- trunk/source/event/include/G4TrajectoryContainer.hh	(revision 1227)
+++ trunk/source/event/include/G4TrajectoryContainer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrajectoryContainer.hh,v 1.15 2006/06/29 18:09:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4UserEventAction.hh
===================================================================
--- trunk/source/event/include/G4UserEventAction.hh	(revision 1227)
+++ trunk/source/event/include/G4UserEventAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserEventAction.hh,v 1.6 2006/06/29 18:09:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/G4UserStackingAction.hh
===================================================================
--- trunk/source/event/include/G4UserStackingAction.hh	(revision 1227)
+++ trunk/source/event/include/G4UserStackingAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserStackingAction.hh,v 1.6 2006/06/29 18:09:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4VPrimaryGenerator.hh
===================================================================
--- trunk/source/event/include/G4VPrimaryGenerator.hh	(revision 1227)
+++ trunk/source/event/include/G4VPrimaryGenerator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPrimaryGenerator.hh,v 1.8 2006/06/29 18:09:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/G4VUserEventInformation.hh
===================================================================
--- trunk/source/event/include/G4VUserEventInformation.hh	(revision 1227)
+++ trunk/source/event/include/G4VUserEventInformation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VUserEventInformation.hh,v 1.2 2006/06/29 18:09:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/include/eventgendefs.hh
===================================================================
--- trunk/source/event/include/eventgendefs.hh	(revision 1227)
+++ trunk/source/event/include/eventgendefs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: eventgendefs.hh,v 1.4 2006/06/29 18:09:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef EventGenerator_DEBUG
Index: trunk/source/event/include/evmandefs.hh
===================================================================
--- trunk/source/event/include/evmandefs.hh	(revision 1227)
+++ trunk/source/event/include/evmandefs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: evmandefs.hh,v 1.7 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/include/trajectoryControl.hh
===================================================================
--- trunk/source/event/include/trajectoryControl.hh	(revision 1227)
+++ trunk/source/event/include/trajectoryControl.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: trajectoryControl.hh,v 1.4 2006/06/29 18:09:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////#define G4_STORE_TRAJECTORY 1
Index: trunk/source/event/src/G4AdjointPosOnPhysVolGenerator.cc
===================================================================
--- trunk/source/event/src/G4AdjointPosOnPhysVolGenerator.cc	(revision 1227)
+++ trunk/source/event/src/G4AdjointPosOnPhysVolGenerator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointPosOnPhysVolGenerator.cc,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/src/G4AdjointPrimaryGenerator.cc
===================================================================
--- trunk/source/event/src/G4AdjointPrimaryGenerator.cc	(revision 1227)
+++ trunk/source/event/src/G4AdjointPrimaryGenerator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointPrimaryGenerator.cc,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/src/G4AdjointStackingAction.cc
===================================================================
--- trunk/source/event/src/G4AdjointStackingAction.cc	(revision 1227)
+++ trunk/source/event/src/G4AdjointStackingAction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointStackingAction.cc,v 1.2 2009/11/18 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////
Index: trunk/source/event/src/G4CellScorer.cc
===================================================================
--- trunk/source/event/src/G4CellScorer.cc	(revision 1227)
+++ trunk/source/event/src/G4CellScorer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScorer.cc,v 1.4 2006/06/29 18:09:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/event/src/G4CellScorerStore.cc
===================================================================
--- trunk/source/event/src/G4CellScorerStore.cc	(revision 1227)
+++ trunk/source/event/src/G4CellScorerStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CellScorerStore.cc,v 1.4 2006/06/29 18:09:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/event/src/G4EvManMessenger.cc
===================================================================
--- trunk/source/event/src/G4EvManMessenger.cc	(revision 1227)
+++ trunk/source/event/src/G4EvManMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvManMessenger.cc,v 1.6 2006/11/03 03:11:13 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/event/src/G4Event.cc
===================================================================
--- trunk/source/event/src/G4Event.cc	(revision 1227)
+++ trunk/source/event/src/G4Event.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Event.cc,v 1.14 2007/03/07 02:44:16 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4EventManager.cc
===================================================================
--- trunk/source/event/src/G4EventManager.cc	(revision 1227)
+++ trunk/source/event/src/G4EventManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EventManager.cc,v 1.30 2007/03/08 23:56:12 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/src/G4HEPEvtInterface.cc
===================================================================
--- trunk/source/event/src/G4HEPEvtInterface.cc	(revision 1227)
+++ trunk/source/event/src/G4HEPEvtInterface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPEvtInterface.cc,v 1.11 2006/06/29 18:09:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/event/src/G4HEPEvtParticle.cc
===================================================================
--- trunk/source/event/src/G4HEPEvtParticle.cc	(revision 1227)
+++ trunk/source/event/src/G4HEPEvtParticle.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPEvtParticle.cc,v 1.8 2006/06/29 18:09:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/src/G4ParticleGun.cc
===================================================================
--- trunk/source/event/src/G4ParticleGun.cc	(revision 1227)
+++ trunk/source/event/src/G4ParticleGun.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParticleGun.cc,v 1.14 2007/11/07 17:13:19 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4ParticleGunMessenger.cc
===================================================================
--- trunk/source/event/src/G4ParticleGunMessenger.cc	(revision 1227)
+++ trunk/source/event/src/G4ParticleGunMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParticleGunMessenger.cc,v 1.16 2007/10/02 00:45:17 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4PrimaryTransformer.cc
===================================================================
--- trunk/source/event/src/G4PrimaryTransformer.cc	(revision 1227)
+++ trunk/source/event/src/G4PrimaryTransformer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PrimaryTransformer.cc,v 1.27 2006/06/29 18:09:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4RayShooter.cc
===================================================================
--- trunk/source/event/src/G4RayShooter.cc	(revision 1227)
+++ trunk/source/event/src/G4RayShooter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RayShooter.cc,v 1.2 2006/06/29 18:10:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4SmartTrackStack.cc
===================================================================
--- trunk/source/event/src/G4SmartTrackStack.cc	(revision 1227)
+++ trunk/source/event/src/G4SmartTrackStack.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartTrackStack.cc,v 1.3 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4StackChecker.cc
===================================================================
--- trunk/source/event/src/G4StackChecker.cc	(revision 1227)
+++ trunk/source/event/src/G4StackChecker.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackChecker.cc,v 1.2 2006/06/29 18:10:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4StackManager.cc
===================================================================
--- trunk/source/event/src/G4StackManager.cc	(revision 1227)
+++ trunk/source/event/src/G4StackManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackManager.cc,v 1.14 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/src/G4StackedTrack.cc
===================================================================
--- trunk/source/event/src/G4StackedTrack.cc	(revision 1227)
+++ trunk/source/event/src/G4StackedTrack.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackedTrack.cc,v 1.9 2006/06/29 18:10:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/event/src/G4StackingMessenger.cc
===================================================================
--- trunk/source/event/src/G4StackingMessenger.cc	(revision 1227)
+++ trunk/source/event/src/G4StackingMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StackingMessenger.cc,v 1.6 2009/09/16 23:10:46 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/event/src/G4TrackStack.cc
===================================================================
--- trunk/source/event/src/G4TrackStack.cc	(revision 1227)
+++ trunk/source/event/src/G4TrackStack.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackStack.cc,v 1.8 2009/09/10 21:31:41 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4TrajectoryContainer.cc
===================================================================
--- trunk/source/event/src/G4TrajectoryContainer.cc	(revision 1227)
+++ trunk/source/event/src/G4TrajectoryContainer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrajectoryContainer.cc,v 1.5 2006/06/29 18:10:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4UserEventAction.cc
===================================================================
--- trunk/source/event/src/G4UserEventAction.cc	(revision 1227)
+++ trunk/source/event/src/G4UserEventAction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserEventAction.cc,v 1.7 2006/06/29 18:10:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4UserStackingAction.cc
===================================================================
--- trunk/source/event/src/G4UserStackingAction.cc	(revision 1227)
+++ trunk/source/event/src/G4UserStackingAction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserStackingAction.cc,v 1.7 2006/06/29 18:10:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/event/src/G4VPrimaryGenerator.cc
===================================================================
--- trunk/source/event/src/G4VPrimaryGenerator.cc	(revision 1227)
+++ trunk/source/event/src/G4VPrimaryGenerator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPrimaryGenerator.cc,v 1.5 2006/06/29 18:10:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/g3tog4/include/G3DetTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3DetTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3DetTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3DetTable.hh,v 1.9 2006/06/29 18:11:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G3DetTable class
Index: trunk/source/g3tog4/include/G3DetTableEntry.hh
===================================================================
--- trunk/source/g3tog4/include/G3DetTableEntry.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3DetTableEntry.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3DetTableEntry.hh,v 1.6 2006/06/29 18:11:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G3DetTableEntry class
Index: trunk/source/g3tog4/include/G3Division.hh
===================================================================
--- trunk/source/g3tog4/include/G3Division.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3Division.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3Division.hh,v 1.8 2006/06/29 18:11:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3EleTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3EleTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3EleTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3EleTable.hh,v 1.8 2006/06/29 18:11:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3G4Interface.hh
===================================================================
--- trunk/source/g3tog4/include/G3G4Interface.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3G4Interface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3G4Interface.hh,v 1.10 2006/06/29 18:11:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //   Interfaces for G3 equivalent routines
Index: trunk/source/g3tog4/include/G3MatTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3MatTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3MatTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MatTable.hh,v 1.13 2006/06/29 18:11:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3MatTableEntry.hh
===================================================================
--- trunk/source/g3tog4/include/G3MatTableEntry.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3MatTableEntry.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MatTableEntry.hh,v 1.6 2006/06/29 18:11:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3MedTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3MedTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3MedTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MedTable.hh,v 1.13 2006/06/29 18:12:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3MedTableEntry.hh
===================================================================
--- trunk/source/g3tog4/include/G3MedTableEntry.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3MedTableEntry.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MedTableEntry.hh,v 1.6 2006/06/29 18:12:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3PartTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3PartTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3PartTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3PartTable.hh,v 1.10 2006/06/29 18:12:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3Pos.hh
===================================================================
--- trunk/source/g3tog4/include/G3Pos.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3Pos.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3Pos.hh,v 1.11 2006/06/29 18:12:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3RotTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3RotTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3RotTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3RotTable.hh,v 1.15 2006/06/29 18:12:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3RotTableEntry.hh
===================================================================
--- trunk/source/g3tog4/include/G3RotTableEntry.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3RotTableEntry.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3RotTableEntry.hh,v 1.6 2006/06/29 18:12:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3SensVolVector.hh
===================================================================
--- trunk/source/g3tog4/include/G3SensVolVector.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3SensVolVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3SensVolVector.hh,v 1.7 2006/06/29 18:12:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // vector of logical volumes that were defined with
Index: trunk/source/g3tog4/include/G3VolTable.hh
===================================================================
--- trunk/source/g3tog4/include/G3VolTable.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3VolTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3VolTable.hh,v 1.18 2006/06/29 18:12:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3VolTableEntry.hh
===================================================================
--- trunk/source/g3tog4/include/G3VolTableEntry.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3VolTableEntry.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3VolTableEntry.hh,v 1.9 2006/06/29 18:12:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3toG4.hh
===================================================================
--- trunk/source/g3tog4/include/G3toG4.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3toG4.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4.hh,v 1.9 2006/06/29 18:12:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/include/G3toG4BuildTree.hh
===================================================================
--- trunk/source/g3tog4/include/G3toG4BuildTree.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3toG4BuildTree.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4BuildTree.hh,v 1.8 2006/06/29 18:12:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3toG4MANY.hh
===================================================================
--- trunk/source/g3tog4/include/G3toG4MANY.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3toG4MANY.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4MANY.hh,v 1.3 2006/06/29 18:12:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3toG4MakeSolid.hh
===================================================================
--- trunk/source/g3tog4/include/G3toG4MakeSolid.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3toG4MakeSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4MakeSolid.hh,v 1.7 2006/06/29 18:12:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------
Index: trunk/source/g3tog4/include/G3toG4RotationMatrix.hh
===================================================================
--- trunk/source/g3tog4/include/G3toG4RotationMatrix.hh	(revision 1227)
+++ trunk/source/g3tog4/include/G3toG4RotationMatrix.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4RotationMatrix.hh,v 1.6 2006/06/29 18:12:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // ----------------------
 // Class description:
Index: trunk/source/g3tog4/src/G3DetTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3DetTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3DetTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3DetTable.cc,v 1.12 2006/06/29 18:12:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "globals.hh"
Index: trunk/source/g3tog4/src/G3DetTableEntry.cc
===================================================================
--- trunk/source/g3tog4/src/G3DetTableEntry.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3DetTableEntry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3DetTableEntry.cc,v 1.5 2006/06/29 18:12:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "globals.hh"
Index: trunk/source/g3tog4/src/G3Division.cc
===================================================================
--- trunk/source/g3tog4/src/G3Division.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3Division.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3Division.cc,v 1.17 2006/06/29 18:12:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi 13.10.99
Index: trunk/source/g3tog4/src/G3EleTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3EleTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3EleTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3EleTable.cc,v 1.16 2006/06/29 18:12:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/g3tog4/src/G3MatTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3MatTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3MatTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MatTable.cc,v 1.16 2006/06/29 18:12:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3MatTableEntry.cc
===================================================================
--- trunk/source/g3tog4/src/G3MatTableEntry.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3MatTableEntry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MatTableEntry.cc,v 1.4 2006/06/29 18:13:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3MedTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3MedTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3MedTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MedTable.cc,v 1.15 2006/06/29 18:13:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3MedTableEntry.cc
===================================================================
--- trunk/source/g3tog4/src/G3MedTableEntry.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3MedTableEntry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3MedTableEntry.cc,v 1.4 2006/06/29 18:13:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3NegVolPars.cc
===================================================================
--- trunk/source/g3tog4/src/G3NegVolPars.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3NegVolPars.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3NegVolPars.cc,v 1.13 2006/06/29 18:13:08 gunter Exp $ 
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I. Hrivnacova, 13.10.99 
Index: trunk/source/g3tog4/src/G3PartTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3PartTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3PartTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3PartTable.cc,v 1.14 2006/06/29 18:13:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/g3tog4/src/G3Pos.cc
===================================================================
--- trunk/source/g3tog4/src/G3Pos.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3Pos.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3Pos.cc,v 1.9 2006/06/29 18:13:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/G3RotTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3RotTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3RotTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3RotTable.cc,v 1.16 2006/06/29 18:13:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3RotTableEntry.cc
===================================================================
--- trunk/source/g3tog4/src/G3RotTableEntry.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3RotTableEntry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3RotTableEntry.cc,v 1.4 2006/06/29 18:13:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G3VolTable.cc
===================================================================
--- trunk/source/g3tog4/src/G3VolTable.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3VolTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3VolTable.cc,v 1.22 2006/06/29 18:13:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/G3VolTableEntry.cc
===================================================================
--- trunk/source/g3tog4/src/G3VolTableEntry.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3VolTableEntry.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3VolTableEntry.cc,v 1.12 2006/06/29 18:13:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/G3toG4BuildTree.cc
===================================================================
--- trunk/source/g3tog4/src/G3toG4BuildTree.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3toG4BuildTree.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4BuildTree.cc,v 1.20 2006/06/29 18:13:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I. Hrivnacova, 2.8.99 
Index: trunk/source/g3tog4/src/G3toG4MANY.cc
===================================================================
--- trunk/source/g3tog4/src/G3toG4MANY.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3toG4MANY.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4MANY.cc,v 1.2 2006/06/29 18:13:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // By I. Hrivnacova, 22.10.01 
Index: trunk/source/g3tog4/src/G3toG4MakeSolid.cc
===================================================================
--- trunk/source/g3tog4/src/G3toG4MakeSolid.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3toG4MakeSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4MakeSolid.cc,v 1.10 2006/06/29 18:13:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 
Index: trunk/source/g3tog4/src/G3toG4RotationMatrix.cc
===================================================================
--- trunk/source/g3tog4/src/G3toG4RotationMatrix.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G3toG4RotationMatrix.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G3toG4RotationMatrix.cc,v 1.4 2006/06/29 18:13:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G3toG4RotationMatrix.hh"
Index: trunk/source/g3tog4/src/G4BuildGeom.cc
===================================================================
--- trunk/source/g3tog4/src/G4BuildGeom.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4BuildGeom.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BuildGeom.cc,v 1.17 2006/06/29 18:13:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I. Hrivnacova, 13.10.99 
Index: trunk/source/g3tog4/src/G4ggclos.cc
===================================================================
--- trunk/source/g3tog4/src/G4ggclos.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4ggclos.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ggclos.cc,v 1.8 2006/06/29 18:13:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gsatt.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsatt.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsatt.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsatt.cc,v 1.13 2006/06/29 18:13:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "globals.hh"
Index: trunk/source/g3tog4/src/G4gsbool.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsbool.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsbool.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsbool.cc,v 1.2 2006/06/29 18:13:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 13.10.01
Index: trunk/source/g3tog4/src/G4gsdet.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdet.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdet.cc,v 1.5 2006/06/29 18:13:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "globals.hh"
Index: trunk/source/g3tog4/src/G4gsdeta.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdeta.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdeta.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdeta.cc,v 1.6 2006/06/29 18:13:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/g3tog4/src/G4gsdetd.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdetd.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdetd.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdetd.cc,v 1.8 2006/06/29 18:13:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gsdeth.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdeth.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdeth.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdeth.cc,v 1.8 2006/06/29 18:13:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gsdetu.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdetu.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdetu.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdetu.cc,v 1.6 2006/06/29 18:13:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gsdetv.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdetv.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdetv.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdetv.cc,v 1.10 2006/06/29 18:13:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4ios.hh"
Index: trunk/source/g3tog4/src/G4gsdk.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdk.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdk.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdk.cc,v 1.7 2006/06/29 18:13:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4Decay.hh"
Index: trunk/source/g3tog4/src/G4gsdvn.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdvn.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdvn.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdvn.cc,v 1.10 2006/06/29 18:13:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
Index: trunk/source/g3tog4/src/G4gsdvn2.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdvn2.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdvn2.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdvn2.cc,v 1.8 2006/06/29 18:14:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
Index: trunk/source/g3tog4/src/G4gsdvt.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdvt.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdvt.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdvt.cc,v 1.7 2006/06/29 18:14:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
Index: trunk/source/g3tog4/src/G4gsdvt2.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdvt2.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdvt2.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdvt2.cc,v 1.7 2006/06/29 18:14:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
Index: trunk/source/g3tog4/src/G4gsdvx.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsdvx.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsdvx.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsdvx.cc,v 1.5 2006/06/29 18:14:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, V.Berejnoi, 27 Sep 99
Index: trunk/source/g3tog4/src/G4gsmate.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsmate.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsmate.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsmate.cc,v 1.12 2006/06/29 18:14:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G4gsmixt.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsmixt.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsmixt.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsmixt.cc,v 1.13 2006/06/29 18:14:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 27 Sep 99
Index: trunk/source/g3tog4/src/G4gspart.cc
===================================================================
--- trunk/source/g3tog4/src/G4gspart.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gspart.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gspart.cc,v 1.7 2006/06/29 18:14:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4ProcessManager.hh"
Index: trunk/source/g3tog4/src/G4gspos.cc
===================================================================
--- trunk/source/g3tog4/src/G4gspos.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gspos.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gspos.cc,v 1.13 2006/06/29 18:14:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/G4gsposp.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsposp.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsposp.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsposp.cc,v 1.16 2006/06/29 18:14:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/G4gsrotm.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsrotm.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsrotm.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsrotm.cc,v 1.12 2006/06/29 18:14:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gstmed.cc
===================================================================
--- trunk/source/g3tog4/src/G4gstmed.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gstmed.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gstmed.cc,v 1.7 2006/06/29 18:15:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // The last G4int argument of G4gstmed(..) is used for sending
Index: trunk/source/g3tog4/src/G4gstpar.cc
===================================================================
--- trunk/source/g3tog4/src/G4gstpar.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gstpar.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gstpar.cc,v 1.8 2006/06/29 18:15:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G3toG4.hh"
Index: trunk/source/g3tog4/src/G4gsvolu.cc
===================================================================
--- trunk/source/g3tog4/src/G4gsvolu.cc	(revision 1227)
+++ trunk/source/g3tog4/src/G4gsvolu.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4gsvolu.cc,v 1.10 2006/06/29 18:15:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by I.Hrivnacova, 13.10.99
Index: trunk/source/g3tog4/src/clparse.cc
===================================================================
--- trunk/source/g3tog4/src/clparse.cc	(revision 1227)
+++ trunk/source/g3tog4/src/clparse.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: clparse.cc,v 1.19 2008/11/17 08:33:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // modified by I.Hrivnacova
Index: trunk/source/geometry/biasing/include/G4GeometryCell.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCell.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCell.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCell.hh,v 1.6 2006/06/29 18:15:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4GeometryCellComp.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCellComp.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCellComp.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellComp.hh,v 1.2 2006/06/29 18:15:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4GeometryCellImportance.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCellImportance.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCellImportance.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellImportance.hh,v 1.4 2006/06/29 18:15:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4GeometryCellStep.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCellStep.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCellStep.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellStep.hh,v 1.2 2006/06/29 18:15:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4GeometryCellStepStream.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCellStepStream.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCellStepStream.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellStepStream.hh,v 1.3 2006/06/29 18:15:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4GeometryCellWeight.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4GeometryCellWeight.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4GeometryCellWeight.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellWeight.hh,v 1.3 2006/06/29 18:16:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4IStore.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4IStore.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4IStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IStore.hh,v 1.10 2006/06/29 18:16:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4ImportanceAlgorithm.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4ImportanceAlgorithm.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4ImportanceAlgorithm.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceAlgorithm.hh,v 1.7 2006/06/29 18:16:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4Nsplit_Weight.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4Nsplit_Weight.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4Nsplit_Weight.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Nsplit_Weight.hh,v 1.11 2006/06/29 18:16:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VCellScorer.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VCellScorer.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VCellScorer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCellScorer.hh,v 1.7 2006/06/29 18:16:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VCellScorerStore.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VCellScorerStore.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VCellScorerStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCellScorerStore.hh,v 1.7 2006/06/29 18:16:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VGCellFinder.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VGCellFinder.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VGCellFinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGCellFinder.hh,v 1.2 2006/06/29 18:16:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VIStore.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VIStore.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VIStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIStore.hh,v 1.9 2006/06/29 18:16:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VImportanceAlgorithm.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VImportanceAlgorithm.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VImportanceAlgorithm.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VImportanceAlgorithm.hh,v 1.8 2006/06/29 18:16:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VImportanceSplitExaminer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VImportanceSplitExaminer.hh,v 1.5 2006/06/29 18:16:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VWeightWindowAlgorithm.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VWeightWindowAlgorithm.hh,v 1.8 2006/06/29 18:16:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4VWeightWindowStore.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4VWeightWindowStore.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4VWeightWindowStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VWeightWindowStore.hh,v 1.3 2006/06/29 18:16:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4WeightWindowAlgorithm.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowAlgorithm.hh,v 1.7 2006/06/29 18:16:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/include/G4WeightWindowStore.hh
===================================================================
--- trunk/source/geometry/biasing/include/G4WeightWindowStore.hh	(revision 1227)
+++ trunk/source/geometry/biasing/include/G4WeightWindowStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowStore.hh,v 1.3 2006/06/29 18:17:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4GeometryCell.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4GeometryCell.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4GeometryCell.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCell.cc,v 1.6 2006/06/29 18:17:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4GeometryCellComp.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4GeometryCellComp.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4GeometryCellComp.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GeometryCellComp.cc,v 1.4 2006/06/29 18:17:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4GeometryCellImportance.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4GeometryCellImportance.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4GeometryCellImportance.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellImportance.cc,v 1.5 2006/06/29 18:17:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4GeometryCellStep.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4GeometryCellStep.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4GeometryCellStep.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellStep.cc,v 1.2 2006/06/29 18:17:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4GeometryCellStepStream.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4GeometryCellStepStream.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4GeometryCellStepStream.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryCellStepStream.cc,v 1.3 2006/06/29 18:17:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4IStore.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4IStore.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4IStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IStore.cc,v 1.14 2006/06/29 18:17:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4ImportanceAlgorithm.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4ImportanceAlgorithm.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4ImportanceAlgorithm.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceAlgorithm.cc,v 1.14 2006/06/29 18:17:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4Nsplit_Weight.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4Nsplit_Weight.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4Nsplit_Weight.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Nsplit_Weight.cc,v 1.10 2006/06/29 18:17:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VCellScorer.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VCellScorer.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VCellScorer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCellScorer.cc,v 1.6 2006/06/29 18:17:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VCellScorerStore.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VCellScorerStore.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VCellScorerStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCellScorerStore.cc,v 1.4 2006/06/29 18:17:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VGCellFinder.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VGCellFinder.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VGCellFinder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGCellFinder.cc,v 1.2 2006/06/29 18:17:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VIStore.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VIStore.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VIStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIStore.cc,v 1.2 2006/06/29 18:17:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VImportanceAlgorithm.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VImportanceAlgorithm.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VImportanceAlgorithm.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VImportanceAlgorithm.cc,v 1.2 2006/06/29 18:17:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VImportanceSplitExaminer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VImportanceSplitExaminer.cc,v 1.2 2006/06/29 18:17:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VWeightWindowAlgorithm.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VWeightWindowAlgorithm.cc,v 1.2 2006/06/29 18:17:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4VWeightWindowStore.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4VWeightWindowStore.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4VWeightWindowStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VWeightWindowStore.cc,v 1.3 2006/06/29 18:17:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4WeightWindowAlgorithm.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowAlgorithm.cc,v 1.11 2007/11/09 15:43:07 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/biasing/src/G4WeightWindowStore.cc
===================================================================
--- trunk/source/geometry/biasing/src/G4WeightWindowStore.cc	(revision 1227)
+++ trunk/source/geometry/biasing/src/G4WeightWindowStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowStore.cc,v 1.5 2006/06/29 18:18:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/divisions/History
===================================================================
--- trunk/source/geometry/divisions/History	(revision 1227)
+++ trunk/source/geometry/divisions/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.30 2008/12/04 16:01:32 gcosmo Exp $
+$Id: History,v 1.31 2009/05/20 08:55:23 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,14 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+May, 20th, 2009         I.Hrivnacova (geomdiv-V09-02-00)
+- Allow for generic divisions along Z for polyhedras and polycones; now
+  divisions can happen along z-axis with width and offset, which fulfil the
+  condition that division does not span over more than one segment.
+- Fixed initialization of division in Phi for polyhedras to not take into
+  account user defined width.
+- Fixed initialization of arrays in unit test: changed polycone definition
+  so that division does not give exception and added polyhedra, which was
+  not present.
 
 December, 3rd, 2008     P.Arce  (geomdiv-V09-01-02)
Index: trunk/source/geometry/divisions/include/G4PVDivision.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4PVDivision.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4PVDivision.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVDivision.hh,v 1.14 2008/12/03 16:41:45 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // class G4PVDivision
Index: trunk/source/geometry/divisions/include/G4PVDivisionFactory.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4PVDivisionFactory.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4PVDivisionFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVDivisionFactory.hh,v 1.2 2006/06/29 18:18:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/divisions/include/G4ParameterisationBox.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationBox.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationBox.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationBox.hh,v 1.6 2006/06/29 18:18:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // classes G4ParameterisationBoxX,
Index: trunk/source/geometry/divisions/include/G4ParameterisationCons.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationCons.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationCons.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationCons.hh,v 1.6 2006/06/29 18:18:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // classes G4ParameterisationConsRho,
Index: trunk/source/geometry/divisions/include/G4ParameterisationPara.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationPara.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationPara.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationPara.hh,v 1.7 2006/06/29 18:18:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // classes G4ParameterisationParaX,
Index: trunk/source/geometry/divisions/include/G4ParameterisationPolycone.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationPolycone.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationPolycone.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ParameterisationPolycone.hh,v 1.7 2006/06/29 18:18:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParameterisationPolycone.hh,v 1.8 2009/05/14 14:19:32 ivana Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // classes G4ParameterisationPolyconeRho,
@@ -192,5 +192,13 @@
                             const G4VPhysicalVolume* physVol ) const;
 
-  private:  // Dummy declarations to get rid of warnings ...
+  private:  
+    G4double GetR(G4double z, G4double z1, G4double r1, G4double z2, G4double r2) const;
+    G4double GetRmin(G4double z, G4int nsegment) const;
+    G4double GetRmax(G4double z, G4int nsegment) const;
+
+    G4int fNSegment;
+    G4PolyconeHistorical* fOrigParamMother;
+
+    // Dummy declarations to get rid of warnings ...
 
     void ComputeDimensions (G4Trd&,const G4int,
Index: trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ParameterisationPolyhedra.hh,v 1.8 2006/06/29 18:18:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParameterisationPolyhedra.hh,v 1.9 2009/05/14 14:19:32 ivana Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // classes G4ParameterisationPolyhedraRho,
@@ -200,6 +200,13 @@
                             const G4VPhysicalVolume* physVol ) const;
 
-  private:  // Dummy declarations to get rid of warnings ...
-
+  private: 
+    G4double GetR(G4double z, G4double z1, G4double r1, G4double z2, G4double r2) const;
+    G4double GetRmin(G4double z, G4int nsegment) const;
+    G4double GetRmax(G4double z, G4int nsegment) const;
+
+    G4int fNSegment;
+    G4PolyhedraHistorical* fOrigParamMother;
+
+    // Dummy declarations to get rid of warnings ...
     void ComputeDimensions (G4Trd&,const G4int,
                             const G4VPhysicalVolume*) const {}
Index: trunk/source/geometry/divisions/include/G4ParameterisationTrd.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationTrd.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationTrd.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationTrd.hh,v 1.8 2008/12/03 16:48:48 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // classes G4ParameterisationTrdX
Index: trunk/source/geometry/divisions/include/G4ParameterisationTubs.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4ParameterisationTubs.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4ParameterisationTubs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationTubs.hh,v 1.6 2006/06/29 18:18:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // classes G4ParameterisationTubsRho
Index: trunk/source/geometry/divisions/include/G4VDivisionParameterisation.hh
===================================================================
--- trunk/source/geometry/divisions/include/G4VDivisionParameterisation.hh	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4VDivisionParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDivisionParameterisation.hh,v 1.11 2007/05/11 13:26:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VDivisionParameterisation
Index: trunk/source/geometry/divisions/include/G4VDivisionParameterisation.icc
===================================================================
--- trunk/source/geometry/divisions/include/G4VDivisionParameterisation.icc	(revision 1227)
+++ trunk/source/geometry/divisions/include/G4VDivisionParameterisation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDivisionParameterisation.icc,v 1.4 2006/06/29 18:18:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VDivisionParameterisation Inline Implementation file
Index: trunk/source/geometry/divisions/src/G4PVDivision.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4PVDivision.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4PVDivision.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVDivision.cc,v 1.22 2008/12/03 16:41:45 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4PVDivision Implementation file
Index: trunk/source/geometry/divisions/src/G4PVDivisionFactory.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4PVDivisionFactory.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4PVDivisionFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVDivisionFactory.cc,v 1.2 2006/06/29 18:18:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4PVDivisionFactory Implementation file
Index: trunk/source/geometry/divisions/src/G4ParameterisationBox.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationBox.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationBox.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationBox.cc,v 1.10 2006/06/29 18:18:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationBox Implementation file
Index: trunk/source/geometry/divisions/src/G4ParameterisationCons.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationCons.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationCons.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationCons.cc,v 1.9 2006/06/29 18:18:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationCons Implementation file
Index: trunk/source/geometry/divisions/src/G4ParameterisationPara.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationPara.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationPara.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationPara.cc,v 1.11 2006/06/29 18:18:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationPara Implementation file
Index: trunk/source/geometry/divisions/src/G4ParameterisationPolycone.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationPolycone.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationPolycone.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ParameterisationPolycone.cc,v 1.15 2006/06/29 18:18:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParameterisationPolycone.cc,v 1.17 2009/05/18 19:30:29 ivana Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationPolycone Implementation file
@@ -355,5 +355,7 @@
                              G4double width, G4double offset,
                              G4VSolid* msolid, DivisionType divType)
-  : G4VParameterisationPolycone( axis, nDiv, width, offset, msolid, divType )
+  : G4VParameterisationPolycone( axis, nDiv, width, offset, msolid, divType ),
+    fNSegment(0),
+    fOrigParamMother(((G4Polycone*)fmotherSolid)->GetOriginalParameters())
 {
 
@@ -361,18 +363,15 @@
   SetType( "DivisionPolyconeZ" );
 
-  G4Polycone* msol = (G4Polycone*)(fmotherSolid);
-  G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
-  
   if( divType == DivWIDTH )
   {
     fnDiv =
-      CalculateNDiv( origparamMother->Z_values[origparamMother->Num_z_planes-1]
-                     - origparamMother->Z_values[0] , width, offset );
+      CalculateNDiv( fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+                     - fOrigParamMother->Z_values[0] , width, offset );
   }
   else if( divType == DivNDIV )
   {
     fwidth =
-      CalculateNDiv( origparamMother->Z_values[origparamMother->Num_z_planes-1]
-                     - origparamMother->Z_values[0] , nDiv, offset );
+      CalculateNDiv( fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+                     - fOrigParamMother->Z_values[0] , nDiv, offset );
   }
   
@@ -394,10 +393,45 @@
 
 //------------------------------------------------------------------------
+G4double G4ParameterisationPolyconeZ::GetR(G4double z, 
+                                           G4double z1, G4double r1,  
+                                           G4double z2, G4double r2) const
+{
+  // Linear parameterisation: 
+  // r = az + b
+  // a = (r1 - r2)/(z1-z2)
+  // b = r1 - a*z1
+
+  return (r1-r2)/(z1-z2)*z + ( r1 - (r1-r2)/(z1-z2)*z1 ) ;
+}  
+                                           
+//------------------------------------------------------------------------
+G4double G4ParameterisationPolyconeZ::GetRmin(G4double z, G4int nseg) const
+{
+// Get Rmin in the given z position for the given polycone segment 
+
+  return GetR(z, 
+              fOrigParamMother->Z_values[nseg], 
+              fOrigParamMother->Rmin[nseg],
+              fOrigParamMother->Z_values[nseg+1], 
+              fOrigParamMother->Rmin[nseg+1]);
+}  
+                                           
+//------------------------------------------------------------------------
+G4double G4ParameterisationPolyconeZ::GetRmax(G4double z, G4int nseg) const
+{
+// Get Rmax in the given z position for the given polycone segment 
+
+  return GetR(z, 
+              fOrigParamMother->Z_values[nseg], 
+              fOrigParamMother->Rmax[nseg],
+              fOrigParamMother->Z_values[nseg+1], 
+              fOrigParamMother->Rmax[nseg+1]);
+}  
+                                           
+//------------------------------------------------------------------------
 G4double G4ParameterisationPolyconeZ::GetMaxParameter() const
 {
-  G4Polycone* msol = (G4Polycone*)(fmotherSolid);
-  G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
-  return std::abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
-             -origparamMother->Z_values[0]);
+  return std::abs (fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+             -fOrigParamMother->Z_values[0]);
 }
 
@@ -406,46 +440,94 @@
 {
   G4VDivisionParameterisation::CheckParametersValidity();
-
-  G4Polycone* msol = (G4Polycone*)(fmotherSolid);
-
-  if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH )
-  {
-    G4cerr << "WARNING - "
-           << "G4ParameterisationPolyconeZ::CheckParametersValidity()"
-           << G4endl
-           << "          Solid " << msol->GetName() << G4endl
-           << "          Division along Z will be done splitting in the "
-           << "defined z_planes." << G4endl
-           << "          WIDTH will not be used !" << G4endl;
-  }
-
-  if( foffset != 0. )
-  {
-    G4cerr << "WARNING - "
-           << "G4ParameterisationPolyconeZ::CheckParametersValidity()"
-           << G4endl
-           << "          Solid " << msol->GetName() << G4endl
-           << "          Division along Z will be done splitting in the "
-           << "defined z_planes." << G4endl
-           << "          OFFSET will not be used !" << G4endl;
-  }
-
-  G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
-
-  if( origparamMother->Num_z_planes-1 != fnDiv )
-  { 
-    G4cerr << "ERROR - "
-           << "G4ParameterisationPolyconeZ::CheckParametersValidity()"
-           << G4endl
-           << "        Division along Z will be done splitting in the defined"
-           << G4endl
-           << "        z_planes, i.e, the number of division would be :"
-           << "        " << origparamMother->Num_z_planes-1
-           << " instead of " << fnDiv << " !"
-           << G4endl; 
-    G4Exception("G4ParameterisationPolyconeZ::CheckParametersValidity()",
+  
+  // Division will be following the mother polycone segments
+  if( fDivisionType == DivNDIV ) {
+    if( fnDiv > fOrigParamMother->Num_z_planes-1 ) { 
+      G4cerr << "ERROR - "
+             << "G4ParameterisationPolyconeZ::CheckParametersValidity()"
+             << G4endl
+             << "        Division along Z will be done splitting in the defined"
+             << G4endl
+             << "        z_planes, i.e, the number of division would be :"
+             << "        " << fOrigParamMother->Num_z_planes-1
+             << " instead of " << fnDiv << " !"
+             << G4endl; 
+      G4Exception("G4ParameterisationPolyconeZ::CheckParametersValidity()",
                 "IllegalConstruct", FatalException,
                 "Not supported configuration.");
-  }
+    }
+  }  
+     
+  // Division will be done within one polycone segment
+  // with applying given width and offset
+  if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    // Check if divided region does not span over more
+    // than one z segment
+  
+    G4int isegstart = -1;  // number of the segment containing start position
+    G4int isegend = -1;    // number of the segment containing end position
+
+    if ( ! fReflectedSolid ) {
+      // The start/end position of the divided region
+      G4double zstart 
+        = fOrigParamMother->Z_values[0] + foffset;
+      G4double zend 
+        = fOrigParamMother->Z_values[0] + foffset + fnDiv* fwidth;
+   
+      G4int counter = 0;
+      while ( isegend < 0 && counter < fOrigParamMother->Num_z_planes-1 ) {
+        // first segment
+        if ( zstart >= fOrigParamMother->Z_values[counter]  &&
+             zstart  < fOrigParamMother->Z_values[counter+1] ) {
+           isegstart = counter;
+        }     
+        // last segment
+        if ( zend  > fOrigParamMother->Z_values[counter] &&
+             zend <= fOrigParamMother->Z_values[counter+1] ) {
+          isegend = counter;
+        }   
+        ++counter;   
+      }
+    }
+    else  {
+      // The start/end position of the divided region
+      G4double zstart 
+        = fOrigParamMother->Z_values[0] - foffset;
+      G4double zend 
+        = fOrigParamMother->Z_values[0] - ( foffset + fnDiv* fwidth);
+   
+      G4int counter = 0;
+      while ( isegend < 0 && counter < fOrigParamMother->Num_z_planes-1 ) {
+        // first segment
+        if ( zstart <= fOrigParamMother->Z_values[counter]  &&
+             zstart  > fOrigParamMother->Z_values[counter+1] ) {
+           isegstart = counter;
+        }     
+        // last segment
+        if ( zend  < fOrigParamMother->Z_values[counter] &&
+             zend >= fOrigParamMother->Z_values[counter+1] ) {
+           isegend = counter;
+        }   
+        ++counter;   
+      }
+    }
+      
+  
+    if ( isegstart != isegend ) {
+      G4cerr << "WARNING - "
+             << "G4ParameterisationPolyconeZ::CheckParametersValidity()"
+             << G4endl
+             << "          Division with user defined width." << G4endl
+             << "          Solid " << fmotherSolid->GetName() << G4endl
+             << "          Divided region is not between two z planes." 
+             << G4endl;
+ 
+      G4Exception("G4ParameterisationPolyconeZ::CheckParametersValidity()",
+                  "IllegalConstruct", FatalException,
+                  "Not supported configuration.");
+    }
+  
+    fNSegment = isegstart;
+  }  
 }
 
@@ -455,12 +537,23 @@
 ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol) const
 {
-  G4Polycone* msol = (G4Polycone*)(GetMotherSolid());
-
-  //----- set translation: along Z axis
-  G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
-  G4double posi = (origparamMother->Z_values[copyNo]
-                   + origparamMother->Z_values[copyNo+1])/2;
-  G4ThreeVector origin(0.,0.,posi); 
-  physVol->SetTranslation( origin );
+  if ( fDivisionType == DivNDIV ) {
+    // The position of the centre of copyNo-th mother polycone segment
+    G4double posi 
+      = ( fOrigParamMother->Z_values[copyNo]
+        + fOrigParamMother->Z_values[copyNo+1])/2;
+    physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
+  }
+  
+  if ( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    // The position of the centre of copyNo-th division
+    G4double posi = fOrigParamMother->Z_values[0];
+      
+    if ( ! fReflectedSolid )  
+      posi += foffset + (2*copyNo + 1) * fwidth/2.;
+    else
+      posi -= foffset + (2*copyNo + 1) * fwidth/2.;
+    
+    physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
+  }   
 
   //----- calculate rotation matrix: unit
@@ -494,21 +587,68 @@
                    const G4VPhysicalVolume* ) const
 {
-  // only for mother number of planes = 2!!
-  //
-  G4Polycone* msol = (G4Polycone*)(fmotherSolid);
-
-  G4PolyconeHistorical* origparamMother = msol->GetOriginalParameters();
-  G4PolyconeHistorical origparam( *origparamMother );
-
-  G4double posi = (origparamMother->Z_values[copyNo]
-                   + origparamMother->Z_values[copyNo+1])/2;
-
-  origparam.Num_z_planes = 2;
-  origparam.Z_values[0] = origparamMother->Z_values[copyNo] - posi;
-  origparam.Z_values[1] = origparamMother->Z_values[copyNo+1] - posi;
-  origparam.Rmin[0] = origparamMother->Rmin[copyNo];
-  origparam.Rmin[1] = origparamMother->Rmin[copyNo+1];
-  origparam.Rmax[0] = origparamMother->Rmax[copyNo];
-  origparam.Rmax[1] = origparamMother->Rmax[copyNo+1];
+
+  // Define division solid
+  G4PolyconeHistorical origparam;
+  G4int nz = 2; 
+  origparam.Num_z_planes = nz;
+  origparam.Start_angle = fOrigParamMother->Start_angle;
+  origparam.Opening_angle = fOrigParamMother->Opening_angle;
+
+  // Define division solid z sections
+  origparam.Z_values = new G4double[nz];
+  origparam.Rmin = new G4double[nz];
+  origparam.Rmax = new G4double[nz];
+
+  if ( fDivisionType == DivNDIV ) {
+    // The position of the centre of copyNo-th mother polycone segment
+    G4double posi = (fOrigParamMother->Z_values[copyNo]
+                   + fOrigParamMother->Z_values[copyNo+1])/2;
+
+    origparam.Z_values[0] = fOrigParamMother->Z_values[copyNo] - posi;
+    origparam.Z_values[1] = fOrigParamMother->Z_values[copyNo+1] - posi;
+    origparam.Rmin[0] = fOrigParamMother->Rmin[copyNo];
+    origparam.Rmin[1] = fOrigParamMother->Rmin[copyNo+1];
+    origparam.Rmax[0] = fOrigParamMother->Rmax[copyNo];
+    origparam.Rmax[1] = fOrigParamMother->Rmax[copyNo+1];
+  }
+  
+  if ( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    if ( ! fReflectedSolid ) {
+      origparam.Z_values[0] = - fwidth/2.;
+      origparam.Z_values[1] = fwidth/2.;
+
+      // The position of the centre of copyNo-th division
+      G4double posi 
+        = fOrigParamMother->Z_values[0] + foffset + (2*copyNo + 1) * fwidth/2.;
+    
+      // The first and last z sides z values
+      G4double zstart = posi - fwidth/2.;
+      G4double zend = posi + fwidth/2.;
+      origparam.Rmin[0] = GetRmin(zstart, fNSegment); 
+      origparam.Rmax[0] = GetRmax(zstart, fNSegment);  
+      origparam.Rmin[1] = GetRmin(zend, fNSegment); 
+      origparam.Rmax[1] = GetRmax(zend, fNSegment);  
+    }
+    else {
+      origparam.Z_values[0] = fwidth/2.;
+      origparam.Z_values[1] = - fwidth/2.;
+
+      // The position of the centre of copyNo-th division
+      G4double posi 
+        = fOrigParamMother->Z_values[0] - ( foffset + (2*copyNo + 1) * fwidth/2.);
+    
+      // The first and last z sides z values
+      G4double zstart = posi + fwidth/2.;
+      G4double zend = posi - fwidth/2.;
+      origparam.Rmin[0] = GetRmin(zstart, fNSegment); 
+      origparam.Rmax[0] = GetRmax(zstart, fNSegment);  
+      origparam.Rmin[1] = GetRmin(zend, fNSegment); 
+      origparam.Rmax[1] = GetRmax(zend, fNSegment);  
+    }
+
+    // It can happen due to rounding errors
+    if ( origparam.Rmin[0]    < 0.0 ) origparam.Rmin[0] = 0.0;
+    if ( origparam.Rmin[nz-1] < 0.0 ) origparam.Rmin[1] = 0.0;
+  }  
 
   pcone.SetOriginalParameters(&origparam);  // copy values & transfer pointers
Index: trunk/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ParameterisationPolyhedra.cc,v 1.16 2007/05/18 07:27:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParameterisationPolyhedra.cc,v 1.19 2009/05/20 08:35:52 ivana Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationPolyhedra Implementation file
@@ -288,10 +288,8 @@
   if( divType == DivWIDTH )
   {
-    fnDiv = CalculateNDiv( deltaPhi, width, offset );
-  }
-  else if( divType == DivNDIV )
-  {
-    fwidth = CalculateWidth( deltaPhi, nDiv, offset );
-  }
+    fnDiv = msol->GetNumSide();
+  }
+
+  fwidth = CalculateWidth( deltaPhi, fnDiv, 0.0 );
 
 #ifdef G4DIVDEBUG
@@ -348,5 +346,5 @@
   G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
 
-  if( origparamMother->numSide != fnDiv )
+  if( origparamMother->numSide != fnDiv &&  fDivisionType != DivWIDTH)
   { 
     G4cerr << "ERROR - "
@@ -433,23 +431,22 @@
                              G4double width, G4double offset,
                              G4VSolid* msolid, DivisionType divType )
-  :  G4VParameterisationPolyhedra( axis, nDiv, width, offset, msolid, divType )
+  :  G4VParameterisationPolyhedra( axis, nDiv, width, offset, msolid, divType ),
+     fNSegment(0),
+     fOrigParamMother(((G4Polyhedra*)fmotherSolid)->GetOriginalParameters())
 { 
   CheckParametersValidity();
   SetType( "DivisionPolyhedraZ" );
 
-  G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
-  G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
-  
   if( divType == DivWIDTH )
     {
     fnDiv =
-      CalculateNDiv( origparamMother->Z_values[origparamMother->Num_z_planes-1]
-                     - origparamMother->Z_values[0] , width, offset );
+      CalculateNDiv( fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+                     - fOrigParamMother->Z_values[0] , width, offset );
   }
   else if( divType == DivNDIV )
     {
     fwidth =
-      CalculateNDiv( origparamMother->Z_values[origparamMother->Num_z_planes-1]
-                     - origparamMother->Z_values[0] , nDiv, offset );
+      CalculateNDiv( fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+                     - fOrigParamMother->Z_values[0] , nDiv, offset );
   }
   
@@ -471,10 +468,45 @@
 
 //------------------------------------------------------------------------
+G4double G4ParameterisationPolyhedraZ::GetR(G4double z, 
+                                           G4double z1, G4double r1,  
+                                           G4double z2, G4double r2) const
+{
+  // Linear parameterisation: 
+  // r = az + b
+  // a = (r1 - r2)/(z1-z2)
+  // b = r1 - a*z1
+
+  return (r1-r2)/(z1-z2)*z + ( r1 - (r1-r2)/(z1-z2)*z1 ) ;
+}  
+                                           
+//------------------------------------------------------------------------
+G4double G4ParameterisationPolyhedraZ::GetRmin(G4double z, G4int nseg) const
+{
+// Get Rmin in the given z position for the given polyhedra segment 
+
+  return GetR(z, 
+              fOrigParamMother->Z_values[nseg], 
+              fOrigParamMother->Rmin[nseg],
+              fOrigParamMother->Z_values[nseg+1], 
+              fOrigParamMother->Rmin[nseg+1]);
+}  
+                                           
+//------------------------------------------------------------------------
+G4double G4ParameterisationPolyhedraZ::GetRmax(G4double z, G4int nseg) const
+{
+// Get Rmax in the given z position for the given polyhedra segment 
+
+  return GetR(z, 
+              fOrigParamMother->Z_values[nseg], 
+              fOrigParamMother->Rmax[nseg],
+              fOrigParamMother->Z_values[nseg+1], 
+              fOrigParamMother->Rmax[nseg+1]);
+}  
+                                           
+//------------------------------------------------------------------------
 G4double G4ParameterisationPolyhedraZ::GetMaxParameter() const
 {
-  G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
-  G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
-  return std::abs (origparamMother->Z_values[origparamMother->Num_z_planes-1]
-             -origparamMother->Z_values[0]);
+  return std::abs (fOrigParamMother->Z_values[fOrigParamMother->Num_z_planes-1]
+             -fOrigParamMother->Z_values[0]);
 }
 
@@ -484,45 +516,92 @@
   G4VDivisionParameterisation::CheckParametersValidity();
 
-  G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
-
-  if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH )
-  {
-    G4cerr << "WARNING - "
-           << "G4ParameterisationPolyhedraZ::CheckParametersValidity()"
-           << G4endl
-           << "          Solid " << msol->GetName() << G4endl
-           << "          Division along Z will be done splitting "
-           << "in the defined z_planes." << G4endl
-           << "          WIDTH will not be used !" << G4endl;
-  }
-
-  if( foffset != 0. )
-  {
-    G4cerr << "WARNING - "
-           << "G4ParameterisationPolyhedraZ::CheckParametersValidity()"
-           << G4endl
-           << "          Solid " << msol->GetName() << G4endl
-           << "          Division along Z will be done splitting "
-           << "in the defined z_planes." << G4endl
-           << "          OFFSET will not be used !" << G4endl;
-  }
-
-  G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
-
-  if( origparamMother->Num_z_planes-1 != fnDiv )
-  { 
-    G4cerr << "ERROR - "
-           << "G4ParameterisationPolyhedraZ::CheckParametersValidity()"
-           << G4endl
-           << "        Division along Z will be done splitting in the defined"
-           << G4endl
-           << "        z_planes, i.e, the number of division would be :"
-           << "        " << origparamMother->Num_z_planes-1
-           << " instead of " << fnDiv << " !"
-           << G4endl; 
-    G4Exception("G4ParameterisationPolyhedraZ::CheckParametersValidity()",
-                "IllegalConstruct", FatalException,
-                "Not supported configuration.");
-  }
+  // Division will be following the mother polyhedra segments
+  if( fDivisionType == DivNDIV ) {
+    if( fOrigParamMother->Num_z_planes-1 != fnDiv ) { 
+      G4cerr << "ERROR - "
+             << "G4ParameterisationPolyhedraZ::CheckParametersValidity()"
+             << G4endl
+             << "        Division along Z will be done splitting in the defined"
+             << G4endl
+             << "        z_planes, i.e, the number of division would be :"
+             << "        " << fOrigParamMother->Num_z_planes-1
+             << " instead of " << fnDiv << " !"
+             << G4endl; 
+      G4Exception("G4ParameterisationPolyhedraZ::CheckParametersValidity()",
+                  "IllegalConstruct", FatalException,
+                  "Not supported configuration.");
+    }
+  }  
+
+  // Division will be done within one polyhedra segment
+  // with applying given width and offset
+  if( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    // Check if divided region does not span over more
+    // than one z segment
+
+    G4int isegstart = -1;  // number of the segment containing start position
+    G4int isegend = -1;    // number of the segment containing end position
+
+    if ( ! fReflectedSolid ) {
+      // The start/end position of the divided region
+      G4double zstart 
+        = fOrigParamMother->Z_values[0] + foffset;
+      G4double zend 
+        = fOrigParamMother->Z_values[0] + foffset + fnDiv* fwidth;
+   
+      G4int counter = 0;
+      while ( isegend < 0 && counter < fOrigParamMother->Num_z_planes-1 ) {
+        // first segment
+        if ( zstart >= fOrigParamMother->Z_values[counter]  &&
+             zstart  < fOrigParamMother->Z_values[counter+1] ) {
+           isegstart = counter;
+        }     
+        // last segment
+        if ( zend  > fOrigParamMother->Z_values[counter] &&
+             zend <= fOrigParamMother->Z_values[counter+1] ) {
+           isegend = counter;
+        }   
+        ++counter;   
+      }
+    }
+    else  {
+      // The start/end position of the divided region
+      G4double zstart 
+        = fOrigParamMother->Z_values[0] - foffset;
+      G4double zend 
+        = fOrigParamMother->Z_values[0] - ( foffset + fnDiv* fwidth);
+   
+      G4int counter = 0;
+      while ( isegend < 0 && counter < fOrigParamMother->Num_z_planes-1 ) {
+        // first segment
+        if ( zstart <= fOrigParamMother->Z_values[counter]  &&
+             zstart  > fOrigParamMother->Z_values[counter+1] ) {
+           isegstart = counter;
+        }     
+        // last segment
+        if ( zend  < fOrigParamMother->Z_values[counter] &&
+             zend >= fOrigParamMother->Z_values[counter+1] ) {
+           isegend = counter;
+        }   
+        ++counter;   
+      }
+    }
+  
+    if ( isegstart != isegend ) {
+      G4cerr << "WARNING - "
+             << "G4ParameterisationPolyhedraZ::CheckParametersValidity()"
+             << G4endl
+             << "          Division with user defined width." << G4endl
+             << "          Solid " << fmotherSolid->GetName() << G4endl
+             << "          Divided region is not between two z planes." 
+             << G4endl;
+ 
+      G4Exception("G4ParameterisationPolyhedraZ::CheckParametersValidity()",
+                  "IllegalConstruct", FatalException,
+                  "Not supported configuration.");
+    }
+  
+    fNSegment = isegstart;
+  }  
 }
 
@@ -532,12 +611,23 @@
 ComputeTransformation( const G4int copyNo, G4VPhysicalVolume* physVol) const
 {
-  G4Polyhedra* msol = (G4Polyhedra*)(GetMotherSolid());
-
-  //----- set translation: along Z axis
-  G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
-  G4double posi = (origparamMother->Z_values[copyNo]
-                   + origparamMother->Z_values[copyNo+1])/2;
-  G4ThreeVector origin(0.,0.,posi); 
-  physVol->SetTranslation( origin );
+  if ( fDivisionType == DivNDIV ) {
+    // The position of the centre of copyNo-th mother polycone segment
+    G4double posi = ( fOrigParamMother->Z_values[copyNo]
+                    + fOrigParamMother->Z_values[copyNo+1])/2;
+    physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
+  }
+  
+  if ( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    // The position of the centre of copyNo-th division
+
+    G4double posi = fOrigParamMother->Z_values[0];
+    
+    if ( ! fReflectedSolid )
+      posi += foffset + (2*copyNo + 1) * fwidth/2.;
+    else
+      posi -= foffset + (2*copyNo + 1) * fwidth/2.;
+    
+    physVol->SetTranslation( G4ThreeVector(0, 0, posi) );
+  }   
 
   //----- calculate rotation matrix: unit
@@ -571,21 +661,70 @@
                    const G4VPhysicalVolume* ) const
 {
-  // only for mother number of planes = 2!!
-  //
-  G4Polyhedra* msol = (G4Polyhedra*)(fmotherSolid);
-
-  G4PolyhedraHistorical* origparamMother = msol->GetOriginalParameters();
-  G4PolyhedraHistorical origparam( *origparamMother );
-
-  G4double posi = (origparamMother->Z_values[copyNo]
-                   + origparamMother->Z_values[copyNo+1])/2;
-
-  origparam.Num_z_planes = 2;
-  origparam.Z_values[0] = origparamMother->Z_values[copyNo] - posi;
-  origparam.Z_values[1] = origparamMother->Z_values[copyNo+1] - posi;
-  origparam.Rmin[0] = origparamMother->Rmin[copyNo];
-  origparam.Rmin[1] = origparamMother->Rmin[copyNo+1];
-  origparam.Rmax[0] = origparamMother->Rmax[copyNo];
-  origparam.Rmax[1] = origparamMother->Rmax[copyNo+1];
+  // Define division solid
+  G4PolyhedraHistorical origparam;
+  G4int nz = 2; 
+  origparam.Num_z_planes = nz;
+  origparam.numSide = fOrigParamMother->numSide;
+  origparam.Start_angle = fOrigParamMother->Start_angle;
+  origparam.Opening_angle = fOrigParamMother->Opening_angle;
+
+  // Define division solid z sections
+  origparam.Z_values = new G4double[nz];
+  origparam.Rmin = new G4double[nz];
+  origparam.Rmax = new G4double[nz];
+  origparam.Z_values[0] = - fwidth/2.;
+  origparam.Z_values[1] = fwidth/2.;
+
+  if ( fDivisionType == DivNDIV ) {
+    // The position of the centre of copyNo-th mother polycone segment
+    G4double posi = ( fOrigParamMother->Z_values[copyNo]
+                    + fOrigParamMother->Z_values[copyNo+1])/2;
+
+    origparam.Z_values[0] = fOrigParamMother->Z_values[copyNo] - posi;
+    origparam.Z_values[1] = fOrigParamMother->Z_values[copyNo+1] - posi;
+    origparam.Rmin[0] = fOrigParamMother->Rmin[copyNo];
+    origparam.Rmin[1] = fOrigParamMother->Rmin[copyNo+1];
+    origparam.Rmax[0] = fOrigParamMother->Rmax[copyNo];
+    origparam.Rmax[1] = fOrigParamMother->Rmax[copyNo+1];
+  }  
+
+  if ( fDivisionType == DivNDIVandWIDTH || fDivisionType == DivWIDTH ) {
+    if ( ! fReflectedSolid ) {
+      origparam.Z_values[0] = - fwidth/2.;
+      origparam.Z_values[1] = fwidth/2.;
+
+      // The position of the centre of copyNo-th division
+      G4double posi 
+        = fOrigParamMother->Z_values[0] + foffset + (2*copyNo + 1) * fwidth/2.;
+    
+      // The first and last z sides z values
+      G4double zstart = posi - fwidth/2.;
+      G4double zend = posi + fwidth/2.;
+      origparam.Rmin[0] = GetRmin(zstart, fNSegment); 
+      origparam.Rmax[0] = GetRmax(zstart, fNSegment);  
+      origparam.Rmin[1] = GetRmin(zend, fNSegment); 
+      origparam.Rmax[1] = GetRmax(zend, fNSegment); 
+    }
+    else {   
+      origparam.Z_values[0] = fwidth/2.;
+      origparam.Z_values[1] = - fwidth/2.;
+
+      // The position of the centre of copyNo-th division
+      G4double posi 
+        = fOrigParamMother->Z_values[0] - ( foffset + (2*copyNo + 1) * fwidth/2.);
+    
+      // The first and last z sides z values
+      G4double zstart = posi + fwidth/2.;
+      G4double zend = posi - fwidth/2.;
+      origparam.Rmin[0] = GetRmin(zstart, fNSegment); 
+      origparam.Rmax[0] = GetRmax(zstart, fNSegment);  
+      origparam.Rmin[1] = GetRmin(zend, fNSegment); 
+      origparam.Rmax[1] = GetRmax(zend, fNSegment); 
+    } 
+
+    // It can happen due to rounding errors
+    if ( origparam.Rmin[0]    < 0.0 ) origparam.Rmin[0] = 0.0;
+    if ( origparam.Rmin[nz-1] < 0.0 ) origparam.Rmin[1] = 0.0;
+  }  
 
   phedra.SetOriginalParameters(&origparam);  // copy values & transfer pointers
Index: trunk/source/geometry/divisions/src/G4ParameterisationTrd.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationTrd.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationTrd.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationTrd.cc,v 1.16 2008/12/18 12:57:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationTrd Implementation file
Index: trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4ParameterisationTubs Implementation file
Index: trunk/source/geometry/divisions/src/G4VDivisionParameterisation.cc
===================================================================
--- trunk/source/geometry/divisions/src/G4VDivisionParameterisation.cc	(revision 1227)
+++ trunk/source/geometry/divisions/src/G4VDivisionParameterisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDivisionParameterisation.cc,v 1.14 2008/12/03 16:41:15 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VDivisionParameterisation Implementation file
Index: trunk/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4CashKarpRKF45.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4CashKarpRKF45.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CashKarpRKF45.hh,v 1.11 2008/01/11 15:23:54 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ChordFinder.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ChordFinder.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ChordFinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChordFinder.hh,v 1.21 2008/10/29 14:17:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/magneticfield/include/G4ChordFinder.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ChordFinder.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ChordFinder.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChordFinder.icc,v 1.14 2008/10/29 14:34:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4ChordFinder inline implementations
Index: trunk/source/geometry/magneticfield/include/G4ChordFinderSaf.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ChordFinderSaf.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ChordFinderSaf.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ChordFinderSaf.hh,v 1.4 2008/09/12 16:12:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/magneticfield/include/G4ClassicalRK4.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ClassicalRK4.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ClassicalRK4.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ClassicalRK4.hh,v 1.10 2006/06/29 18:21:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ConstRK4.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ConstRK4.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ConstRK4.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConstRK4.hh,v 1.2 2008/10/29 14:17:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/magneticfield/include/G4DELPHIMagField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4DELPHIMagField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4DELPHIMagField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DELPHIMagField.hh,v 1.4 2006/06/29 18:21:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ElectricField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ElectricField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ElectricField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElectricField.hh,v 1.2 2006/06/29 18:21:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ElectroMagneticField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ElectroMagneticField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElectroMagneticField.hh,v 1.11 2006/06/29 18:22:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4EqEMFieldWithSpin.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4EqEMFieldWithSpin.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4EqEMFieldWithSpin.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EqEMFieldWithSpin.hh,v 1.3 2008/11/14 13:37:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4EqMagElectricField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4EqMagElectricField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4EqMagElectricField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EqMagElectricField.hh,v 1.9 2006/06/29 18:22:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4EquationOfMotion.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4EquationOfMotion.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4EquationOfMotion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EquationOfMotion.hh,v 1.10 2006/06/29 18:22:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4EquationOfMotion.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4EquationOfMotion.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4EquationOfMotion.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EquationOfMotion.icc,v 1.9 2006/06/29 18:22:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ErrorMag_UsualEqRhs.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ErrorMag_UsualEqRhs.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ErrorMag_UsualEqRhs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorMag_UsualEqRhs.hh,v 1.1 2007/05/16 12:54:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ExactHelixStepper.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ExactHelixStepper.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ExactHelixStepper.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ExactHelixStepper.hh,v 1.5 2007/05/18 12:50:31 tnikitin Exp $ 
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ExplicitEuler.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ExplicitEuler.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ExplicitEuler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExplicitEuler.hh,v 1.9 2006/06/29 18:22:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4Field.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4Field.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4Field.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Field.hh,v 1.10 2006/06/29 18:22:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4FieldManager.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4FieldManager.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4FieldManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FieldManager.hh,v 1.16 2006/06/29 18:22:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  
Index: trunk/source/geometry/magneticfield/include/G4FieldManager.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4FieldManager.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4FieldManager.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FieldManager.icc,v 1.12 2006/06/29 18:22:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4FieldManagerStore.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4FieldManagerStore.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4FieldManagerStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FieldManagerStore.hh,v 1.3 2008/01/17 09:39:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4FieldManagerStore
Index: trunk/source/geometry/magneticfield/include/G4FieldTrack.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4FieldTrack.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4FieldTrack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FieldTrack.hh,v 1.21 2006/11/13 18:24:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4FieldTrack.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4FieldTrack.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4FieldTrack.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FieldTrack.icc,v 1.21 2006/11/13 18:24:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4HarmonicPolMagField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HarmonicPolMagField.hh,v 1.4 2006/06/29 18:22:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4HarmonicPolMagField
Index: trunk/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HelixExplicitEuler.hh,v 1.9 2007/08/21 08:52:00 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4HelixHeum.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4HelixHeum.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4HelixHeum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HelixHeum.hh,v 1.8 2006/06/29 18:22:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HelixImplicitEuler.hh,v 1.8 2006/06/29 18:22:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HelixSimpleRunge.hh,v 1.7 2006/06/29 18:22:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4ImplicitEuler.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4ImplicitEuler.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4ImplicitEuler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImplicitEuler.hh,v 1.8 2006/06/29 18:22:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4LineCurrentMagField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4LineCurrentMagField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4LineCurrentMagField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LineCurrentMagField.hh,v 1.4 2006/06/29 18:22:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4LineSection.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4LineSection.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4LineSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LineSection.hh,v 1.9 2006/06/29 18:22:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4MagErrorStepper.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagErrorStepper.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagErrorStepper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagErrorStepper.hh,v 1.11 2006/06/29 18:22:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4MagErrorStepper.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagErrorStepper.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagErrorStepper.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagErrorStepper.icc,v 1.13 2006/06/29 18:22:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4MagHelicalStepper.hh,v 1.15 2007/08/21 08:48:28 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagHelicalStepper.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagHelicalStepper.icc,v 1.13 2007/05/18 15:45:15 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Linear Step in regions of no field
Index: trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagIntegratorDriver.hh,v 1.20 2007/05/10 10:10:05 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagIntegratorDriver.icc,v 1.13 2007/05/10 10:10:48 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4MagIntegratorStepper.hh,v 1.12 2006/09/20 09:31:01 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4MagIntegratorStepper.hh,v 1.14 2009/11/05 18:31:15 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -75,10 +75,18 @@
        // over the segment last integrated.
 
+     virtual void ComputeRightHandSide( const G4double y[], G4double dydx[] ); 
+       // Must compute the RightHandSide as in the method below
+       // Optionally can cache the input y[] and the dydx[] values computed.
+
      inline void NormaliseTangentVector( G4double vec[6] );
        // Simple utility function to (re)normalise 'unit velocity' vector.
+
+     inline void NormalisePolarizationVector( G4double vec[12] );
+       // Simple utility function to (re)normalise 'unit spin' vector.
 
      inline void RightHandSide( const double y[], double dydx[] );   
        // Utility method to supply the standard Evaluation of the
        // Right Hand side of the associated equation.
+
 
      inline G4int  GetNumberOfVariables() const;
Index: trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4MagIntegratorStepper.icc,v 1.10 2006/09/20 09:31:46 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4MagIntegratorStepper.icc,v 1.12 2009/03/25 15:29:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
@@ -37,5 +37,6 @@
  G4MagIntegratorStepper::SetEquationOfMotion(G4EquationOfMotion* newEquation)
 {
-  if( newEquation != 0 ) {
+  if( newEquation != 0 )
+  {
     fEquation_Rhs= newEquation;
   }
@@ -55,10 +56,4 @@
 }
 
-// inline
-// void G4MagIntegratorStepper::SetNumberOfVariables(G4int newNo)
-// {
-//   fNumberOfVariables = newNo;
-// }
-
 inline
 void G4MagIntegratorStepper::RightHandSide( const  double y[], double dydx[] )   
@@ -70,10 +65,25 @@
 void G4MagIntegratorStepper::NormaliseTangentVector( G4double vec[6] )
 {
-   double drds2 = vec[3]*vec[3]+vec[4]*vec[4]+vec[5]*vec[5];
+  G4double drds2 = vec[3]*vec[3]+vec[4]*vec[4]+vec[5]*vec[5];
 
-   if( std::fabs(drds2 - 1.0) > 1.e-14 ){
-      double normx = 1.0 / std::sqrt(drds2);
-      for(int i=0;i<3;i++) 
-	 vec[i+3] *= normx;   
-   }
+  if( std::fabs(drds2 - 1.0) > 1.e-14 )
+  {
+    G4double normx = 1.0 / std::sqrt(drds2);
+    for(G4int i=3;i<6;i++) { vec[i] *= normx; }
+  }
 }
+
+inline
+void G4MagIntegratorStepper::NormalisePolarizationVector( G4double vec[12] )
+{
+  G4double drds2 = vec[9]*vec[9]+vec[10]*vec[10]+vec[11]*vec[11];
+
+  if( drds2 > 0. )
+  {
+    if( std::fabs(drds2 - 1.0) > 1.e-14 )
+    {
+      G4double normx = 1.0 / std::sqrt(drds2);
+      for(G4int i=9;i<12;i++)  { vec[i] *= normx; }
+    }
+  }
+}
Index: trunk/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4Mag_EqRhs.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4Mag_EqRhs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mag_EqRhs.hh,v 1.9 2006/06/29 18:23:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mag_SpinEqRhs.hh,v 1.11 2006/06/29 18:23:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mag_UsualEqRhs.hh,v 1.7 2006/06/29 18:23:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4MagneticField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4MagneticField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4MagneticField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MagneticField.hh,v 1.14 2006/06/29 18:23:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4QuadrupoleMagField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuadrupoleMagField.hh,v 1.4 2006/06/29 18:23:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4RKG3_Stepper.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4RKG3_Stepper.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4RKG3_Stepper.hh,v 1.13 2007/05/18 12:44:02 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4SimpleHeum.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4SimpleHeum.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4SimpleHeum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleHeum.hh,v 1.8 2006/06/29 18:23:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4SimpleRunge.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4SimpleRunge.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4SimpleRunge.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleRunge.hh,v 1.8 2006/06/29 18:23:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/magneticfield/include/G4UniformElectricField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4UniformElectricField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4UniformElectricField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UniformElectricField.hh,v 1.9 2006/06/29 18:23:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/magneticfield/include/G4UniformMagField.hh
===================================================================
--- trunk/source/geometry/magneticfield/include/G4UniformMagField.hh	(revision 1227)
+++ trunk/source/geometry/magneticfield/include/G4UniformMagField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UniformMagField.hh,v 1.9 2006/06/29 18:23:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/History
===================================================================
--- trunk/source/geometry/management/History	(revision 1227)
+++ trunk/source/geometry/management/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.131 2008/09/23 13:10:55 gcosmo Exp $
+$Id: History,v 1.138 2009/11/27 16:34:53 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,29 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+November 27, 2009  G.Cosmo                 geommng-V09-02-05
+- G4Region: added pointer to field-manager and associated accessor/modifier.
+
+November 6, 2009  G.Cosmo                  geommng-V09-02-04
+- G4VTouchable: moved inline vitual methods, constructor and destructor to
+  source, to avoid problem of memory alignment in allocation of derived objects.
+
+October 30, 2009  G.Cosmo                  geommng-V09-02-03
+- Clear possible excess capacity in node vectors in G4SmartVoxelHeader
+  BuildNodes() method. May reduce excess memory allocated in optimisation
+  in large detector setups, with slight time increase in initialisation for
+  geometry voxelisation.
+
+September 24, 2009  G.Cosmo                geommng-V09-02-02
+- Fixed implementation of G4LogicalVolume::TotalVolumeEntities() to become
+  invariant to call sequence.
+
+May 25, 2009  G.Cosmo                      geommng-V09-02-01
+- Fixed initialisation of min/max extent in method BuildReplicaVoxels() in
+  G4SmartVoxelHeader.
+
+April 16, 2009  G.Cosmo                    geommng-V09-02-00
+- Adopt 'const' references for strings as arguments/return-values in
+  G4LogicalSurface. Some minor cleanup...
 
 September 23, 2008  G. Cosmo               geommng-V09-01-08
Index: trunk/source/geometry/management/include/G4AffineTransform.hh
===================================================================
--- trunk/source/geometry/management/include/G4AffineTransform.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4AffineTransform.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AffineTransform.hh,v 1.6 2006/06/29 18:30:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4AffineTransform.icc
===================================================================
--- trunk/source/geometry/management/include/G4AffineTransform.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4AffineTransform.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AffineTransform.icc,v 1.8 2006/06/29 18:30:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4BlockingList.hh
===================================================================
--- trunk/source/geometry/management/include/G4BlockingList.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4BlockingList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BlockingList.hh,v 1.4 2006/06/29 18:30:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4BlockingList
Index: trunk/source/geometry/management/include/G4BlockingList.icc
===================================================================
--- trunk/source/geometry/management/include/G4BlockingList.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4BlockingList.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BlockingList.icc,v 1.3 2006/06/29 18:30:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4ErrorCylSurfaceTarget.hh
===================================================================
--- trunk/source/geometry/management/include/G4ErrorCylSurfaceTarget.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ErrorCylSurfaceTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorCylSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4ErrorPlaneSurfaceTarget.hh
===================================================================
--- trunk/source/geometry/management/include/G4ErrorPlaneSurfaceTarget.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ErrorPlaneSurfaceTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPlaneSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4ErrorSurfaceTarget.hh
===================================================================
--- trunk/source/geometry/management/include/G4ErrorSurfaceTarget.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ErrorSurfaceTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorSurfaceTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4ErrorTanPlaneTarget.hh
===================================================================
--- trunk/source/geometry/management/include/G4ErrorTanPlaneTarget.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ErrorTanPlaneTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTanPlaneTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4ErrorTarget.hh
===================================================================
--- trunk/source/geometry/management/include/G4ErrorTarget.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ErrorTarget.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTarget.hh,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4GeometryManager.hh
===================================================================
--- trunk/source/geometry/management/include/G4GeometryManager.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4GeometryManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryManager.hh,v 1.12 2007/05/11 13:30:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GeometryManager
Index: trunk/source/geometry/management/include/G4IdentityTrajectoryFilter.hh
===================================================================
--- trunk/source/geometry/management/include/G4IdentityTrajectoryFilter.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4IdentityTrajectoryFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IdentityTrajectoryFilter.hh,v 1.3 2006/06/29 18:30:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4LogicalSurface.hh
===================================================================
--- trunk/source/geometry/management/include/G4LogicalSurface.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4LogicalSurface.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4LogicalSurface.hh,v 1.10 2006/06/29 18:30:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4LogicalSurface.hh,v 1.11 2009/04/21 15:18:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -86,25 +86,23 @@
    void     SetSurfaceProperty(G4SurfaceProperty* ptrSurfaceProperty);
 
-   G4String GetName() const;
+   const G4String& GetName() const;
    void     SetName(const G4String& name);
 
    G4TransitionRadiationSurface*  GetTransitionRadiationSurface() const;
-   void SetTransitionRadiationSurface(G4TransitionRadiationSurface* transRadSurf);
+   void SetTransitionRadiationSurface(G4TransitionRadiationSurface* tRadSurf);
+
+ public:  // without description
+
+   virtual ~G4LogicalSurface();
+
+   G4int operator==(const G4LogicalSurface &right) const;
+   G4int operator!=(const G4LogicalSurface &right) const;
 
  protected:
 
-        // There should be no instances of this class
+   // There should be no instances of this class
 
-   G4LogicalSurface(const G4String&         name,
-                    G4SurfaceProperty* surfaceProperty); 
-        // Is the name more meaningful for the properties or the logical
-        // surface ?  
-
- public:
-   virtual ~G4LogicalSurface();
-
- public:
-   G4int operator==(const G4LogicalSurface &right) const;
-   G4int operator!=(const G4LogicalSurface &right) const;
+   G4LogicalSurface(const G4String& name, G4SurfaceProperty* surfaceProperty); 
+     // Is the name more meaningful for the properties or the logical surface ?
 
  private:
@@ -117,5 +115,5 @@
    G4String theName;              // Surface name
 
-   G4SurfaceProperty*              theSurfaceProperty;
+   G4SurfaceProperty*             theSurfaceProperty;
    G4TransitionRadiationSurface*  theTransRadSurface;
 };
Index: trunk/source/geometry/management/include/G4LogicalSurface.icc
===================================================================
--- trunk/source/geometry/management/include/G4LogicalSurface.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4LogicalSurface.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4LogicalSurface.icc,v 1.9 2006/06/29 18:30:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4LogicalSurface.icc,v 1.10 2009/04/21 15:18:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -51,5 +51,5 @@
 } 
 
-inline G4String
+inline const G4String&
 G4LogicalSurface::GetName() const
 {
@@ -110,6 +110,5 @@
 inline G4LogicalSurface::G4LogicalSurface(const G4String&         name,
                                          G4SurfaceProperty* surfaceProperty) 
-                : theName(name),
-                  theSurfaceProperty(surfaceProperty)
+  : theName(name), theSurfaceProperty(surfaceProperty)
 {
 }
Index: trunk/source/geometry/management/include/G4LogicalVolume.hh
===================================================================
--- trunk/source/geometry/management/include/G4LogicalVolume.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4LogicalVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalVolume.hh,v 1.27 2008/07/10 09:40:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/G4LogicalVolume.icc
===================================================================
--- trunk/source/geometry/management/include/G4LogicalVolume.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4LogicalVolume.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalVolume.icc,v 1.25 2008/07/10 09:40:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/G4LogicalVolumeStore.hh
===================================================================
--- trunk/source/geometry/management/include/G4LogicalVolumeStore.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4LogicalVolumeStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalVolumeStore.hh,v 1.13 2007/04/10 10:13:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4LogicalVolumeStore
Index: trunk/source/geometry/management/include/G4PhysicalVolumeStore.hh
===================================================================
--- trunk/source/geometry/management/include/G4PhysicalVolumeStore.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4PhysicalVolumeStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicalVolumeStore.hh,v 1.16 2008/07/10 09:41:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4PhysicalVolume
Index: trunk/source/geometry/management/include/G4ReflectedSolid.hh
===================================================================
--- trunk/source/geometry/management/include/G4ReflectedSolid.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4ReflectedSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReflectedSolid.hh,v 1.5 2006/06/29 18:31:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4Region.hh
===================================================================
--- trunk/source/geometry/management/include/G4Region.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4Region.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Region.hh,v 1.20 2008/07/10 09:46:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Region.hh,v 1.21 2009/11/27 16:34:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Region
@@ -48,4 +48,5 @@
 class G4MaterialCutsCouple;
 class G4UserLimits;
+class G4FieldManager;
 class G4FastSimulationManager;
 class G4VPhysicalVolume;
@@ -144,4 +145,11 @@
       // if it exists. Otherwise set to null.
 
+    inline void SetFieldManager(G4FieldManager* fm);
+    inline G4FieldManager* GetFieldManager() const;
+      // Set and Get methods for G4FieldManager.
+      // The region with assigned field-manager sets the field to the
+      // geometrical area associated with it; priority is anyhow given
+      // to local fields eventually set to logical volumes.
+
     inline G4VPhysicalVolume* GetWorldPhysical() const;
       // Get method for the world physical volume which this region
@@ -199,4 +207,5 @@
     G4VUserRegionInformation* fUserInfo;
     G4UserLimits* fUserLimits;
+    G4FieldManager* fFieldManager;
 
     G4FastSimulationManager* fFastSimulationManager;
Index: trunk/source/geometry/management/include/G4Region.icc
===================================================================
--- trunk/source/geometry/management/include/G4Region.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4Region.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Region.icc,v 1.15 2007/04/28 01:48:29 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Region.icc,v 1.16 2009/11/27 16:34:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -247,4 +247,24 @@
 {
   return fFastSimulationManager;
+}
+
+// ********************************************************************
+// GetFieldManager
+// ********************************************************************
+//
+inline 
+G4FieldManager* G4Region::GetFieldManager() const
+{
+  return fFieldManager;
+}
+
+// ********************************************************************
+// SetFieldManager
+// ********************************************************************
+//
+inline
+void G4Region::SetFieldManager(G4FieldManager* fm)
+{
+  fFieldManager = fm;
 }
 
Index: trunk/source/geometry/management/include/G4RegionStore.hh
===================================================================
--- trunk/source/geometry/management/include/G4RegionStore.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4RegionStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegionStore.hh,v 1.10 2006/11/30 10:39:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4RegionStore
Index: trunk/source/geometry/management/include/G4SmartVoxelHeader.hh
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelHeader.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelHeader.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelHeader.hh,v 1.10 2006/06/29 18:32:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4SmartVoxelHeader
Index: trunk/source/geometry/management/include/G4SmartVoxelHeader.icc
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelHeader.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelHeader.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelHeader.icc,v 1.6 2006/06/29 18:32:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4SmartVoxelNode.hh
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelNode.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelNode.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelNode.hh,v 1.12 2008/01/24 15:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4SmartVoxelNode
Index: trunk/source/geometry/management/include/G4SmartVoxelNode.icc
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelNode.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelNode.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelNode.icc,v 1.7 2008/01/24 15:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4SmartVoxelProxy.hh
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelProxy.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelProxy.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelProxy.hh,v 1.8 2006/06/29 18:32:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4SmartVoxelProxy
Index: trunk/source/geometry/management/include/G4SmartVoxelProxy.icc
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelProxy.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelProxy.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelProxy.icc,v 1.4 2006/06/29 18:32:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4SmartVoxelStat.hh
===================================================================
--- trunk/source/geometry/management/include/G4SmartVoxelStat.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4SmartVoxelStat.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4SmartVoxelStat.hh,v 1.4 2006/06/29 18:32:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/management/include/G4SolidStore.hh
===================================================================
--- trunk/source/geometry/management/include/G4SolidStore.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4SolidStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SolidStore.hh,v 1.13 2007/04/10 10:13:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4SolidStore
Index: trunk/source/geometry/management/include/G4TouchableHandle.hh
===================================================================
--- trunk/source/geometry/management/include/G4TouchableHandle.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4TouchableHandle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TouchableHandle.hh,v 1.6 2006/06/29 18:32:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Class G4TouchableHandle
Index: trunk/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh
===================================================================
--- trunk/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VCurvedTrajectoryFilter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCurvedTrajectoryFilter.hh,v 1.3 2006/06/29 18:32:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4VNestedParameterisation.hh
===================================================================
--- trunk/source/geometry/management/include/G4VNestedParameterisation.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VNestedParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNestedParameterisation.hh,v 1.6 2006/06/29 18:32:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VNestedParameterisation
Index: trunk/source/geometry/management/include/G4VPVDivisionFactory.hh
===================================================================
--- trunk/source/geometry/management/include/G4VPVDivisionFactory.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VPVDivisionFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPVDivisionFactory.hh,v 1.2 2006/06/29 18:32:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4VPVParameterisation.hh
===================================================================
--- trunk/source/geometry/management/include/G4VPVParameterisation.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VPVParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPVParameterisation.hh,v 1.13 2007/07/16 08:40:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VPVParamterisation
Index: trunk/source/geometry/management/include/G4VPhysicalVolume.hh
===================================================================
--- trunk/source/geometry/management/include/G4VPhysicalVolume.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VPhysicalVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPhysicalVolume.hh,v 1.17 2007/04/11 08:00:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4VPhysicalVolume.icc
===================================================================
--- trunk/source/geometry/management/include/G4VPhysicalVolume.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4VPhysicalVolume.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPhysicalVolume.icc,v 1.10 2006/06/29 18:32:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4VSolid.hh
===================================================================
--- trunk/source/geometry/management/include/G4VSolid.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSolid.hh,v 1.29 2008/09/10 13:18:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/G4VSolid.icc
===================================================================
--- trunk/source/geometry/management/include/G4VSolid.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4VSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSolid.icc,v 1.9 2007/05/11 13:30:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/G4VStoreNotifier.hh
===================================================================
--- trunk/source/geometry/management/include/G4VStoreNotifier.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VStoreNotifier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStoreNotifier.hh,v 1.3 2006/06/29 18:33:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VStoreNotifier
Index: trunk/source/geometry/management/include/G4VTouchable.hh
===================================================================
--- trunk/source/geometry/management/include/G4VTouchable.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VTouchable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTouchable.hh,v 1.9 2006/06/29 18:33:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/G4VTouchable.icc
===================================================================
--- trunk/source/geometry/management/include/G4VTouchable.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4VTouchable.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4VTouchable.icc,v 1.9 2006/06/29 18:33:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VTouchable.icc,v 1.10 2009/11/06 10:36:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -34,72 +34,6 @@
 
 inline
-G4VTouchable::G4VTouchable()
-{
-}
-
-inline
-G4VTouchable::~G4VTouchable()
-{
-}
-
-inline
-G4VPhysicalVolume* G4VTouchable::GetVolume(G4int) const
-{
-  G4Exception("G4VTouchable::GetVolume()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return 0;
-}
-
-inline
-G4VSolid* G4VTouchable::GetSolid(G4int) const
-{
-  G4Exception("G4VTouchable::GetSolid()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return 0;
-}
-
-inline
-G4int G4VTouchable::GetReplicaNumber(G4int) const
-{
-  G4Exception("G4VTouchable::GetReplicaNumber()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return 0;
-}
-
-inline
 G4int G4VTouchable::GetCopyNumber(G4int depth) const
 {
   return GetReplicaNumber(depth);
 }
-
-inline
-G4int G4VTouchable::MoveUpHistory(G4int)
-{
-  G4Exception("G4VTouchable::MoveUpHistory()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return 0;
-}
-
-inline
-void G4VTouchable::UpdateYourself(G4VPhysicalVolume*,
-			          const G4NavigationHistory* ) 
-{
-  G4Exception("G4VTouchable::UpdateYourself()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-}
-
-inline
-G4int G4VTouchable::GetHistoryDepth() const
-{
-  G4Exception("G4VTouchable::GetHistoryDepth()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return  0;
-}
-
-inline
-const G4NavigationHistory* G4VTouchable::GetHistory() const
-{
-  G4Exception("G4VTouchable::GetHistory()", "NotApplicable",
-              FatalException, "Undefined call to base class.");
-  return 0;
-}
Index: trunk/source/geometry/management/include/G4VUserRegionInformation.hh
===================================================================
--- trunk/source/geometry/management/include/G4VUserRegionInformation.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VUserRegionInformation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VUserRegionInformation.hh,v 1.4 2006/06/29 18:33:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/G4VVolumeMaterialScanner.hh
===================================================================
--- trunk/source/geometry/management/include/G4VVolumeMaterialScanner.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VVolumeMaterialScanner.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VVolumeMaterialScanner.hh,v 1.4 2006/06/29 18:33:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VVolumeMaterialScanner
Index: trunk/source/geometry/management/include/G4VoxelLimits.hh
===================================================================
--- trunk/source/geometry/management/include/G4VoxelLimits.hh	(revision 1227)
+++ trunk/source/geometry/management/include/G4VoxelLimits.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelLimits.hh,v 1.9 2006/06/29 18:33:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VoxelLimits
Index: trunk/source/geometry/management/include/G4VoxelLimits.icc
===================================================================
--- trunk/source/geometry/management/include/G4VoxelLimits.icc	(revision 1227)
+++ trunk/source/geometry/management/include/G4VoxelLimits.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelLimits.icc,v 1.4 2006/06/29 18:33:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/include/meshdefs.hh
===================================================================
--- trunk/source/geometry/management/include/meshdefs.hh	(revision 1227)
+++ trunk/source/geometry/management/include/meshdefs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: meshdefs.hh,v 1.7 2006/06/29 18:33:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/include/voxeldefs.hh
===================================================================
--- trunk/source/geometry/management/include/voxeldefs.hh	(revision 1227)
+++ trunk/source/geometry/management/include/voxeldefs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: voxeldefs.hh,v 1.7 2006/06/29 18:33:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4BlockingList.cc
===================================================================
--- trunk/source/geometry/management/src/G4BlockingList.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4BlockingList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BlockingList.cc,v 1.3 2006/06/29 18:33:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4ErrorCylSurfaceTarget.cc
===================================================================
--- trunk/source/geometry/management/src/G4ErrorCylSurfaceTarget.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ErrorCylSurfaceTarget.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorCylSurfaceTarget.cc,v 1.4 2007/06/20 12:50:48 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4ErrorPlaneSurfaceTarget.cc
===================================================================
--- trunk/source/geometry/management/src/G4ErrorPlaneSurfaceTarget.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ErrorPlaneSurfaceTarget.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPlaneSurfaceTarget.cc,v 1.2 2007/06/19 11:28:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4ErrorSurfaceTarget.cc
===================================================================
--- trunk/source/geometry/management/src/G4ErrorSurfaceTarget.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ErrorSurfaceTarget.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorSurfaceTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4ErrorTanPlaneTarget.cc
===================================================================
--- trunk/source/geometry/management/src/G4ErrorTanPlaneTarget.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ErrorTanPlaneTarget.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTanPlaneTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4ErrorTarget.cc
===================================================================
--- trunk/source/geometry/management/src/G4ErrorTarget.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ErrorTarget.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorTarget.cc,v 1.1 2007/05/16 12:50:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/management/src/G4GeometryManager.cc
===================================================================
--- trunk/source/geometry/management/src/G4GeometryManager.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4GeometryManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryManager.cc,v 1.22 2008/05/16 13:46:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GeometryManager
Index: trunk/source/geometry/management/src/G4IdentityTrajectoryFilter.cc
===================================================================
--- trunk/source/geometry/management/src/G4IdentityTrajectoryFilter.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4IdentityTrajectoryFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IdentityTrajectoryFilter.cc,v 1.4 2006/10/02 10:09:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------------------
Index: trunk/source/geometry/management/src/G4LogicalVolume.cc
===================================================================
--- trunk/source/geometry/management/src/G4LogicalVolume.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4LogicalVolume.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4LogicalVolume.cc,v 1.33 2008/07/10 09:40:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4LogicalVolume.cc,v 1.34 2009/09/24 13:22:57 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -162,15 +162,11 @@
 G4int G4LogicalVolume::TotalVolumeEntities() const
 {
-  static G4int vols = 0;
-
-  vols++;
+  G4int vols = 1;
   for (G4PhysicalVolumeList::const_iterator itDau = fDaughters.begin();
        itDau != fDaughters.end(); itDau++)
   {
     G4VPhysicalVolume* physDaughter = (*itDau);
-    for (G4int i=0; i<physDaughter->GetMultiplicity(); i++)
-    {
-      physDaughter->GetLogicalVolume()->TotalVolumeEntities();
-    }
+    vols += physDaughter->GetMultiplicity()
+           *physDaughter->GetLogicalVolume()->TotalVolumeEntities();
   }
   return vols;
Index: trunk/source/geometry/management/src/G4LogicalVolumeStore.cc
===================================================================
--- trunk/source/geometry/management/src/G4LogicalVolumeStore.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4LogicalVolumeStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalVolumeStore.cc,v 1.19 2008/07/10 09:40:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4LogicalVolumeStore
Index: trunk/source/geometry/management/src/G4PhysicalVolumeStore.cc
===================================================================
--- trunk/source/geometry/management/src/G4PhysicalVolumeStore.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4PhysicalVolumeStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicalVolumeStore.cc,v 1.20 2008/07/10 09:41:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4PhysicalVolumeStore
Index: trunk/source/geometry/management/src/G4ReflectedSolid.cc
===================================================================
--- trunk/source/geometry/management/src/G4ReflectedSolid.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4ReflectedSolid.cc	(revision 1228)
@@ -27,5 +27,5 @@
 // $Id: G4ReflectedSolid.cc,v 1.11 2006/11/08 09:56:33 gcosmo Exp $
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation for G4ReflectedSolid class for boolean 
Index: trunk/source/geometry/management/src/G4Region.cc
===================================================================
--- trunk/source/geometry/management/src/G4Region.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4Region.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Region.cc,v 1.26 2008/07/15 10:27:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Region.cc,v 1.27 2009/11/27 16:34:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -48,5 +48,6 @@
 G4Region::G4Region(const G4String& pName)
   : fName(pName), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
-    fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
+    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
+    fRegionalSteppingAction(0)
 {
   G4RegionStore* rStore = G4RegionStore::GetInstance();
@@ -72,5 +73,6 @@
 G4Region::G4Region( __void__& )
   : fName(""), fRegionMod(true), fCut(0), fUserInfo(0), fUserLimits(0),
-    fFastSimulationManager(0), fWorldPhys(0), fRegionalSteppingAction(0)
+    fFieldManager(0), fFastSimulationManager(0), fWorldPhys(0),
+    fRegionalSteppingAction(0)
 {
   // Register to store
Index: trunk/source/geometry/management/src/G4RegionStore.cc
===================================================================
--- trunk/source/geometry/management/src/G4RegionStore.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4RegionStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegionStore.cc,v 1.14 2008/07/10 09:46:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4RegionStore
Index: trunk/source/geometry/management/src/G4SmartVoxelHeader.cc
===================================================================
--- trunk/source/geometry/management/src/G4SmartVoxelHeader.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4SmartVoxelHeader.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4SmartVoxelHeader.cc,v 1.31 2008/01/24 15:46:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4SmartVoxelHeader.cc,v 1.34 2009/10/30 14:05:47 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -366,10 +366,10 @@
         // Sanity check on extent
         //
-        G4double min, max;
+        G4double emin = kInfinity, emax = -kInfinity;
         G4VoxelLimits limits;
         G4AffineTransform origin;
-        pVolume->GetSolid()->CalculateExtent(axis, limits, origin, min, max);
-        if ( (std::fabs((min-fminExtent)/fminExtent) +
-              std::fabs((max-fmaxExtent)/fmaxExtent)) > 0.05)
+        pVolume->GetSolid()->CalculateExtent(axis, limits, origin, emin, emax);
+        if ( (std::fabs((emin-fminExtent)/fminExtent) +
+              std::fabs((emax-fmaxExtent)/fmaxExtent)) > 0.05)
         {
           G4cerr << "ERROR - G4SmartVoxelHeader::BuildReplicaVoxels()"
@@ -1038,4 +1038,7 @@
   for (nNode=0; nNode<noNodes; nNode++)
   {
+    // Get rid of possible excess capacity in the internal node vector
+    //
+    ((*nodeList)[nNode])->Shrink();
     G4SmartVoxelProxy* pProxyNode = new G4SmartVoxelProxy((*nodeList)[nNode]);
     if (!pProxyNode)
Index: trunk/source/geometry/management/src/G4SmartVoxelNode.cc
===================================================================
--- trunk/source/geometry/management/src/G4SmartVoxelNode.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4SmartVoxelNode.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelNode.cc,v 1.6 2006/06/29 18:33:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SmartVoxelNode
Index: trunk/source/geometry/management/src/G4SmartVoxelProxy.cc
===================================================================
--- trunk/source/geometry/management/src/G4SmartVoxelProxy.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4SmartVoxelProxy.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelProxy.cc,v 1.3 2006/06/29 18:33:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SmartVoxelProxy
Index: trunk/source/geometry/management/src/G4SmartVoxelStat.cc
===================================================================
--- trunk/source/geometry/management/src/G4SmartVoxelStat.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4SmartVoxelStat.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmartVoxelStat.cc,v 1.3 2006/06/29 18:33:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/management/src/G4SolidStore.cc
===================================================================
--- trunk/source/geometry/management/src/G4SolidStore.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4SolidStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SolidStore.cc,v 1.17 2007/04/10 10:13:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4SolidStore
Index: trunk/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc
===================================================================
--- trunk/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VCurvedTrajectoryFilter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCurvedTrajectoryFilter.cc,v 1.3 2006/06/29 18:33:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // --------------------------------------------------------------------
 
Index: trunk/source/geometry/management/src/G4VNestedParameterisation.cc
===================================================================
--- trunk/source/geometry/management/src/G4VNestedParameterisation.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VNestedParameterisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNestedParameterisation.cc,v 1.6 2006/06/29 18:33:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VNestedParameterisation implementation
Index: trunk/source/geometry/management/src/G4VPVDivisionFactory.cc
===================================================================
--- trunk/source/geometry/management/src/G4VPVDivisionFactory.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VPVDivisionFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPVDivisionFactory.cc,v 1.2 2006/06/29 18:34:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VPVDivisionFactory Implementation file
Index: trunk/source/geometry/management/src/G4VPVParameterisation.cc
===================================================================
--- trunk/source/geometry/management/src/G4VPVParameterisation.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VPVParameterisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPVParameterisation.cc,v 1.8 2007/07/16 08:40:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Default implementations for Parameterisations that do not
Index: trunk/source/geometry/management/src/G4VPhysicalVolume.cc
===================================================================
--- trunk/source/geometry/management/src/G4VPhysicalVolume.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VPhysicalVolume.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPhysicalVolume.cc,v 1.14 2007/04/11 08:00:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/management/src/G4VSolid.cc
===================================================================
--- trunk/source/geometry/management/src/G4VSolid.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSolid.cc,v 1.39 2008/09/23 13:07:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VSolid
Index: trunk/source/geometry/management/src/G4VoxelLimits.cc
===================================================================
--- trunk/source/geometry/management/src/G4VoxelLimits.cc	(revision 1227)
+++ trunk/source/geometry/management/src/G4VoxelLimits.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelLimits.cc,v 1.11 2006/06/29 18:34:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VoxelLimits
Index: trunk/source/geometry/navigation/History
===================================================================
--- trunk/source/geometry/navigation/History	(revision 1227)
+++ trunk/source/geometry/navigation/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.132 2009/05/20 08:27:26 gcosmo Exp $
+$Id: History,v 1.138 2009/12/11 05:48:53 japost Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,65 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+Dec 11th, 2009 - J.Apostolakis (geomnav-V09-02-11)
+------------------------------
+- G4PropagatorInField
+  * Implementation field by Region 
+      - with extra checking of logical volume
+
+Nov 30th, 2009 - J.Apostolakis (geomnav-V09-02-10)
+------------------------------
+- G4VIntersectionLocator
+  * Fix problem in ReEstimateEndPoint() behaviour for very small steps.
+
+  * Corrected constructor to ensure that it initialises all data members.
+  * Labelled the methods (in header) to make noticable those that 
+      must changed at every step.
+      ( attributes: ChordFinder,  EpsilonStep,  Navigator )
+
+Nov 23rd, 2009 - J.Apostolakis 
+------------------------------
+- Fixed G4PropagatorInField.cc: 
+   * Revise condition for flagging ZeroStep to avoid fake triggering.
+     Small proposed steps (from Physics) could trigger the previous
+     simple condition for Tiny/Zero Problem steps.
+   [ This was first commited on branch geomnav-V09-02-08_branch 
+       and tagged geomnav-V09-02-80  ]
+
+Nov 12th, 2009 - J.Apostolakis (geomnav-V09-02-09)
+------------------------------
+- G4PropagatorInField: cleanup of minor methods:
+   Added new method RefreshIntersectionLocator to update the state of
+       Use this method to synchronise with IntersectionLocator.
+   Deleted long obsolete methods: SetAccuraciesWithDeltaOneStep
+	   SetDeltaIntersection,  SetDeltaOneStep
+   Revised implementation to avoid using the older methods
+           GetDeltaIntersection   GetDeltaOneStep
+
+Nov 12th, 2009 - J.Apostolakis (geomnav-V09-02-08)
+------------------------------
+- Refined G4PropagatorInField.cc: 
+   * Changed parameters for treating consecutive tiny/zero steps:
+     - the value of default decrease factor to 0.25 (from 0.1), 
+     - the value is not used when the step size falls below a certain threshold.s
+       This threshold is changed. It is expressed as a multiple of fZeroStepThreshold 
+       instead of kCarTolerance.  The reasons are:
+	 * the threshold were meant to refer to the  ZeroStepThreshold (it was kCarTolerance)
+	 * the values were now much larger than this ZeroStepThreshold.
+     - The value given to the decrease factor after the first such thresholds is changed to 0.35
+       instead of 0.25, 0.5.  
+   * Improved printing of Diagnostic message.
+
+Nov  3rd, 2009 - J.Apostolakis (geomnav-V09-02-07)
+------------------------------
+- Refined G4PropagatorInField.cc: 
+   * Added new member fZeroStepThreshold, to enable tuning of threshold for Tiny/Zero steps. 
+   * Changed default value from 0.5 * kCarTolerance 
+                          to max (100,000 * kCarTolerance, 0.1 * micron )
+   * This is first revision to address problem seen at boundary of volumes (Reports of Atlas) .
+
+June 2nd, 2009 - J.Apostolakis (geomnav-V09-02-06)
+------------------------------
+- Fix in G4PropagatorInField::SetNavigator
+   * Forward new Navigator to IntersectionLocator. 
 
 May 20th, 2009 - P.Arce (geomnav-V09-02-05)
Index: trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4BrentLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4BrentLocator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4BrentLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BrentLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4BrentLocator
Index: trunk/source/geometry/navigation/include/G4DrawVoxels.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4DrawVoxels.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4DrawVoxels.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestLogger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestLogger.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestLogger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestPoint.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestPoint.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestSegment.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestSegment.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestSegment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeomTestVolume.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeomTestVolume.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeomTestVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4GeometryMessenger.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4GeometryMessenger.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4GeometryMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiLevelLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4MultiNavigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4MultiNavigator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4MultiNavigator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4Navigator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4Navigator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4Navigator.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Navigator.hh,v 1.28 2009/01/27 09:32:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -237,8 +237,9 @@
     // Verify if the step has exited the mother volume.
 
-  inline void  CheckMode(G4bool mode);
+  inline void   CheckMode(G4bool mode);
     // Run navigation in "check-mode", therefore using additional
     // verifications and more strict correctness conditions.
     // Is effective only with G4VERBOSE set.
+  inline G4bool IsCheckModeActive() { return fCheck; } 
 
   void PrintState() const;
Index: trunk/source/geometry/navigation/include/G4Navigator.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4Navigator.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4Navigator.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4NormalNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4NormalNavigation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4NormalNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4NormalNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4NormalNavigation.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4NormalNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4PathFinder.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PathFinder.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4PathFinder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // class G4PathFinder 
Index: trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //--------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4PropagatorInField.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4PropagatorInField.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4PropagatorInField.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 // 
-// $Id: G4PropagatorInField.hh,v 1.17 2008/11/13 14:28:56 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -163,4 +163,6 @@
    inline G4VIntersectionLocator* GetIntersectionLocator();
    inline void SetIntersectionLocator(G4VIntersectionLocator *pLocator );
+     // Change or get the object which calculates the exact 
+     //  intersection point with the next boundary
  
  public:  // without description
@@ -168,9 +170,4 @@
    inline G4double  GetDeltaIntersection() const;
    inline G4double  GetDeltaOneStep() const;
-   inline void    SetAccuraciesWithDeltaOneStep( G4double deltaOneStep );  
-   inline void    SetDeltaIntersection( G4double deltaIntersection );
-   inline void    SetDeltaOneStep( G4double deltaOneStep );  
-     // The above 5 methods are obsolete and will not work, as they have been
-     // replaced by the same methods in G4FieldManager since Geant4 4.0 ...
 
    inline G4FieldManager*  GetCurrentFieldManager();
@@ -182,4 +179,11 @@
                                        G4int noAbandon );
    inline G4int GetThresholdNoZeroSteps( G4int i ); 
+
+   inline G4double  GetZeroStepThreshold(); 
+   inline void      SetZeroStepThreshold( G4double newLength ); 
+
+   void RefreshIntersectionLocator(); 
+     // Update the Locator with parameters from this class
+     //    and from current field manager
 
  protected:  // with description
@@ -243,4 +247,6 @@
    G4double  kCarTolerance;
      // Geometrical tolerance defining surface thickness
+   G4double  fZeroStepThreshold; 
+     // Threshold for counting of tiny or 'zero' steps
 
    G4VIntersectionLocator *fIntersectionLocator;
Index: trunk/source/geometry/navigation/include/G4PropagatorInField.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4PropagatorInField.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4PropagatorInField.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PropagatorInField.icc,v 1.13 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -110,4 +110,5 @@
 }
 
+// #if 0
 inline
 G4double G4PropagatorInField::GetDeltaIntersection() const
@@ -121,23 +122,5 @@
   return fCurrentFieldMgr->GetDeltaOneStep();
 }
-
-inline
-void
-G4PropagatorInField::SetAccuraciesWithDeltaOneStep( G4double valDeltaOneStep )
-{ 
-  fDetectorFieldMgr->SetAccuraciesWithDeltaOneStep(valDeltaOneStep);
-}
-
-inline
-void G4PropagatorInField::SetDeltaOneStep( G4double valDeltaOneStep )
-{ 
-  fDetectorFieldMgr->SetDeltaOneStep(valDeltaOneStep); 
-}
-
-inline
-void G4PropagatorInField::SetDeltaIntersection( G4double valDeltaIntersection )
-{
-  fDetectorFieldMgr->SetDeltaIntersection(valDeltaIntersection);
-}
+// #endif 
 
 inline
@@ -236,4 +219,10 @@
 }
 
+inline G4double  G4PropagatorInField::GetZeroStepThreshold(){ return fZeroStepThreshold; }
+inline void      G4PropagatorInField::SetZeroStepThreshold( G4double newLength )
+{ 
+  fZeroStepThreshold= newLength;
+}
+
 inline
 void G4PropagatorInField::SetDetectorFieldManager(G4FieldManager* newDetectorFieldManager)
@@ -259,5 +248,10 @@
 SetNavigatorForPropagating( G4Navigator *SimpleOrMultiNavigator )
 {
-  if(SimpleOrMultiNavigator)  { fNavigator= SimpleOrMultiNavigator; }
+  if(SimpleOrMultiNavigator)  { 
+     fNavigator= SimpleOrMultiNavigator; 
+     if( fIntersectionLocator ) {
+	 fIntersectionLocator->SetNavigatorFor( SimpleOrMultiNavigator );
+     }
+  }
 }
 
@@ -295,2 +289,3 @@
                           LinearStepLength,IntersectionPoint);
 }
+
Index: trunk/source/geometry/navigation/include/G4RegularNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4RegularNavigation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4RegularNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4SafetyHelper.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4SafetyHelper.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4SafetyHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4SimpleLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4SimpleLocator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4SimpleLocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4TransportationManager.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4TransportationManager.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4TransportationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4TransportationManager
Index: trunk/source/geometry/navigation/include/G4TransportationManager.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4TransportationManager.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4TransportationManager.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // ------------------------------------------------------------
 //  GEANT 4  inlined function members implementation
Index: trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4VIntersectionLocator.hh,v 1.4 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -95,23 +95,34 @@
        // whether an intersection occurred. NOTE: changes the Safety!
 
+     inline void    SetEpsilonStepFor( G4double EpsilonStep );
+     inline void    SetDeltaIntersectionFor( G4double deltaIntersection );
+     inline void    SetNavigatorFor( G4Navigator *fNavigator );
+     inline void    SetChordFinderFor(G4ChordFinder *fCFinder );
+       // These parameters must be set at each step, in case they were changed
+
+       // Note: This simple approach ensures that all scenarios are considered. 
+       //   [ Future refinement may identify which are invariant during a 
+       //      track, run or event ]
+
+    inline void     SetVerboseFor(G4int fVerbose);
+    inline G4int    GetVerboseFor();
+       // Controling verbosity enables checking of the locating of intersections
+
   public:  // without description
+    // Additional inline Set/Get methods for parameters, dependent objects
 
-    // inline Set/Get methods used for IntersctionLocator
+    inline G4double       GetDeltaIntersectionFor();
+    inline G4double       GetEpsilonStepFor();
+    inline G4Navigator*   GetNavigatorFor();
+    inline G4ChordFinder* GetChordFinderFor();
 
-    inline G4double  GetDeltaIntersectionFor();
-    inline G4double  GetEpsilonStepFor();
-    inline G4Navigator*  GetNavigatorFor();
-    inline G4ChordFinder*  GetChordFinderFor();
-    inline G4int  GetVerboseFor();
+    inline void   SetSafetyParametersFor(G4bool UseSafety );
 
-    inline void SetEpsilonStepFor( G4double EpsilonStep );
-    inline void SetDeltaIntersectionFor( G4double deltaIntersection );
-    inline void SetNavigatorFor( G4Navigator *fNavigator );
-    inline void SetChordFinderFor(G4ChordFinder *fCFinder );
-    inline void SetSafetyParametersFor(G4bool UseSafety );
-    inline void SetVerboseFor(G4int fVerbose);
-
-    inline void AddAdjustementOfFoundIntersection(G4bool UseCorrection);
+    inline void   AddAdjustementOfFoundIntersection(G4bool UseCorrection);
     inline G4bool GetAdjustementOfFoundIntersection();
+      // Methods to be made Obsolete - replaced by methods below
+    inline void   AdjustIntersections(G4bool UseCorrection); 
+    inline G4bool AreIntersectionsAdjusted(){ return fUseNormalCorrection; }  
+      // Change adjustment flag  ( New Interface ) 
 
   protected:  // with description
@@ -144,15 +155,17 @@
   protected:
 
-    G4double kCarTolerance;
-    G4int    fVerboseLevel;
-      // For verbose purposes
-    G4bool   fUseNormalCorrection;
+    G4double kCarTolerance;         // Constant
 
+    G4int    fVerboseLevel;          // For debugging
+    G4bool   fUseNormalCorrection;   // Configuration parameter
+
+    G4Navigator   *fiNavigator;
+      // Parameters set by G4PropagatorInField  ( when ? ) 
+
+    G4ChordFinder *fiChordFinder;
     G4double       fiEpsilonStep;
     G4double       fiDeltaIntersection;
-    G4Navigator   *fiNavigator;
-    G4ChordFinder *fiChordFinder;
     G4bool         fiUseSafety;
-      // For passing the parameters from G4PropagatorInField
+      // Parameters set at each physical step by calling method - G4PropagatorInField
 
     G4Navigator *fHelpingNavigator;
Index: trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIntersectionLocator.icc,v 1.3 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/include/G4VoxelNavigation.hh
===================================================================
--- trunk/source/geometry/navigation/include/G4VoxelNavigation.hh	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4VoxelNavigation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/include/G4VoxelNavigation.icc
===================================================================
--- trunk/source/geometry/navigation/include/G4VoxelNavigation.icc	(revision 1227)
+++ trunk/source/geometry/navigation/include/G4VoxelNavigation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/src/G4AuxiliaryNavServices.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4AuxiliaryNavServices.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4AuxiliaryNavServices.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AuxiliaryNavServices.cc,v 1.3 2006/06/29 18:36:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4BrentLocator.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4BrentLocator.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4BrentLocator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BrentLocator.cc,v 1.8 2009/05/15 12:55:48 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4BrentLocator implementation
Index: trunk/source/geometry/navigation/src/G4DrawVoxels.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4DrawVoxels.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4DrawVoxels.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DrawVoxels.cc,v 1.4 2006/06/29 18:36:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/navigation/src/G4ErrorPropagationNavigator.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4ErrorPropagationNavigator.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4ErrorPropagationNavigator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagationNavigator.cc,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/src/G4GeomTestErrorList.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestErrorList.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestErrorList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestErrorList.cc,v 1.3 2006/06/29 18:36:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestOverlapList.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestOverlapList.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestOverlapList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOverlapList.cc,v 1.3 2006/06/29 18:36:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestOvershootList.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestOvershootList.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestOvershootList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestOvershootList.cc,v 1.3 2006/06/29 18:36:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestPoint.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestPoint.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestPoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestPoint.cc,v 1.3 2006/06/29 18:36:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestSegment.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestSegment.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestSegment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestSegment.cc,v 1.11 2007/11/16 09:39:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestStreamLogger.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestStreamLogger.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestStreamLogger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestStreamLogger.cc,v 1.3 2006/06/29 18:36:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestVolPoint.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestVolPoint.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestVolPoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolPoint.cc,v 1.3 2006/06/29 18:36:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeomTestVolume.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeomTestVolume.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeomTestVolume.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeomTestVolume.cc,v 1.6 2007/11/16 09:39:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4GeometryMessenger.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4GeometryMessenger.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4GeometryMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryMessenger.cc,v 1.5 2006/06/29 18:36:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/navigation/src/G4MultiLevelLocator.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4MultiLevelLocator.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4MultiLevelLocator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MultiLevelLocator.cc,v 1.5 2008/12/11 10:01:02 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4MultiLevelLocator implementation
Index: trunk/source/geometry/navigation/src/G4NormalNavigation.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4NormalNavigation.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4NormalNavigation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NormalNavigation.cc,v 1.9 2007/05/11 13:43:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/src/G4ParameterisedNavigation.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4ParameterisedNavigation.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4ParameterisedNavigation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParameterisedNavigation.cc,v 1.12 2007/11/09 16:06:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/src/G4PropagatorInField.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4PropagatorInField.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4PropagatorInField.cc	(revision 1228)
@@ -36,4 +36,6 @@
 // 17.03.97 John Apostolakis,   renaming new set functions being added
 //
+// $Id: G4PropagatorInField.cc,v 1.50 2009/12/10 08:41:54 japost Exp $
+// GEANT4 tag $ Name:  $
 // ---------------------------------------------------------------------------
 
@@ -69,4 +71,5 @@
     fUseSafetyForOptimisation(true),   // (false) is less sensitive to incorrect safety
     fSetFieldMgr(false),
+    fZeroStepThreshold( 0.0 ), 
     fpTrajectoryFilter( 0 )
 {
@@ -83,4 +86,11 @@
   fPreviousSafety= 0.0;
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
+  fZeroStepThreshold= std::max( 1.0e5 * kCarTolerance, 1.0e-1 * micrometer ) ; 
+#ifdef G4DEBUG_FIELD
+  G4cout << " PiF: Zero Step Threshold set to " << fZeroStepThreshold / millimeter
+	 << " mm." << G4endl;
+  G4cout << " PiF:   Value of kCarTolerance = " << kCarTolerance / millimeter 
+	 << " mm. " << G4endl;
+#endif 
 
   // Definding Intersection Locator and his parameters
@@ -92,15 +102,21 @@
     fAllocatedLocator=false;
   }
+  RefreshIntersectionLocator();  //  Copy all relevant parameters 
+}
+
+G4PropagatorInField::~G4PropagatorInField()
+{
+  if(fAllocatedLocator)delete  fIntersectionLocator; 
+}
+
+// Update the IntersectionLocator with current parameters
+void
+G4PropagatorInField::RefreshIntersectionLocator()
+{
   fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
-  fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection());
+  fIntersectionLocator->SetDeltaIntersectionFor(fCurrentFieldMgr->GetDeltaIntersection());
   fIntersectionLocator->SetChordFinderFor(GetChordFinder());
   fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
 }
-
-G4PropagatorInField::~G4PropagatorInField()
-{
-  if(fAllocatedLocator)delete  fIntersectionLocator; 
-}
-
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -114,5 +130,6 @@
                 G4VPhysicalVolume* pPhysVol)
 {
-  
+  const G4String MethodName("G4PropagatorInField::ComputeStep");
+   
   // If CurrentProposedStepLength is too small for finding Chords
   // then return with no action (for now - TODO: some action)
@@ -152,10 +169,7 @@
   GetChordFinder()->SetChargeMomentumMass(fCharge, fInitialMomentumModulus, fMass); 
 
- // Values for Intersection Locator has to be updated on each call
- // because the CurrentFieldManager changes
-    fIntersectionLocator->SetChordFinderFor(GetChordFinder());
-    fIntersectionLocator->SetSafetyParametersFor( fUseSafetyForOptimisation);
-    fIntersectionLocator->SetEpsilonStepFor(fEpsilonStep);
-    fIntersectionLocator->SetDeltaIntersectionFor(GetDeltaIntersection()); 
+ // Values for Intersection Locator has to be updated on each call for the
+ // case that CurrentFieldManager has changed from the one of previous step
+  RefreshIntersectionLocator();
 
   G4FieldTrack  CurrentState(pFieldTrack);
@@ -177,5 +191,5 @@
                                            fLargestAcceptableStep ); 
   }
-  epsilon = GetDeltaOneStep() / CurrentProposedStepLength;
+  epsilon = fCurrentFieldMgr->GetDeltaOneStep() / CurrentProposedStepLength;
   // G4double raw_epsilon= epsilon;
   G4double epsilonMin= fCurrentFieldMgr->GetMinimumEpsilonStep();
@@ -200,9 +214,9 @@
     G4double decreaseFactor = 0.9; // Unused default
     if(   (fNoZeroStep < fSevereActionThreshold_NoZeroSteps)
-       && (stepTrial > 1000.0*kCarTolerance) )
+       && (stepTrial > 100.0*fZeroStepThreshold) )
     {
-      // Ensure quicker convergence
+      // Attempt quick convergence
       //
-      decreaseFactor= 0.1;
+      decreaseFactor= 0.25;
     } 
     else
@@ -212,9 +226,9 @@
       // Careful decreases to cope with tolerance are required.
       //
-      if( stepTrial > 1000.0*kCarTolerance )
-        decreaseFactor = 0.25;     // Try slow decreases
-      else if( stepTrial > 100.0*kCarTolerance )
-        decreaseFactor= 0.5;       // Try slower decreases
-      else if( stepTrial > 10.0*kCarTolerance )
+      if( stepTrial > 100.0*fZeroStepThreshold )
+        decreaseFactor = 0.35;     // Try decreasing slower
+      else if( stepTrial > 100.0*fZeroStepThreshold )
+        decreaseFactor= 0.5;       // Try yet slower decreases
+      else if( stepTrial > 10.0*fZeroStepThreshold )
         decreaseFactor= 0.75;      // Try even slower decreases
       else
@@ -224,8 +238,13 @@
 
 #ifdef G4DEBUG_FIELD
+     G4cout << MethodName << ": " 
+	    << " Decreasing step -  " 
+	    << " decreaseFactor= " << std::setw(8) << decreaseFactor 
+	    << " stepTrial = "     << std::setw(18) << stepTrial << " "
+	    << " fZeroStepThreshold = " << fZeroStepThreshold << G4endl;
      PrintStepLengthDiagnostic(CurrentProposedStepLength, decreaseFactor,
                                stepTrial, pFieldTrack);
 #endif
-     if( stepTrial == 0.0 )
+     if( stepTrial == 0.0 )  //  Change to make it < 0.1 * kCarTolerance ??
      {
        G4cout << " G4PropagatorInField::ComputeStep "
@@ -403,8 +422,15 @@
   // and only take corrective action when they occur.
   // 
-  if( TruePathLength < 0.5*kCarTolerance ) 
+  if( ( (TruePathLength < fZeroStepThreshold) 
+	&& ( TruePathLength+kCarTolerance < CurrentProposedStepLength  ) 
+	) 
+      || ( TruePathLength < 0.5*kCarTolerance )
+    )
+  {
     fNoZeroStep++;
-  else
+  }
+  else{
     fNoZeroStep = 0;
+  }
 
   if( fNoZeroStep > fAbandonThreshold_NoZeroSteps ) { 
@@ -552,11 +578,31 @@
                     const G4FieldTrack& )
 {
+#if 0
   G4cout << " PiF: NoZeroStep= " << fNoZeroStep
          << " CurrentProposedStepLength= " << CurrentProposedStepLength
          << " Full_curvelen_last=" << fFull_CurveLen_of_LastAttempt
          << " last proposed step-length= " << fLast_ProposedStepLength 
-         << " decreate factor = " << decreaseFactor
+         << " decrease factor = " << decreaseFactor
          << " step trial = " << stepTrial
          << G4endl;
+#endif
+  int  iprec= G4cout.precision(8); 
+  G4cout << " " << std::setw(12) << " PiF: NoZeroStep " 
+         << " " << std::setw(20) << " CurrentProposed len " 
+         << " " << std::setw(18) << " Full_curvelen_last" 
+         << " " << std::setw(18) << " last proposed len " 
+         << " " << std::setw(18) << " decrease factor   " 
+         << " " << std::setw(15) << " step trial  " 
+         << G4endl;
+
+  G4cout << " " << std::setw(10) << fNoZeroStep << "  "
+         << " " << std::setw(20) << CurrentProposedStepLength
+         << " " << std::setw(18) << fFull_CurveLen_of_LastAttempt
+         << " " << std::setw(18) << fLast_ProposedStepLength 
+         << " " << std::setw(18) << decreaseFactor
+         << " " << std::setw(15) << stepTrial
+         << G4endl;
+  G4cout.precision( iprec ); 
+
 }
 
@@ -617,8 +663,21 @@
   if( pCurrentPhysicalVolume)
   {
-     G4FieldManager *newFieldMgr = 0;
-     newFieldMgr= pCurrentPhysicalVolume->GetLogicalVolume()->GetFieldManager();
-     if ( newFieldMgr ) 
-        currentFieldMgr = newFieldMgr;
+     G4FieldManager *pRegionFieldMgr= 0, *localFieldMgr = 0;
+     G4LogicalVolume* pLogicalVol= pCurrentPhysicalVolume->GetLogicalVolume();
+
+     if( pLogicalVol ) { 
+	// Value for Region, if any, Overrides 
+	G4Region*  pRegion= pLogicalVol->GetRegion();
+	if( pRegion ) { 
+	   pRegionFieldMgr= pRegion->GetFieldManager();
+	   if( pRegionFieldMgr ) 
+	     currentFieldMgr= pRegionFieldMgr;
+	}
+
+	// 'Local' Value from logical volume, if any, Overrides 
+	localFieldMgr= pLogicalVol->GetFieldManager();
+	if ( localFieldMgr ) 
+	   currentFieldMgr = localFieldMgr;
+     }
   }
   fCurrentFieldMgr= currentFieldMgr;
Index: trunk/source/geometry/navigation/src/G4ReplicaNavigation.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4ReplicaNavigation.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4ReplicaNavigation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReplicaNavigation.cc,v 1.19 2008/04/28 15:39:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/src/G4SimpleLocator.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4SimpleLocator.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4SimpleLocator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4SimpleLocator.cc,v 1.5 2008/12/11 10:27:58 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4SimpleLocator implementation
Index: trunk/source/geometry/navigation/src/G4TransportationManager.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4TransportationManager.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4TransportationManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransportationManager.cc,v 1.15 2007/04/12 11:51:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4VIntersectionLocator.cc,v 1.5 2009/05/15 12:58:23 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4VIntersectionLocator.cc,v 1.7 2009/11/27 15:21:59 japost Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class G4VIntersectionLocator implementation
@@ -43,10 +43,14 @@
 // Constructor
 //
-G4VIntersectionLocator:: G4VIntersectionLocator(G4Navigator *theNavigator)
+G4VIntersectionLocator:: G4VIntersectionLocator(G4Navigator *theNavigator): 
+  fUseNormalCorrection(false), 
+  fiNavigator( theNavigator ),
+  fiChordFinder( 0 ),            // Not set - overridden at each step
+  fiEpsilonStep( -1.0 ),         // Out of range - overridden at each step
+  fiDeltaIntersection( -1.0 ),   // Out of range - overridden at each step
+  fiUseSafety(false)             // Default - overridden at each step
 {
   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
-  fiNavigator = theNavigator;
   fVerboseLevel = 0;
-  fUseNormalCorrection = false;
   fHelpingNavigator = new G4Navigator();
 }      
@@ -191,10 +195,11 @@
      if (std::abs(advanceLength)<kCarTolerance)
      {
-       advanceLength=(EstimatedEndStateB.GetPosition()
-                     -newEndPoint.GetPosition()).mag();
+       goodAdvance=true;
      }
+     else{
      goodAdvance= 
        integrDriver->AccurateAdvance(newEndPoint, advanceLength,
                                      GetEpsilonStepFor());
+     }
   }
   while( !goodAdvance && (++itrial < no_trials) );
Index: trunk/source/geometry/navigation/src/G4VoxelNavigation.cc
===================================================================
--- trunk/source/geometry/navigation/src/G4VoxelNavigation.cc	(revision 1227)
+++ trunk/source/geometry/navigation/src/G4VoxelNavigation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VoxelNavigation.cc,v 1.9 2008/11/14 18:26:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/BREPS/include/G4Assembly.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Assembly.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Assembly.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Assembly.hh,v 1.10 2006/06/29 18:37:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Assembly.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Assembly.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Assembly.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Assembly.icc,v 1.4 2006/06/29 18:37:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Axis2Placement3D.hh,v 1.5 2006/06/29 18:37:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Axis2Placement3D.icc,v 1.9 2006/06/29 18:37:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolid.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolid.hh,v 1.17 2006/10/19 15:35:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolid.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolid.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolid.icc,v 1.9 2006/10/20 14:23:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidBox.hh,v 1.10 2008/01/22 16:03:13 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidCone.hh,v 1.11 2006/06/29 18:37:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidCylinder.hh,v 1.10 2006/06/29 18:37:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidOpenPCone.hh,v 1.9 2006/06/29 18:37:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidPCone.hh,v 1.14 2006/06/29 18:37:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidPolyhedra.hh,v 1.14 2006/06/29 18:37:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidSphere.hh,v 1.11 2006/06/29 18:38:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidTorus.hh,v 1.10 2006/06/29 18:38:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineCurve.hh,v 1.13 2006/06/29 18:38:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineCurve.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineCurve.icc,v 1.7 2006/06/29 18:38:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineCurveWithKnots.hh,v 1.5 2006/06/29 18:38:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineSurface.hh,v 1.11 2006/06/29 18:38:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineSurface.icc,v 1.6 2006/06/29 18:38:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineSurfaceWithKnots.hh,v 1.4 2006/06/29 18:38:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BezierSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BezierSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BezierSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BezierSurface.hh,v 1.7 2006/06/29 18:38:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BezierSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BezierSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BezierSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BezierSurface.icc,v 1.4 2006/06/29 18:38:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BoundingBox3D.hh,v 1.7 2007/05/11 13:49:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BoundingBox3D.icc,v 1.4 2006/06/29 18:38:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CircularCurve.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CircularCurve.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CircularCurve.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CircularCurve.hh,v 1.9 2006/06/29 18:38:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CircularCurve.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CircularCurve.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CircularCurve.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CircularCurve.icc,v 1.6 2006/06/29 18:38:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompositeCurve.hh,v 1.8 2006/06/29 18:38:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CompositeCurve.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompositeCurve.icc,v 1.5 2006/06/29 18:38:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Conic.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Conic.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Conic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Conic.hh,v 1.7 2006/06/29 18:38:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Conic.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Conic.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Conic.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Conic.icc,v 1.4 2006/06/29 18:38:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConicalSurface.hh,v 1.10 2006/06/29 18:38:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ConicalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConicalSurface.icc,v 1.4 2006/06/29 18:38:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ControlPoints.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ControlPoints.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ControlPoints.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ControlPoints.hh,v 1.7 2006/06/29 18:38:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ControlPoints.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ControlPoints.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ControlPoints.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ControlPoints.icc,v 1.3 2006/06/29 18:38:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ConvexHull.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ConvexHull.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ConvexHull.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConvexHull.hh,v 1.7 2006/06/29 18:38:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Curve.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Curve.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Curve.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Curve.hh,v 1.11 2007/05/11 13:49:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Curve.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Curve.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Curve.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Curve.icc,v 1.7 2006/06/29 18:38:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CurvePoint.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CurvePoint.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CurvePoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurvePoint.hh,v 1.6 2006/06/29 18:39:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CurvePoint.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CurvePoint.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CurvePoint.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurvePoint.icc,v 1.4 2006/06/29 18:39:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurveRayIntersection.hh,v 1.6 2007/05/11 13:49:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurveRayIntersection.icc,v 1.4 2006/06/29 18:39:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CurveVector.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CurveVector.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CurveVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurveVector.hh,v 1.7 2006/06/29 18:39:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CylindricalSurface.hh,v 1.10 2006/06/29 18:39:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CylindricalSurface.icc,v 1.4 2006/06/29 18:39:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Ellipse.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Ellipse.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Ellipse.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ellipse.hh,v 1.10 2006/06/29 18:39:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Ellipse.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Ellipse.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Ellipse.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ellipse.icc,v 1.8 2006/06/29 18:39:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FConicalSurface.hh,v 1.13 2006/06/29 18:39:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FConicalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FConicalSurface.icc,v 1.4 2006/06/29 18:39:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FCylindricalSurface.hh,v 1.13 2006/06/29 18:39:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FCylindricalSurface.icc,v 1.4 2006/06/29 18:39:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FPlane.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FPlane.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FPlane.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FPlane.hh,v 1.13 2006/06/29 18:39:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4FPlane.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4FPlane.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4FPlane.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FPlane.icc,v 1.6 2006/06/29 18:39:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Globals.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Globals.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Globals.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Globals.hh,v 1.5 2006/06/29 18:39:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A.Breakstone
Index: trunk/source/geometry/solids/BREPS/include/G4Hyperbola.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Hyperbola.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Hyperbola.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Hyperbola.hh,v 1.10 2006/06/29 18:39:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Hyperbola.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Hyperbola.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Hyperbola.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Hyperbola.icc,v 1.9 2006/06/29 18:39:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4KnotVector.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4KnotVector.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4KnotVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4KnotVector.hh,v 1.10 2007/05/11 13:49:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4KnotVector.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4KnotVector.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4KnotVector.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4KnotVector.icc,v 1.5 2006/06/29 18:39:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Line.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Line.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Line.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Line.hh,v 1.9 2006/06/29 18:39:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Line.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Line.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Line.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Line.icc,v 1.10 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OsloMatrix.hh,v 1.6 2006/06/29 18:39:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4OsloMatrix.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OsloMatrix.icc,v 1.4 2006/06/29 18:39:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Parabola.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Parabola.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Parabola.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Parabola.hh,v 1.10 2006/06/29 18:39:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Parabola.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Parabola.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Parabola.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Parabola.icc,v 1.8 2006/06/29 18:39:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacedSolid.hh,v 1.10 2006/06/29 18:39:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4PlacedSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacedSolid.icc,v 1.8 2006/06/29 18:40:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4PlacementVector.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4PlacementVector.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4PlacementVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacementVector.hh,v 1.7 2006/06/29 18:40:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Plane.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Plane.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Plane.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Plane.hh,v 1.6 2006/06/29 18:40:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Point3DVector.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Point3DVector.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Point3DVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Point3DVector.hh,v 1.8 2006/06/29 18:40:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4PointRat.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4PointRat.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4PointRat.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PointRat.hh,v 1.10 2006/06/29 18:40:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4PointRat.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4PointRat.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4PointRat.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PointRat.icc,v 1.4 2006/06/29 18:40:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProjectedSurface.hh,v 1.7 2006/06/29 18:40:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProjectedSurface.icc,v 1.5 2006/06/29 18:40:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Ray.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Ray.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Ray.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ray.hh,v 1.9 2006/06/29 18:40:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Ray.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Ray.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Ray.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ray.icc,v 1.7 2006/06/29 18:40:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RectangularTrimmedSurface.hh,v 1.8 2006/06/29 18:40:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4STEPEntity.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4STEPEntity.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4STEPEntity.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4STEPEntity.hh,v 1.7 2006/06/29 18:40:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Sort.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Sort.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Sort.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Sort.hh,v 1.5 2006/06/29 18:40:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SphericalSurface.hh,v 1.10 2006/06/29 18:40:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SphericalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SphericalSurface.icc,v 1.4 2006/06/29 18:40:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Surface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Surface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Surface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Surface.hh,v 1.10 2007/05/11 13:49:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4Surface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4Surface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4Surface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Surface.icc,v 1.5 2006/06/29 18:40:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceBoundary.hh,v 1.8 2006/06/29 18:40:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceBoundary.icc,v 1.5 2006/06/29 18:40:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SurfaceList.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SurfaceList.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SurfaceList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceList.hh,v 1.6 2006/06/29 18:40:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceOfLinearExtrusion.hh,v 1.5 2006/06/29 18:40:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceOfRevolution.hh,v 1.5 2006/06/29 18:40:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ThreeMat.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ThreeMat.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ThreeMat.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ThreeMat.hh,v 1.10 2006/06/29 18:40:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ToroidalSurface.hh,v 1.7 2006/06/29 18:41:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ToroidalSurface.icc,v 1.4 2006/06/29 18:41:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/include/G4UVHit.hh
===================================================================
--- trunk/source/geometry/solids/BREPS/include/G4UVHit.hh	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/include/G4UVHit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UVHit.hh,v 1.7 2006/06/29 18:41:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Assembly.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Assembly.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Assembly.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Assembly.cc,v 1.6 2006/06/29 18:41:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Axis2Placement3D.cc,v 1.9 2006/06/29 18:41:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolid.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolid.cc,v 1.37 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidBox.cc,v 1.11 2008/01/22 16:03:52 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BREPSolidCone.cc,v 1.15 2006/06/29 18:41:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BREPSolidCylinder.cc,v 1.11 2006/06/29 18:41:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidOpenPCone.cc,v 1.11 2006/06/29 18:41:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BREPSolidPCone.cc,v 1.38 2006/06/29 18:41:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BREPSolidPolyhedra.cc,v 1.35 2008/01/22 16:04:58 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidSphere.cc,v 1.11 2006/06/29 18:41:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BREPSolidTorus.cc,v 1.9 2006/06/29 18:41:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BSplineCurve.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BSplineCurve.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineCurve.cc,v 1.12 2006/06/29 18:41:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineCurveWithKnots.cc,v 1.5 2006/06/29 18:41:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BSplineSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BSplineSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineSurface.cc,v 1.15 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BSplineSurfaceWithKnots.cc,v 1.4 2006/06/29 18:41:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BezierSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BezierSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BezierSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BezierSurface.cc,v 1.10 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BoundingBox3D.cc,v 1.12 2007/07/16 08:06:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4CircularCurve.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4CircularCurve.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4CircularCurve.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CircularCurve.cc,v 1.10 2006/06/29 18:41:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4CompositeCurve.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4CompositeCurve.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompositeCurve.cc,v 1.13 2006/06/29 18:41:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Conic.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Conic.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Conic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Conic.cc,v 1.8 2006/06/29 18:41:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4ConicalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4ConicalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConicalSurface.cc,v 1.11 2006/06/29 18:41:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4ControlPoints.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4ControlPoints.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4ControlPoints.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ControlPoints.cc,v 1.8 2006/06/29 18:42:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Curve.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Curve.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Curve.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Curve.cc,v 1.9 2007/07/16 08:06:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4CurvePoint.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4CurvePoint.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4CurvePoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurvePoint.cc,v 1.5 2006/06/29 18:42:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CurveRayIntersection.cc,v 1.8 2007/07/16 08:06:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CylindricalSurface.cc,v 1.8 2006/06/29 18:42:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Ellipse.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Ellipse.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Ellipse.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ellipse.cc,v 1.12 2007/05/18 07:33:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4FConicalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4FConicalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FConicalSurface.cc,v 1.19 2006/06/29 18:42:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FCylindricalSurface.cc,v 1.16 2006/06/29 18:42:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4FPlane.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4FPlane.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4FPlane.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FPlane.cc,v 1.16 2006/06/29 18:42:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Hyperbola.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Hyperbola.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Hyperbola.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Hyperbola.cc,v 1.12 2007/05/18 07:33:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4KnotVector.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4KnotVector.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4KnotVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4KnotVector.cc,v 1.11 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Line.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Line.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Line.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Line.cc,v 1.10 2006/06/29 18:42:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4OsloMatrix.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4OsloMatrix.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OsloMatrix.cc,v 1.6 2006/06/29 18:42:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Parabola.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Parabola.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Parabola.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Parabola.cc,v 1.9 2007/05/18 07:33:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4PlacedSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4PlacedSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacedSolid.cc,v 1.6 2007/05/11 13:49:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4PointRat.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4PointRat.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4PointRat.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PointRat.cc,v 1.6 2006/06/29 18:42:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProjectedSurface.cc,v 1.12 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Ray.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Ray.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Ray.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ray.cc,v 1.12 2008/07/08 10:00:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RectangularTrimmedSurface.cc,v 1.7 2006/06/29 18:42:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Sort.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Sort.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Sort.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Sort.cc,v 1.5 2006/06/29 18:42:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4SphericalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4SphericalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SphericalSurface.cc,v 1.10 2006/06/29 18:42:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4Surface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4Surface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4Surface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Surface.cc,v 1.17 2007/07/16 08:06:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceBoundary.cc,v 1.14 2006/06/29 18:42:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4SurfaceList.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4SurfaceList.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4SurfaceList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceList.cc,v 1.8 2008/03/13 14:18:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SurfaceOfLinearExtrusion.cc,v 1.4 2006/06/29 18:42:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc	(revision 1228)
@@ -29,5 +29,5 @@
 //
 // $Id: G4SurfaceOfRevolution.cc,v 1.4 2006/06/29 18:42:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4ThreeMat.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4ThreeMat.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4ThreeMat.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ThreeMat.cc,v 1.8 2006/06/29 18:42:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
===================================================================
--- trunk/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ToroidalSurface.cc,v 1.10 2006/06/29 18:42:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BooleanSolid.hh,v 1.15 2006/10/19 15:34:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.icc
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.icc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4BooleanSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BooleanSolid.icc,v 1.4 2006/10/20 14:20:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DisplacedSolid.hh,v 1.19 2006/06/29 18:43:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IntersectionSolid.hh,v 1.9 2006/06/29 18:43:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SubtractionSolid.hh,v 1.9 2006/06/29 18:43:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/Boolean/include/G4UnionSolid.hh
===================================================================
--- trunk/source/geometry/solids/Boolean/include/G4UnionSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/include/G4UnionSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnionSolid.hh,v 1.10 2006/06/29 18:43:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
===================================================================
--- trunk/source/geometry/solids/Boolean/src/G4BooleanSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/src/G4BooleanSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BooleanSolid.cc,v 1.21 2006/10/19 15:34:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation for the abstract base class for solids created by boolean 
Index: trunk/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
===================================================================
--- trunk/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DisplacedSolid.cc,v 1.27 2006/06/29 18:43:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation for G4DisplacedSolid class for boolean 
Index: trunk/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
===================================================================
--- trunk/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IntersectionSolid.cc,v 1.30 2006/11/08 09:37:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation of methods for the class G4IntersectionSolid
Index: trunk/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
===================================================================
--- trunk/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SubtractionSolid.cc,v 1.31 2007/10/23 14:42:31 grichine Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation of methods for the class G4IntersectionSolid
Index: trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc
===================================================================
--- trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnionSolid.cc,v 1.35 2007/10/23 14:42:31 grichine Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation of methods for the class G4IntersectionSolid
Index: trunk/source/geometry/solids/CSG/History
===================================================================
--- trunk/source/geometry/solids/CSG/History	(revision 1227)
+++ trunk/source/geometry/solids/CSG/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.109 2008/11/21 09:50:20 gcosmo Exp $
+$Id: History,v 1.119 2009/11/30 10:20:53 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,55 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Nov 30, 2009  V.Grichine                 geom-csg-V09-02-08
+- G4Orb: moved debug warning in DistanceToIn(p,v) within G4CSGDEBUG flag.
+
+Nov 26, 2009  T.Nikitina                 geom-csg-V09-02-07
+- G4Torus: fix in SolveNumericJT() in order to take in account the difference
+  in the value of theta for different intervals, [0:pi] or [-pi:0], and for
+  SPhi in [0:twopi] or [-twopi:0]. Addresses problem report #1086.
+
+Nov 12, 2009  T.Nikitina                 geom-csg-V09-02-06
+- G4Cons: fix to DistanceToIn(p,v), added a check on the direction in case 
+  of point on surface. Fixes a problem of stuck tracks observed in CMS, due
+  to wrong reply from the solid for points on the inner radius surface base
+  with direction along the imaginary extension of the cone.
+- Added test case to internal test testG4Cons2.
+
+Aug 07, 2009  T.Nikitina                 geom-csg-V09-02-05
+- G4Sphere: fix for the calculation of the normal in DistanceToOut()
+  to avoid cases of division by zero in specific configurations.
+  Addresses problem report #977.
+
+Jun 30, 2009  T.Nikitina                 geom-csg-V09-02-04
+- Introduced to DistanceToIn(p,v) splitting of the distance for point very far
+  from intersection area and big difference between solid dimensions and
+  distance to it; resolves issue observed on 64 bits problem. Affected solids:
+  G4Tubs, G4Cons, G4Sphere, G4Orb. Addresses problem report #1022.
+- Fixed rare cases of NaN on G4Sphere.
+
+Jun 09, 2009  G.Cosmo                    geom-csg-V09-02-03
+- Fixed case of non-initialised start-Phi value in G4Tubs and G4Cons,
+  problem introduced following modifications in tag "geom-csg-V09-02-00".
+
+May 14, 2009  T.Nikitina                 geom-csg-V09-02-02
+- G4Sphere: initialise flags for full sphere in constructor.
+
+May 14, 2009  T.Nikitina                 geom-csg-V09-02-01
+- G4Sphere: correction di DistanceToOut(p,v, ...) for phi sections for
+  rays passing though zero.
+- More minor refiniments to G4Sphere following review.
+
+May 08, 2009  G.Cosmo                    geom-csg-V09-02-00
+- G4Sphere: implemented speed improvements and corrections from joint
+  code review of G4Sphere class. Cached computation for half-tolerances
+  and use of Boolean flag for identifying if full-sphere, shell or section.
+  Implemented caching of trigonometric values, now directly computed inside
+  modifiers for Phi and Theta angles as required for parametrised cases.
+  Rationalised usage of relative radial tolerances.
+- G4Tubs, G4Cons: rationalised usage of modifiers for Phi angles and
+  simplified constructors.
+- Added new test case for relatively big spheres in unit tests testG4Orb
+  and testG4Sphere, based on problem report #1046.
 
 Nov 21, 2008  G.Cosmo                    geom-csg-V09-01-08
Index: trunk/source/geometry/solids/CSG/include/G4Box.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Box.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Box.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Box.hh,v 1.17 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Box.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Box.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Box.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Box.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4CSGSolid.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4CSGSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4CSGSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CSGSolid.hh,v 1.12 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  
Index: trunk/source/geometry/solids/CSG/include/G4Cons.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Cons.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Cons.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Cons.hh,v 1.21 2008/11/06 11:04:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Cons.hh,v 1.22 2009/03/31 09:56:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -80,47 +80,48 @@
                  G4double pDz,
                  G4double pSPhi, G4double pDPhi);
-         
-    virtual ~G4Cons() ;
+      //
+      // Constructs a cone with the given name and dimensions
+
+   ~G4Cons() ;
+      //
+      // Destructor
 
     // Accessors
 
-    inline G4double    GetInnerRadiusMinusZ() const;
-    inline G4double    GetOuterRadiusMinusZ() const;
-    inline G4double    GetInnerRadiusPlusZ()  const;
-    inline G4double    GetOuterRadiusPlusZ()  const;
-  
-    inline G4double    GetZHalfLength()       const;
-  
-    inline G4double    GetStartPhiAngle () const;
-    inline G4double    GetDeltaPhiAngle () const;
+    inline G4double GetInnerRadiusMinusZ() const;
+    inline G4double GetOuterRadiusMinusZ() const;
+    inline G4double GetInnerRadiusPlusZ()  const;
+    inline G4double GetOuterRadiusPlusZ()  const;
+    inline G4double GetZHalfLength()       const;
+    inline G4double GetStartPhiAngle()     const;
+    inline G4double GetDeltaPhiAngle()     const;
   
     // Modifiers
 
-    inline void    SetInnerRadiusMinusZ( G4double Rmin1 );
-    inline void    SetOuterRadiusMinusZ( G4double Rmax1 );
-    inline void    SetInnerRadiusPlusZ ( G4double Rmin2 );
-    inline void    SetOuterRadiusPlusZ ( G4double Rmax2 );
-         
-    inline void    SetZHalfLength      ( G4double newDz );
-    inline void    SetStartPhiAngle    ( G4double newSPhi);
-    inline void    SetDeltaPhiAngle    ( G4double newDPhi);
+    inline void SetInnerRadiusMinusZ (G4double Rmin1 );
+    inline void SetOuterRadiusMinusZ (G4double Rmax1 );
+    inline void SetInnerRadiusPlusZ  (G4double Rmin2 );
+    inline void SetOuterRadiusPlusZ  (G4double Rmax2 );
+    inline void SetZHalfLength       (G4double newDz );
+    inline void SetStartPhiAngle     (G4double newSPhi, G4bool trig=true);
+    inline void SetDeltaPhiAngle     (G4double newDPhi);
 
     // Other methods for solid
 
-    inline G4double    GetCubicVolume();
-    inline G4double    GetSurfaceArea();
-
-    void ComputeDimensions(G4VPVParameterisation* p,
-                           const G4int n,
-                           const G4VPhysicalVolume* pRep);
-
-    G4bool CalculateExtent(const EAxis pAxis,
-                           const G4VoxelLimits& pVoxelLimit,
-                           const G4AffineTransform& pTransform,
-                                 G4double& pmin, G4double& pmax) const;         
-
-    EInside Inside(const G4ThreeVector& p) const;
-
-    G4ThreeVector SurfaceNormal(const G4ThreeVector& p) const;
+    inline G4double GetCubicVolume();
+    inline G4double GetSurfaceArea();
+
+    void ComputeDimensions(       G4VPVParameterisation* p,
+                            const G4int n,
+                            const G4VPhysicalVolume* pRep );
+
+    G4bool CalculateExtent( const EAxis pAxis,
+                            const G4VoxelLimits& pVoxelLimit,
+                            const G4AffineTransform& pTransform,
+                                  G4double& pmin, G4double& pmax ) const;         
+
+    EInside Inside( const G4ThreeVector& p ) const;
+
+    G4ThreeVector SurfaceNormal( const G4ThreeVector& p ) const;
 
     G4double DistanceToIn (const G4ThreeVector& p,
@@ -134,5 +135,5 @@
     G4double DistanceToOut(const G4ThreeVector& p) const;
 
-    G4GeometryType  GetEntityType() const;
+    G4GeometryType GetEntityType() const;
         
     G4ThreeVector GetPointOnSurface() const; 
@@ -160,45 +161,49 @@
     inline G4double    GetRmin2() const;
     inline G4double    GetRmax2() const;
-  
     inline G4double    GetDz()    const;
-  
     inline G4double    GetSPhi() const;
     inline G4double    GetDPhi() const;
 
-  protected:
+  private:
  
     G4ThreeVectorList*
     CreateRotatedVertices(const G4AffineTransform& pTransform) const;
   
-    G4double fRmin1, fRmin2, fRmax1, fRmax2, fDz, fSPhi, fDPhi;
-    G4bool fPhiFullCone;
+    inline void Initialize();
+      //
+      // Reset relevant values to zero
+
+    inline void CheckSPhiAngle(G4double sPhi);
+    inline void CheckDPhiAngle(G4double dPhi);
+    inline void CheckPhiAngles(G4double sPhi, G4double dPhi);
+      //
+      // Reset relevant flags and angle values
+
+    inline void InitializeTrigonometry();
+      //
+      // Recompute relevant trigonometric values and cache them
+
+    G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
+      //
+      // Algorithm for SurfaceNormal() following the original
+      // specification for points not on the surface
+
+  private:
 
     // Used by distanceToOut
-  
+    //
     enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
   
     // used by normal
-  
+    //
     enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
 
-  private:
-
-    inline void Initialise();
-      // Reset relevant values to zero
-
-    inline void InitializeTrigonometry();
-      //
-      // Recompute relevant trigonometric values and cache them
-
-    G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
-      //
-      // Algorithm for SurfaceNormal() following the original
-      // specification for points not on the surface
-
-  private:
-
     G4double kRadTolerance, kAngTolerance;
       //
       // Radial and angular tolerances
+
+    G4double fRmin1, fRmin2, fRmax1, fRmax2, fDz, fSPhi, fDPhi;
+      //
+      // Radial and angular dimensions
 
     G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
@@ -206,4 +211,8 @@
       //
       // Cached trigonometric values
+
+    G4bool fPhiFullCone;
+      //
+      // Flag for identification of section or full cone
 };
 
Index: trunk/source/geometry/solids/CSG/include/G4Cons.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Cons.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Cons.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Cons.icc,v 1.8 2008/11/06 10:55:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Cons.icc,v 1.11 2009/06/09 16:08:23 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
@@ -37,8 +37,50 @@
 
 inline
-void G4Cons::Initialise()
-{
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
+G4double G4Cons::GetInnerRadiusMinusZ() const
+{
+  return fRmin1 ;
+}
+
+inline
+G4double G4Cons::GetOuterRadiusMinusZ() const
+{
+  return fRmax1 ;
+}
+
+inline
+G4double G4Cons::GetInnerRadiusPlusZ() const
+{
+  return fRmin2 ;
+}
+
+inline
+G4double G4Cons::GetOuterRadiusPlusZ() const
+{
+  return fRmax2 ;
+}
+
+inline
+G4double G4Cons::GetZHalfLength() const
+{
+  return fDz ;
+}
+
+inline  
+G4double G4Cons::GetStartPhiAngle() const
+{
+  return fSPhi ;
+}
+
+inline
+G4double G4Cons::GetDeltaPhiAngle() const
+{
+  return fDPhi;
+}
+
+inline
+void G4Cons::Initialize()
+{
+  fCubicVolume = 0.;
+  fSurfaceArea = 0.;
   fpPolyhedron = 0;
 }
@@ -61,44 +103,53 @@
 }
 
-inline
-G4double G4Cons::GetInnerRadiusMinusZ() const
-{
-  return fRmin1 ;
-}
-
-inline
-G4double G4Cons::GetOuterRadiusMinusZ() const
-{
-  return fRmax1 ;
-}
-
-inline
-G4double G4Cons::GetInnerRadiusPlusZ() const
-{
-  return fRmin2 ;
-}
-
-inline
-G4double G4Cons::GetOuterRadiusPlusZ() const
-{
-  return fRmax2 ;
-}
-
-inline
-G4double G4Cons::GetZHalfLength() const
-{
-  return fDz ;
-}
-
-inline  
-G4double G4Cons::GetStartPhiAngle() const
-{
-  return fSPhi ;
-}
-
-inline
-G4double G4Cons::GetDeltaPhiAngle() const
-{
-  return fDPhi;
+inline void G4Cons::CheckSPhiAngle(G4double sPhi)
+{
+  // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+
+  if ( sPhi < 0 )
+  {
+    fSPhi = twopi - std::fmod(std::fabs(sPhi),twopi);
+  }
+  else
+  {
+    fSPhi = std::fmod(sPhi,twopi) ;
+  }
+  if ( fSPhi+fDPhi > twopi )
+  {
+    fSPhi -= twopi ;
+  }
+}
+
+inline void G4Cons::CheckDPhiAngle(G4double dPhi)
+{
+  fPhiFullCone = true;
+  if ( dPhi >= twopi-kAngTolerance*0.5 )
+  {
+    fDPhi=twopi;
+    fSPhi=0;
+  }
+  else
+  {
+    fPhiFullCone = false;
+    if ( dPhi > 0 )
+    {
+      fDPhi = dPhi;
+    }
+    else
+    {
+      G4cerr << "ERROR - G4Cons()::CheckDPhiAngle()" << G4endl
+             << "        Negative or zero delta-Phi (" << dPhi << ") in solid: "
+             << GetName() << G4endl;
+      G4Exception("G4Cons::CheckDPhiAngle()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+    }
+  }
+}
+
+inline void G4Cons::CheckPhiAngles(G4double sPhi, G4double dPhi)
+{
+  CheckDPhiAngle(dPhi);
+  if ( (fDPhi<twopi) && (sPhi) ) { CheckSPhiAngle(sPhi); }
+  InitializeTrigonometry();
 }
 
@@ -107,5 +158,5 @@
 {
   fRmin1= Rmin1 ;
-  Initialise();
+  Initialize();
 }
 
@@ -114,5 +165,5 @@
 {
   fRmax1= Rmax1 ;
-  Initialise();
+  Initialize();
 }
 
@@ -121,5 +172,5 @@
 {
   fRmin2= Rmin2 ;
-  Initialise();
+  Initialize();
 }
 
@@ -128,5 +179,5 @@
 {
   fRmax2= Rmax2 ;
-  Initialise();
+  Initialize();
 }
 
@@ -135,35 +186,23 @@
 {
   fDz= newDz ;
-  Initialise();
-}
-
-inline
-void G4Cons::SetStartPhiAngle ( G4double newSPhi )
-{
-  fSPhi= newSPhi;
-  Initialise();
-  InitializeTrigonometry();
+  Initialize();
+}
+
+inline
+void G4Cons::SetStartPhiAngle ( G4double newSPhi, G4bool compute )
+{
+  // Flag 'compute' can be used to explicitely avoid recomputation of
+  // trigonometry in case SetDeltaPhiAngle() is invoked afterwards
+
+  CheckSPhiAngle(newSPhi);
+  fPhiFullCone = false;
+  if (compute)  { InitializeTrigonometry(); }
+  Initialize();
 }
 
 void G4Cons::SetDeltaPhiAngle ( G4double newDPhi )
 {
-  if ( newDPhi >= twopi-kAngTolerance*0.5 )
-  {
-    fPhiFullCone = true;
-  }
-  else if ( newDPhi > 0 )
-  {
-    fPhiFullCone = false;
-  }
-  else
-  {
-     G4cerr << "ERROR - G4Cons()::SetDeltaPhiAngle() : " << GetName() << G4endl
-            << "        Negative delta-Phi ! - " << newDPhi << G4endl;
-     G4Exception("G4Cons::SetDeltaPhiAngle()", "InvalidSetup",
-                  FatalException, "Invalid dphi.");
-  }
-  fDPhi=  newDPhi;
-  Initialise();
-  InitializeTrigonometry();
+  CheckPhiAngles(fSPhi, newDPhi);
+  Initialize();
 }
 
Index: trunk/source/geometry/solids/CSG/include/G4Orb.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Orb.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Orb.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Orb.hh,v 1.11 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/CSG/include/G4Orb.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Orb.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Orb.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Orb.icc,v 1.5 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Para.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Para.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Para.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Para.hh,v 1.18 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/CSG/include/G4Para.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Para.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Para.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Para.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Sphere.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Sphere.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Sphere.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Sphere.hh,v 1.21 2008/11/21 09:50:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Sphere.hh,v 1.24 2009/03/31 07:51:49 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -36,5 +36,5 @@
 // Class description:
 //
-//   A G4Sphere is, in the general case, section of a spherical shell,
+//   A G4Sphere is, in the general case, a section of a spherical shell,
 //   between specified phi and theta angles
 //
@@ -83,7 +83,12 @@
                    G4double pSPhi, G4double pDPhi,
                    G4double pSTheta, G4double pDTheta);
+      //
+      // Constructs a sphere or sphere shell section
+      // with the given name and dimensions
        
-    virtual ~G4Sphere() ;
-    
+   ~G4Sphere();
+      //
+      // Destructor
+
     // Accessors
        
@@ -99,5 +104,5 @@
     inline void SetInnerRadius    (G4double newRMin);
     inline void SetOuterRadius    (G4double newRmax);
-    inline void SetStartPhiAngle  (G4double newSphi);
+    inline void SetStartPhiAngle  (G4double newSphi, G4bool trig=true);
     inline void SetDeltaPhiAngle  (G4double newDphi);
     inline void SetStartThetaAngle(G4double newSTheta);
@@ -107,5 +112,5 @@
 
     inline G4double GetCubicVolume();
-    inline G4double GetSurfaceArea();
+    G4double GetSurfaceArea();
 
     void ComputeDimensions(      G4VPVParameterisation* p,
@@ -142,4 +147,5 @@
 
     // Visualisation functions
+
     G4VisExtent   GetExtent          () const;    
     void          DescribeYourselfTo(G4VGraphicsScene& scene) const;
@@ -150,4 +156,5 @@
    
     G4Sphere(__void__&);
+      //
       // Fake default constructor for usage restricted to direct object
       // persistency for clients requiring preallocation of memory for
@@ -165,32 +172,65 @@
     inline void SetInsideRadius(G4double newRmin);
 
-  protected:
+  private:
  
     G4ThreeVectorList*
     CreateRotatedVertices(const G4AffineTransform& pTransform,
                                 G4int& noPolygonVertices) const;
-  
+      //
+      // Creates the List of transformed vertices in the format required
+      // for G4VSolid:: ClipCrossSection and ClipBetweenSections
+
+    inline void Initialize();
+      //
+      // Reset relevant values to zero
+
+    inline void CheckThetaAngles(G4double sTheta, G4double dTheta);
+    inline void CheckSPhiAngle(G4double sPhi);
+    inline void CheckDPhiAngle(G4double dPhi);
+    inline void CheckPhiAngles(G4double sPhi, G4double dPhi);
+      //
+      // Reset relevant flags and angle values
+
+    inline void InitializePhiTrigonometry();
+    inline void InitializeThetaTrigonometry();
+      //
+      // Recompute relevant trigonometric values and cache them
+
+    G4ThreeVector ApproxSurfaceNormal( const G4ThreeVector& p) const;
+      //
+      // Algorithm for SurfaceNormal() following the original
+      // specification for points not on the surface
+
+  private:
+
     // Used by distanceToOut
-  
+    //
     enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kSTheta,kETheta};
   
     // used by normal
-  
+    //
     enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNSTheta,kNETheta};
 
-  private:
-
-    G4ThreeVector ApproxSurfaceNormal( const G4ThreeVector& p) const;
-      // Algorithm for SurfaceNormal() following the original
-      // specification for points not on the surface
-
-  private:
-
-    G4double kAngTolerance, kRadTolerance;
-
-    G4double fRmin,fRmax,
-             fSPhi,fDPhi,
-             fSTheta,fDTheta;
-    G4double fEpsilon;
+    G4double fEpsilon, fRminTolerance, fRmaxTolerance, kAngTolerance;
+      //
+      // Radial and angular tolerances
+
+    G4double fRmin, fRmax, fSPhi, fDPhi, fSTheta, fDTheta;
+      //
+      // Radial and angular dimensions
+
+    G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
+             sinSPhi, cosSPhi, sinEPhi, cosEPhi, hDPhi, cPhi, ePhi;
+      //
+      // Cached trigonometric values for Phi angle
+
+    G4double sinSTheta, cosSTheta, sinETheta, cosETheta,
+             tanSTheta, tanSTheta2, tanETheta, tanETheta2, eTheta;
+      //
+      // Cached trigonometric values for Theta angle
+
+    G4bool fFullPhiSphere, fFullThetaSphere, fFullSphere;
+      //
+      // Flags for identification of section, shell or full sphere
 };
 
Index: trunk/source/geometry/solids/CSG/include/G4Sphere.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Sphere.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Sphere.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Sphere.icc,v 1.8 2008/11/21 09:50:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Sphere.icc,v 1.11 2009/05/13 11:23:00 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
@@ -77,11 +77,144 @@
 }
 
+inline 
+void G4Sphere::Initialize()
+{
+  fCubicVolume = 0.;
+  fSurfaceArea = 0.;
+  fpPolyhedron = 0;
+}
+
+inline
+void G4Sphere::InitializePhiTrigonometry()
+{
+  hDPhi = 0.5*fDPhi;                       // half delta phi
+  cPhi  = fSPhi + hDPhi; 
+  ePhi  = fSPhi + fDPhi;
+
+  sinCPhi    = std::sin(cPhi);
+  cosCPhi    = std::cos(cPhi);
+  cosHDPhiIT = std::cos(hDPhi - 0.5*kAngTolerance); // inner/outer tol half dphi
+  cosHDPhiOT = std::cos(hDPhi + 0.5*kAngTolerance);
+  sinSPhi = std::sin(fSPhi);
+  cosSPhi = std::cos(fSPhi);
+  sinEPhi = std::sin(ePhi);
+  cosEPhi = std::cos(ePhi);
+}
+
+inline
+void G4Sphere::InitializeThetaTrigonometry()
+{
+  eTheta  = fSTheta + fDTheta;
+
+  sinSTheta = std::sin(fSTheta);
+  cosSTheta = std::cos(fSTheta);
+  sinETheta = std::sin(eTheta);
+  cosETheta = std::cos(eTheta);
+
+  tanSTheta  = std::tan(fSTheta);
+  tanSTheta2 = tanSTheta*tanSTheta;
+  tanETheta  = std::tan(eTheta);
+  tanETheta2 = tanETheta*tanETheta;
+}
+
+inline
+void G4Sphere::CheckThetaAngles(G4double sTheta, G4double dTheta)
+{
+  if ( (sTheta<0) || (sTheta>pi) )
+  {
+    G4cerr << "ERROR - G4Sphere()::CheckThetaAngles()" << G4endl
+           << "        Invalid starting Theta angle for solid: " << GetName()
+           << G4endl;
+    G4Exception("G4Sphere::CheckThetaAngles()", "InvalidSetup",
+                FatalException, "sTheta outside 0-PI range.");
+  }
+  else
+  {
+    fSTheta=sTheta;
+  }
+  if ( dTheta+sTheta >= pi )
+  {
+    fDTheta=pi-sTheta;
+  }
+  else if ( dTheta > 0 )
+  {
+    fDTheta=dTheta;
+  }
+  else
+  {
+    G4cerr << "ERROR - G4Sphere()::CheckThetaAngles(): " << G4endl
+           << "        Negative delta-Theta (" << dTheta << "), for solid: "
+           << GetName() << G4endl;
+    G4Exception("G4Sphere::CheckThetaAngles()", "InvalidSetup",
+                FatalException, "Invalid dTheta.");
+  }
+  if ( fDTheta-fSTheta < pi ) { fFullThetaSphere = false; }
+  else                        { fFullThetaSphere = true ; }
+  fFullSphere = fFullPhiSphere && fFullThetaSphere;
+
+  InitializeThetaTrigonometry();
+}
+
+inline
+void G4Sphere::CheckSPhiAngle(G4double sPhi)
+{
+  // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+
+  if ( sPhi < 0 )
+  {
+    fSPhi = twopi - std::fmod(std::fabs(sPhi),twopi);
+  }
+  else
+  {
+    fSPhi = std::fmod(sPhi,twopi) ;
+  }
+  if ( fSPhi+fDPhi > twopi )
+  {
+    fSPhi -= twopi ;
+  }
+}
+
+inline
+void G4Sphere::CheckDPhiAngle(G4double dPhi)
+{
+  fFullPhiSphere = true;
+  if ( dPhi >= twopi-kAngTolerance*0.5 )
+  {
+    fDPhi=twopi;
+    fSPhi=0;
+  }
+  else
+  {
+    fFullPhiSphere = false;
+    if ( dPhi > 0 )
+    {
+      fDPhi = dPhi;
+    }
+    else
+    {
+      G4cerr << "ERROR - G4Sphere()::CheckDPhiAngle(): " << GetName() << G4endl
+             << "        Negative delta-Phi ! - "
+             << dPhi << G4endl;
+      G4Exception("G4Sphere::CheckDPhiAngle()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+    }
+  }
+}
+
+inline
+void G4Sphere::CheckPhiAngles(G4double sPhi, G4double dPhi)
+{
+  CheckDPhiAngle(dPhi);
+  if (!fFullPhiSphere && sPhi) { CheckSPhiAngle(sPhi); }
+  fFullSphere = fFullPhiSphere && fFullThetaSphere;
+
+  InitializePhiTrigonometry();
+}
+
 inline
 void G4Sphere::SetInsideRadius(G4double newRmin)
 {
   fRmin= newRmin;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
+  Initialize();
 }
 
@@ -90,7 +223,5 @@
 {
   fRmin= newRmin;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
+  Initialize();
 }
 
@@ -99,25 +230,24 @@
 {
   fRmax= newRmax;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
-}
-
-inline
-void G4Sphere::SetStartPhiAngle(G4double newSphi)
-{
-  fSPhi= newSphi;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
-}
-
-inline
-void G4Sphere::SetDeltaPhiAngle(G4double newDphi)
-{
-  fDPhi= newDphi;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
+  Initialize();
+}
+
+inline
+void G4Sphere::SetStartPhiAngle(G4double newSPhi, G4bool compute)
+{
+  // Flag 'compute' can be used to explicitely avoid recomputation of
+  // trigonometry in case SetDeltaPhiAngle() is invoked afterwards
+
+  CheckSPhiAngle(newSPhi);
+  fFullPhiSphere = false;
+  if (compute)  { InitializePhiTrigonometry(); }
+  Initialize();
+}
+
+inline
+void G4Sphere::SetDeltaPhiAngle(G4double newDPhi)
+{
+  CheckPhiAngles(fSPhi, newDPhi);
+  Initialize();
 }
 
@@ -125,8 +255,6 @@
 void G4Sphere::SetStartThetaAngle(G4double newSTheta)
 {
-  fSTheta=newSTheta;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
+  CheckThetaAngles(newSTheta, fDTheta);
+  Initialize();
 }
 
@@ -134,8 +262,6 @@
 void G4Sphere::SetDeltaThetaAngle(G4double newDTheta)
 {
-  fDTheta=newDTheta;
-  fCubicVolume= 0.;
-  fSurfaceArea= 0.;
-  fpPolyhedron = 0;
+  CheckThetaAngles(fSTheta, newDTheta);
+  Initialize();
 }
 
@@ -182,54 +308,6 @@
 {
   if(fCubicVolume != 0.) {;}
-  else   fCubicVolume = fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta))*
-                              (fRmax*fRmax*fRmax-fRmin*fRmin*fRmin)/3.; 
+  else { fCubicVolume = fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta))*
+                              (fRmax*fRmax*fRmax-fRmin*fRmin*fRmin)/3.; }
   return fCubicVolume;
 }
-
-
-inline
-G4double G4Sphere::GetSurfaceArea()
-{
-  if(fSurfaceArea != 0.) {;}
-  else
-  {   
-    G4double Rsq=fRmax*fRmax;
-    G4double rsq=fRmin*fRmin;
-         
-    fSurfaceArea = fDPhi*(rsq+Rsq)*(std::cos(fSTheta)
-                 - std::cos(fSTheta+fDTheta));
-    if(fDPhi < twopi)
-    {
-      fSurfaceArea = fSurfaceArea + fDTheta*(Rsq-rsq);
-    }
-    if(fSTheta >0)
-    {
-      G4double acos1=std::acos( std::pow(std::sin(fSTheta),2)
-                               *std::cos(fDPhi)
-                               +std::pow(std::cos(fSTheta),2));
-      if(fDPhi>pi)
-      { 
-        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos1);
-      }
-      else
-      {
-        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos1;
-      }
-    }
-    if(fDTheta+fSTheta < pi)
-    {
-      G4double acos2=std::acos( std::pow(std::sin(fSTheta+fDTheta),2)
-                               *std::cos(fDPhi)
-                               +std::pow(std::cos(fSTheta+fDTheta),2));
-      if(fDPhi>pi)
-      { 
-        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos2);
-      }
-      else
-      {
-        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos2;
-      }
-    }
-  }
-  return fSurfaceArea;
-}
Index: trunk/source/geometry/solids/CSG/include/G4Torus.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Torus.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Torus.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Torus.hh,v 1.27 2007/05/18 07:38:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/CSG/include/G4Torus.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Torus.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Torus.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Torus.icc,v 1.6 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Trap.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Trap.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Trap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trap.hh,v 1.17 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/CSG/include/G4Trap.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Trap.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Trap.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trap.icc,v 1.8 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Trd.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Trd.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Trd.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trd.hh,v 1.16 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/CSG/include/G4Trd.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Trd.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Trd.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trd.icc,v 1.7 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/include/G4Tubs.hh
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Tubs.hh	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Tubs.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Tubs.hh,v 1.21 2008/11/06 10:55:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Tubs.hh,v 1.22 2009/03/26 16:25:44 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -86,5 +86,5 @@
       // Constructs a tubs with the given name and dimensions
 
-    virtual ~G4Tubs();
+   ~G4Tubs();
       //
       // Destructor
@@ -103,5 +103,5 @@
     inline void SetOuterRadius   (G4double newRMax);
     inline void SetZHalfLength   (G4double newDz);
-    inline void SetStartPhiAngle (G4double newSPhi);
+    inline void SetStartPhiAngle (G4double newSPhi, G4bool trig=true);
     inline void SetDeltaPhiAngle (G4double newDPhi);
     
@@ -159,5 +159,5 @@
     inline G4double GetDPhi() const;
 
-  protected:
+  private:
 
     G4ThreeVectorList*
@@ -167,20 +167,13 @@
       // for G4VSolid:: ClipCrossSection and ClipBetweenSections
 
-    G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
-    G4bool fPhiFullTube;
-   
-      // Used by distanceToOut
-
-    enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
-
-      // Used by normal
-
-    enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
-
-  private:
-
     inline void Initialize();
       //
       // Reset relevant values to zero
+
+    inline void CheckSPhiAngle(G4double sPhi);
+    inline void CheckDPhiAngle(G4double dPhi);
+    inline void CheckPhiAngles(G4double sPhi, G4double dPhi);
+      //
+      // Reset relevant flags and angle values
 
     inline void InitializeTrigonometry();
@@ -195,12 +188,28 @@
   private:
 
+    // Used by distanceToOut
+    //
+    enum ESide {kNull,kRMin,kRMax,kSPhi,kEPhi,kPZ,kMZ};
+
+    // Used by normal
+    //
+    enum ENorm {kNRMin,kNRMax,kNSPhi,kNEPhi,kNZ};
+
     G4double kRadTolerance, kAngTolerance;
       //
       // Radial and angular tolerances
 
+    G4double fRMin, fRMax, fDz, fSPhi, fDPhi;
+      //
+      // Radial and angular dimensions
+   
     G4double sinCPhi, cosCPhi, cosHDPhiOT, cosHDPhiIT,
              sinSPhi, cosSPhi, sinEPhi, cosEPhi;
       //
       // Cached trigonometric values
+
+    G4bool fPhiFullTube;
+      //
+      // Flag for identification of section or full tube
 };
 
Index: trunk/source/geometry/solids/CSG/include/G4Tubs.icc
===================================================================
--- trunk/source/geometry/solids/CSG/include/G4Tubs.icc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/include/G4Tubs.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Tubs.icc,v 1.11 2008/11/06 10:55:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Tubs.icc,v 1.14 2009/06/09 16:08:23 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
@@ -91,4 +91,55 @@
 }
 
+inline void G4Tubs::CheckSPhiAngle(G4double sPhi)
+{
+  // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
+
+  if ( sPhi < 0 )
+  {
+    fSPhi = twopi - std::fmod(std::fabs(sPhi),twopi);
+  }
+  else
+  {
+    fSPhi = std::fmod(sPhi,twopi) ;
+  }
+  if ( fSPhi+fDPhi > twopi )
+  {
+    fSPhi -= twopi ;
+  }
+}
+
+inline void G4Tubs::CheckDPhiAngle(G4double dPhi)
+{
+  fPhiFullTube = true;
+  if ( dPhi >= twopi-kAngTolerance*0.5 )
+  {
+    fDPhi=twopi;
+    fSPhi=0;
+  }
+  else
+  {
+    fPhiFullTube = false;
+    if ( dPhi > 0 )
+    {
+      fDPhi = dPhi;
+    }
+    else
+    {
+      G4cerr << "ERROR - G4Tubs()::CheckDPhiAngle()" << G4endl
+             << "        Negative or zero delta-Phi (" << dPhi << ") in solid: "
+             << GetName() << G4endl;
+      G4Exception("G4Tubs::CheckDPhiAngle()", "InvalidSetup",
+                  FatalException, "Invalid dphi.");
+    }
+  }
+}
+
+inline void G4Tubs::CheckPhiAngles(G4double sPhi, G4double dPhi)
+{
+  CheckDPhiAngle(dPhi);
+  if ( (fDPhi<twopi) && (sPhi) ) { CheckSPhiAngle(sPhi); }
+  InitializeTrigonometry();
+}
+
 inline
 void G4Tubs::SetInnerRadius (G4double newRMin)
@@ -113,9 +164,13 @@
 
 inline
-void G4Tubs::SetStartPhiAngle (G4double newSPhi)
-{
-  fSPhi= newSPhi;
-  Initialize();
-  InitializeTrigonometry();
+void G4Tubs::SetStartPhiAngle (G4double newSPhi, G4bool compute)
+{
+  // Flag 'compute' can be used to explicitely avoid recomputation of
+  // trigonometry in case SetDeltaPhiAngle() is invoked afterwards
+
+  CheckSPhiAngle(newSPhi);
+  fPhiFullTube = false;
+  if (compute)  { InitializeTrigonometry(); }
+  Initialize();
 }
 
@@ -123,22 +178,6 @@
 void G4Tubs::SetDeltaPhiAngle (G4double newDPhi)
 {
-  if ( newDPhi >= twopi-kAngTolerance*0.5 )
-  {
-    fPhiFullTube = true;
-  }
-  else if ( newDPhi > 0 )
-  {
-    fPhiFullTube = false;
-  }
-  else
-  {
-     G4cerr << "ERROR - G4Tubs()::SetDeltaPhiAngle() : " << GetName() << G4endl
-            << "        Negative delta-Phi ! - " << newDPhi << G4endl;
-     G4Exception("G4Tubs::SetDeltaPhiAngle()", "InvalidSetup",
-                  FatalException, "Invalid dphi.");
-  }
-  fDPhi= newDPhi;
-  Initialize();
-  InitializeTrigonometry();
+  CheckPhiAngles(fSPhi, newDPhi);
+  Initialize();
 }
 
Index: trunk/source/geometry/solids/CSG/src/G4Box.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Box.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Box.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Box.cc,v 1.44 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/CSG/src/G4CSGSolid.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4CSGSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4CSGSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CSGSolid.cc,v 1.13 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/CSG/src/G4Cons.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Cons.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Cons.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Cons.cc,v 1.60 2008/11/06 15:26:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Cons.cc,v 1.67 2009/11/12 11:53:11 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -35,4 +35,6 @@
 // History:
 //
+// 12.10.09 T.Nikitina: Added to DistanceToIn(p,v) check on the direction in
+//                      case of point on surface
 // 03.05.05 V.Grichine: SurfaceNormal(p) according to J. Apostolakis proposal
 // 13.09.96 V.Grichine: Review and final modifications
@@ -79,11 +81,11 @@
                       G4double pDz,
                       G4double pSPhi, G4double pDPhi)
-  : G4CSGSolid(pName)
+  : G4CSGSolid(pName), fSPhi(0), fDPhi(0)
 {
-  // Check z-len
-
   kRadTolerance = G4GeometryTolerance::GetInstance()->GetRadialTolerance();
   kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
 
+  // Check z-len
+  //
   if ( pDz > 0 )
   {
@@ -100,5 +102,5 @@
 
   // Check radii
-
+  //
   if ( (pRmin1<pRmax1) && (pRmin2<pRmax2) && (pRmin1>=0) && (pRmin2>=0) )
   {
@@ -121,42 +123,7 @@
   }
 
-  fPhiFullCone = true;
-  if ( pDPhi >= twopi-kAngTolerance*0.5 ) // Check angles
-  {
-    fDPhi=twopi;
-    fSPhi=0;
-  }
-  else
-  {
-    fPhiFullCone = false;
-    if ( pDPhi > 0 )
-    {
-      fDPhi = pDPhi;
-    }
-    else
-    {
-      G4cerr << "ERROR - G4Cons()::G4Cons(): " << GetName() << G4endl
-             << "        Negative delta-Phi ! - "
-             << pDPhi << G4endl;
-      G4Exception("G4Cons::G4Cons()", "InvalidSetup",
-                  FatalException, "Invalid dphi.");
-    }
-
-    // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
-
-    if ( pSPhi < 0 )
-    {
-      fSPhi = twopi - std::fmod(std::fabs(pSPhi),twopi);
-    }
-    else
-    {
-      fSPhi = std::fmod(pSPhi,twopi) ;
-    }
-    if ( fSPhi+fDPhi > twopi )
-    {
-      fSPhi -= twopi ;
-    }
-  }
-  InitializeTrigonometry();
+  // Check angles
+  //
+  CheckPhiAngles(pSPhi, pDPhi);
 }
 
@@ -705,5 +672,5 @@
 {
   G4double snxt = kInfinity ;      // snxt = default return value
-
+  const G4double dRmax = 100*std::min(fRmax1,fRmax2);
   static const G4double halfCarTolerance=kCarTolerance*0.5;
   static const G4double halfRadTolerance=kRadTolerance*0.5;
@@ -717,9 +684,11 @@
   G4double tolODz,tolIDz ;
 
-  G4double Dist,s,xi,yi,zi,ri=0.,rhoi2,cosPsi ; // Intersection point variables
+  G4double Dist,s,xi,yi,zi,ri=0.,risec,rhoi2,cosPsi ; // Intersection point vars
 
   G4double t1,t2,t3,b,c,d ;    // Quadratic solver variables 
   G4double nt1,nt2,nt3 ;
   G4double Comp ;
+
+  G4ThreeVector Normal;
 
   // Cone Precalcs
@@ -887,4 +856,9 @@
         if ( s > 0 )  // If 'forwards'. Check z intersection
         {
+          if ( s>dRmax ) // Avoid rounding errors due to precision issues on
+          {              // 64 bits systems. Split long distances and recompute
+            G4double fTerm = s-std::fmod(s,dRmax);
+            s = fTerm + DistanceToIn(p+fTerm*v,v);
+          } 
           zi = p.z() + s*v.z() ;
 
@@ -917,12 +891,22 @@
       {
         // Inside cones, delta r -ve, inside z extent
-
+        // Point is on the Surface => check Direction using  Normal.dot(v)
+
+        xi     = p.x() ;
+        yi     = p.y()  ;
+        risec  = std::sqrt(xi*xi + yi*yi)*secRMax ;
+        Normal = G4ThreeVector(xi/risec,yi/risec,-tanRMax/secRMax) ;
         if ( !fPhiFullCone )
         {
           cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(t3) ;
-
-          if (cosPsi >= cosHDPhiIT)  { return 0.0; }
-        }
-        else  { return 0.0; }
+          if ( cosPsi >= cosHDPhiIT )
+          {
+            if ( Normal.dot(v) <= 0 )  { return 0.0; }
+          }
+        }
+        else
+        {             
+          if ( Normal.dot(v) <= 0 )  { return 0.0; }
+        }
       }
     }
@@ -972,5 +956,5 @@
 
   if (rMinAv)
-  {
+  { 
     nt1 = t1 - (tanRMin*v.z())*(tanRMin*v.z()) ;
     nt2 = t2 - tanRMin*v.z()*rin ;
@@ -993,4 +977,9 @@
           if ( s >= 0 )   // > 0
           {
+            if ( s>dRmax ) // Avoid rounding errors due to precision issues on
+            {              // 64 bits systems. Split long distance and recompute
+              G4double fTerm = s-std::fmod(s,dRmax);
+              s = fTerm + DistanceToIn(p+fTerm*v,v);
+            } 
             zi = p.z() + s*v.z() ;
 
@@ -1004,7 +993,31 @@
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
 
-                if (cosPsi >= cosHDPhiIT)  { snxt = s; }
+                if (cosPsi >= cosHDPhiIT)
+                { 
+                  if ( s > halfRadTolerance )  { snxt=s; }
+                  else
+                  {
+                    // Calculate a normal vector in order to check Direction
+
+                    risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                    Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin);
+                    if ( Normal.dot(v) <= 0 )  { snxt = s; }
+                  } 
+                }
               }
-              else  { return s; }
+              else
+              {
+                if ( s > halfRadTolerance )  { return s; }
+                else
+                {
+                  // Calculate a normal vector in order to check Direction
+
+                  xi     = p.x() + s*v.x() ;
+                  yi     = p.y() + s*v.y() ;
+                  risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                  Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin) ;
+                  if ( Normal.dot(v) <= 0 )  { return s; }
+                }
+              }
             }
           }
@@ -1032,4 +1045,9 @@
             if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s > 0
             {
+              if ( s>dRmax ) // Avoid rounding errors due to precision issues
+              {              // seen on 64 bits systems. Split and recompute
+                G4double fTerm = s-std::fmod(s,dRmax);
+                s = fTerm + DistanceToIn(p+fTerm*v,v);
+              } 
               if ( !fPhiFullCone )
               {
@@ -1038,7 +1056,31 @@
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
 
-                if (cosPsi >= cosHDPhiOT)  { snxt = s; }
+                if (cosPsi >= cosHDPhiOT)
+                {
+                  if ( s > halfRadTolerance )  { snxt=s; }
+                  else
+                  {
+                    // Calculate a normal vector in order to check Direction
+
+                    risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                    Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin);
+                    if ( Normal.dot(v) <= 0 )  { snxt = s; } 
+                  }
+                }
               }
-              else  { return s; }
+              else
+              {
+                if( s > halfRadTolerance )  { return s; }
+                else
+                {
+                  // Calculate a normal vector in order to check Direction
+
+                  xi     = p.x() + s*v.x() ;
+                  yi     = p.y() + s*v.y() ;
+                  risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                  Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin) ;
+                  if ( Normal.dot(v) <= 0 )  { return s; }
+                } 
+              }
             }
           }
@@ -1051,4 +1093,9 @@
             if ( (s >= 0) && (ri > 0) && (std::fabs(zi) <= tolODz) ) // s>0
             {
+              if ( s>dRmax ) // Avoid rounding errors due to precision issues
+              {              // seen on 64 bits systems. Split and recompute
+                G4double fTerm = s-std::fmod(s,dRmax);
+                s = fTerm + DistanceToIn(p+fTerm*v,v);
+              } 
               if ( !fPhiFullCone )
               {
@@ -1057,7 +1104,31 @@
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/ri ;
 
-                if (cosPsi >= cosHDPhiIT)  { snxt = s; }
+                if (cosPsi >= cosHDPhiIT)
+                {
+                  if ( s > halfRadTolerance )  { snxt=s; }
+                  else
+                  {
+                    // Calculate a normal vector in order to check Direction
+
+                    risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                    Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin);
+                    if ( Normal.dot(v) <= 0 )  { snxt = s; } 
+                  }
+                }
               }
-              else  { return s; }
+              else
+              {
+                if ( s > halfRadTolerance )  { return s; }
+                else
+                {
+                  // Calculate a normal vector in order to check Direction
+
+                  xi     = p.x() + s*v.x() ;
+                  yi     = p.y() + s*v.y() ;
+                  risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+                  Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin) ;
+                  if ( Normal.dot(v) <= 0 )  { return s; }
+                } 
+              }
             }
           }
@@ -1099,5 +1170,5 @@
               zi = p.z() + s*v.z() ;
               ri = rMinAv + zi*tanRMin ;
-
+              
               if ( ri > 0 )   // 2nd root
               {
@@ -1107,4 +1178,9 @@
                 if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s>0
                 {
+                  if ( s>dRmax ) // Avoid rounding errors due to precision issue
+                  {              // seen on 64 bits systems. Split and recompute
+                    G4double fTerm = s-std::fmod(s,dRmax);
+                    s = fTerm + DistanceToIn(p+fTerm*v,v);
+                  } 
                   if ( !fPhiFullCone )
                   {
@@ -1136,4 +1212,9 @@
             if ( (s >= 0) && (std::fabs(zi) <= tolODz) )  // s>0
             {
+              if ( s>dRmax ) // Avoid rounding errors due to precision issues
+              {              // seen on 64 bits systems. Split and recompute
+                G4double fTerm = s-std::fmod(s,dRmax);
+                s = fTerm + DistanceToIn(p+fTerm*v,v);
+              } 
               if ( !fPhiFullCone )
               {
@@ -1335,5 +1416,5 @@
   // Vars for intersection within tolerance
 
-  ESide    sidetol ;
+  ESide    sidetol = kNull ;
   G4double slentol = kInfinity ;
 
@@ -1669,7 +1750,14 @@
             xi     = p.x() + slentol*v.x() ;
             yi     = p.y() + slentol*v.y() ;
-            risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
-            Normal = G4ThreeVector(xi/risec,yi/risec,-tanRMin/secRMin) ;
-            
+            if( sidetol==kRMax )
+            {
+              risec  = std::sqrt(xi*xi + yi*yi)*secRMax ;
+              Normal = G4ThreeVector(xi/risec,yi/risec,-tanRMax/secRMax) ;
+            }
+            else
+            {
+              risec  = std::sqrt(xi*xi + yi*yi)*secRMin ;
+              Normal = G4ThreeVector(-xi/risec,-yi/risec,tanRMin/secRMin) ;
+            }
             if( Normal.dot(v) > 0 )
             {
Index: trunk/source/geometry/solids/CSG/src/G4Orb.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Orb.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Orb.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4Orb.cc,v 1.24 2007/05/18 07:38:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Orb.cc,v 1.30 2009/11/30 10:20:38 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Orb
@@ -298,4 +298,6 @@
   rad2 = p.x()*p.x()+p.y()*p.y()+p.z()*p.z() ;
 
+  G4double rad = std::sqrt(rad2);
+
   // G4double rad = std::sqrt(rad2);
   // Check radial surface
@@ -304,10 +306,10 @@
   tolRMax = fRmax - fRmaxTolerance*0.5 ;
     
-  if ( rad2 <= tolRMax*tolRMax )  in = kInside ;
+  if ( rad <= tolRMax )  { in = kInside ; }
   else
   {
     tolRMax = fRmax + fRmaxTolerance*0.5 ;       
-    if ( rad2 <= tolRMax*tolRMax ) in = kSurface ;
-    else                           in = kOutside ;
+    if ( rad <= tolRMax )  { in = kSurface ; }
+    else                   { in = kOutside ; }
   }
   return in;
@@ -360,4 +362,6 @@
   G4double c, d2, s = kInfinity ;
 
+  const G4double dRmax = 100.*fRmax;
+
   // General Precalcs
 
@@ -384,5 +388,7 @@
   // => s=-pDotV3d+-std::sqrt(pDotV3d^2-(rad2-R^2))
 
-  c = rad2 - fRmax*fRmax ;
+
+  G4double rad = std::sqrt(rad2);
+  c = (rad - fRmax)*(rad + fRmax);
 
   if ( c > fRmaxTolerance*fRmax )
@@ -396,7 +402,13 @@
     {
       s = -pDotV3d - std::sqrt(d2) ;
-
-      if (s >= 0 ) return snxt = s;
-           
+      if ( s >= 0 )
+      {
+        if ( s>dRmax ) // Avoid rounding errors due to precision issues seen on
+        {              // 64 bits systems. Split long distances and recompute
+          G4double fTerm = s-std::fmod(s,dRmax);
+          s = fTerm + DistanceToIn(p+fTerm*v,v);
+        } 
+        return snxt = s;
+      }
     }
     else    // No intersection with G4Orb
@@ -410,8 +422,14 @@
     {
       d2 = pDotV3d*pDotV3d - c ;             
-      //  if ( pDotV3d >= 0 ) return snxt = kInfinity;
-      if ( d2 < fRmaxTolerance*fRmax || pDotV3d >= 0 ) return snxt = kInfinity;
-      else                return snxt = 0.;
-    }
+      if ( (d2 < fRmaxTolerance*fRmax) || (pDotV3d >= 0) )
+      {
+        return snxt = kInfinity;
+      }
+      else
+      {
+        return snxt = 0.;
+      }
+    }
+#ifdef G4CSGDEBUG
     else // inside ???
     {
@@ -419,4 +437,5 @@
                   JustWarning, "Point p is inside !?");
     }
+#endif
   }
   return snxt;
@@ -431,7 +450,8 @@
 G4double G4Orb::DistanceToIn( const G4ThreeVector& p ) const
 {
-  G4double safe=0.0, rad  = std::sqrt(p.x()*p.x()+p.y()*p.y()+p.z()*p.z());
-                 safe = rad - fRmax;
-  if( safe < 0 ) safe = 0. ;
+  G4double safe = 0.0,
+           rad  = std::sqrt(p.x()*p.x()+p.y()*p.y()+p.z()*p.z());
+  safe = rad - fRmax;
+  if( safe < 0 ) { safe = 0.; }
   return safe;
 }
@@ -475,10 +495,11 @@
   
   const G4double  Rmax_plus = fRmax + fRmaxTolerance*0.5;
-
-  if( rad2 <= Rmax_plus*Rmax_plus )
-  {
-    c = rad2-fRmax*fRmax ;
-
-    if ( c < fRmaxTolerance*fRmax) 
+  G4double rad = std::sqrt(rad2);
+
+  if ( rad <= Rmax_plus )
+  {
+    c = (rad - fRmax)*(rad + fRmax);
+
+    if ( c < fRmaxTolerance*fRmax ) 
     {
       // Within tolerant Outer radius 
Index: trunk/source/geometry/solids/CSG/src/G4Para.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Para.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Para.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Para.cc,v 1.39 2006/10/19 15:33:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Para
Index: trunk/source/geometry/solids/CSG/src/G4Sphere.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Sphere.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Sphere.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Sphere.cc,v 1.68 2008/07/07 09:35:16 grichine Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Sphere.cc,v 1.84 2009/08/07 15:56:23 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Sphere
@@ -34,4 +34,6 @@
 // History:
 //
+// 14.09.09 T.Nikitina: fix for phi section in DistanceToOut(p,v,..),as for G4Tubs,G4Cons 
+// 26.03.09 G.Cosmo   : optimisations and uniform use of local radial tolerance
 // 12.06.08 V.Grichine: fix for theta intersections in DistanceToOut(p,v,...)
 // 22.07.05 O.Link    : Added check for intersection with double cone
@@ -41,5 +43,5 @@
 // 02.06.04 V.Grichine: bug fixed in DistanceToIn(p,v), on Rmax,Rmin go inside
 // 30.10.03 J.Apostolakis: new algorithm in Inside for SPhi-sections
-// 29.10.03 J.Apostolakis: fix in Inside for SPhi-0.5*kAngTol < phi < SPhi, SPhi<0
+// 29.10.03 J.Apostolakis: fix in Inside for SPhi-0.5*kAngTol < phi<SPhi, SPhi<0
 // 19.06.02 V.Grichine: bug fixed in Inside(p), && -> && fDTheta - kAngTolerance
 // 30.01.02 V.Grichine: bug fixed in Inside(p), && -> || at l.451
@@ -53,6 +55,4 @@
 // --------------------------------------------------------------------
 
-#include <assert.h>
-
 #include "G4Sphere.hh"
 
@@ -92,16 +92,19 @@
                           G4double pSPhi, G4double pDPhi,
                           G4double pSTheta, G4double pDTheta )
-  : G4CSGSolid(pName)
+  : G4CSGSolid(pName), fFullPhiSphere(true), fFullThetaSphere(true)
 {
-  fEpsilon = 1.0e-14;
-
-  kRadTolerance = G4GeometryTolerance::GetInstance()->GetRadialTolerance();
+  fEpsilon = 2.0e-11;  // relative radial tolerance constant
+
   kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
 
-  // Check radii
-
-  if (pRmin<pRmax&&pRmin>=0)
+  // Check radii and set radial tolerances
+
+  G4double kRadTolerance = G4GeometryTolerance::GetInstance()
+                         ->GetRadialTolerance();
+  if ( (pRmin < pRmax) && (pRmax >= 10*kRadTolerance) && (pRmin >= 0) )
   {
     fRmin=pRmin; fRmax=pRmax;
+    fRminTolerance = (pRmin) ? std::max( kRadTolerance, fEpsilon*fRmin ) : 0;
+    fRmaxTolerance = std::max( kRadTolerance, fEpsilon*fRmax );
   }
   else
@@ -116,66 +119,6 @@
   // Check angles
 
-  if (pDPhi>=twopi)
-  {
-    fDPhi=twopi;
-  }
-  else if (pDPhi>0)
-  {
-    fDPhi=pDPhi;
-  }
-  else
-  {
-    G4cerr << "ERROR - G4Sphere()::G4Sphere(): " << GetName() << G4endl
-           << "        Negative Z delta-Phi ! - "
-           << pDPhi << G4endl;
-    G4Exception("G4Sphere::G4Sphere()", "InvalidSetup", FatalException,
-                "Invalid DPhi.");
-  }
-
-  // Convert fSPhi to 0-2PI
-
-  if (pSPhi<0)
-  {
-    fSPhi=twopi-std::fmod(std::fabs(pSPhi),twopi);
-  }
-  else
-  {
-    fSPhi=std::fmod(pSPhi,twopi);
-  }
-
-  // Sphere is placed such that fSPhi+fDPhi>twopi !
-  // fSPhi could be < 0 !!?
-  //
-  if (fSPhi+fDPhi>twopi) fSPhi-=twopi;
-
-  // Check theta angles
-
-  if (pSTheta<0 || pSTheta>pi)
-  {
-    G4cerr << "ERROR - G4Sphere()::G4Sphere(): " << GetName() << G4endl;
-    G4Exception("G4Sphere::G4Sphere()", "InvalidSetup", FatalException,
-                "stheta outside 0-PI range.");
-  }
-  else
-  {
-    fSTheta=pSTheta;
-  }
-
-  if (pDTheta+pSTheta>=pi)
-  {
-    fDTheta=pi-pSTheta;
-  }
-  else if (pDTheta>0)
-  {
-    fDTheta=pDTheta;
-  }
-  else
-  {
-    G4cerr << "ERROR - G4Sphere()::G4Sphere(): " << GetName() << G4endl
-           << "        Negative delta-Theta ! - "
-           << pDTheta << G4endl;
-    G4Exception("G4Sphere::G4Sphere()", "InvalidSetup", FatalException,
-                "Invalid pDTheta.");
-  }
+  CheckPhiAngles(pSPhi, pDPhi);
+  CheckThetaAngles(pSTheta, pDTheta);
 }
 
@@ -219,5 +162,5 @@
                                         G4double& pMin, G4double& pMax ) const
 {
-  if ( fDPhi==twopi && fDTheta==pi)  // !pTransform.IsRotated() &&
+  if ( fFullSphere )
   {
     // Special case handling for solid spheres-shells
@@ -310,5 +253,5 @@
         yoff1=yoffset-yMin;
         yoff2=yMax-yoffset;
-        if (yoff1>=0&&yoff2>=0)
+        if ((yoff1>=0) && (yoff2>=0))
         {
           // Y limits cross max/min x => no change
@@ -334,5 +277,5 @@
         xoff1=xoffset-xMin;
         xoff2=xMax-xoffset;
-        if (xoff1>=0&&xoff2>=0)
+        if ((xoff1>=0) && (xoff2>=0))
         {
           // X limits cross max/min y => no change
@@ -416,5 +359,5 @@
     }
       
-    if (pMin!=kInfinity || pMax!=-kInfinity)
+    if ((pMin!=kInfinity) || (pMax!=-kInfinity))
     {
       existsAfterClip=true;
@@ -453,5 +396,5 @@
 // Return whether point inside/outside/on surface
 // Split into radius, phi, theta checks
-// Each check modifies `in', or returns as approprate
+// Each check modifies 'in', or returns as approprate
 
 EInside G4Sphere::Inside( const G4ThreeVector& p ) const
@@ -459,68 +402,59 @@
   G4double rho,rho2,rad2,tolRMin,tolRMax;
   G4double pPhi,pTheta;
-  EInside in=kOutside;
+  EInside in = kOutside;
+  static const G4double halfAngTolerance = kAngTolerance*0.5;
+  const G4double halfRmaxTolerance = fRmaxTolerance*0.5;
+  const G4double halfRminTolerance = fRminTolerance*0.5;
+  const G4double Rmax_minus = fRmax - halfRmaxTolerance;
+  const G4double Rmin_plus  = (fRmin > 0) ? fRmin+halfRminTolerance : 0;
 
   rho2 = p.x()*p.x() + p.y()*p.y() ;
   rad2 = rho2 + p.z()*p.z() ;
 
-  //  if(rad2 >= 1.369e+19) DBG();
-  //  G4double rad = std::sqrt(rad2);
-  // Check radial surfaces
-  // sets `in'
-
-  if ( fRmin ) tolRMin = fRmin + kRadTolerance*0.5;
-  else         tolRMin = 0 ;
-  
-  tolRMax = fRmax - kRadTolerance*0.5 ;
-  //  const G4double  fractionTolerance = 1.0e-12;
-  const G4double  flexRadMaxTolerance = // kRadTolerance;
-    std::max(kRadTolerance, fEpsilon * fRmax);
-
-  const G4double  Rmax_minus = fRmax - flexRadMaxTolerance*0.5;
-  const G4double  flexRadMinTolerance = std::max(kRadTolerance, 
-                     fEpsilon * fRmin);
-  const G4double  Rmin_plus = (fRmin > 0) ? fRmin + flexRadMinTolerance*0.5 : 0 ;
+  // Check radial surfaces. Sets 'in'
+
+  tolRMin = Rmin_plus;
+  tolRMax = Rmax_minus;
+
+  if ( (rad2 <= Rmax_minus*Rmax_minus) && (rad2 >= Rmin_plus*Rmin_plus) )
+  {
+    in = kInside;
+  }
+  else
+  {
+    tolRMax = fRmax + halfRmaxTolerance;                  // outside case
+    tolRMin = std::max(fRmin-halfRminTolerance, 0.);      // outside case
+    if ( (rad2 <= tolRMax*tolRMax) && (rad2 >= tolRMin*tolRMin) )
+    {
+      in = kSurface;
+    }
+    else
+    {
+      return in = kOutside;
+    }
+  }
+
+  // Phi boundaries   : Do not check if it has no phi boundary!
+
+  if ( !fFullPhiSphere && rho2 )  // [fDPhi < twopi] and [p.x or p.y]
+  {
+    pPhi = std::atan2(p.y(),p.x()) ;
+
+    if      ( pPhi < fSPhi - halfAngTolerance  ) { pPhi += twopi; }
+    else if ( pPhi > ePhi + halfAngTolerance )   { pPhi -= twopi; }
     
-if(rad2 <= Rmax_minus*Rmax_minus && rad2 >= Rmin_plus*Rmin_plus) in = kInside ; 
-
-// if ( rad2 <= tolRMax*tolRMax && rad2 >= tolRMin*tolRMin )  in = kInside ;
-  // if ( rad <= tolRMax && rad >= tolRMin )  in = kInside ;
-  else
-  {
-    tolRMax = fRmax + kRadTolerance*0.5 ;
-    tolRMin = fRmin - kRadTolerance*0.5 ;
-
-    if ( tolRMin < 0.0 ) tolRMin = 0.0 ;
-    
-     if ( rad2 <= tolRMax*tolRMax && rad2 >= tolRMin*tolRMin )  in = kSurface ;
-    //  if ( rad <= tolRMax && rad >= tolRMin )  in = kSurface ;
-    else                                                return in = kOutside ;
-  }
-
-  // Phi boundaries   : Do not check if it has no phi boundary!
-  // (in != kOutside). It is new J.Apostolakis proposal of 30.10.03
-
-  if ( ( fDPhi < twopi - kAngTolerance ) &&
-       ( (p.x() != 0.0 ) || (p.y() != 0.0) ) )
-  {
-    pPhi = std::atan2(p.y(),p.x()) ;
-
-    if      ( pPhi < fSPhi - kAngTolerance*0.5  )         pPhi += twopi ; 
-    else if ( pPhi > fSPhi + fDPhi + kAngTolerance*0.5 )  pPhi -= twopi; 
-    
-    if ((pPhi < fSPhi - kAngTolerance*0.5) ||  
-        (pPhi > fSPhi + fDPhi + kAngTolerance*0.5) )  return in = kOutside ;
+    if ( (pPhi < fSPhi - halfAngTolerance)
+      || (pPhi > ePhi + halfAngTolerance) )      { return in = kOutside; }
     
     else if (in == kInside)  // else it's kSurface anyway already
     {
-      if ( (pPhi < fSPhi + kAngTolerance*0.5) || 
-           (pPhi > fSPhi + fDPhi - kAngTolerance*0.5) )      in = kSurface ;       
+      if ( (pPhi < fSPhi + halfAngTolerance)
+        || (pPhi > ePhi - halfAngTolerance) )    { in = kSurface; }     
     }
   }
 
   // Theta bondaries
-  // (in!=kOutside)
   
-  if ( (rho2 || p.z()) && fDTheta < pi - kAngTolerance*0.5 )
+  if ( (rho2 || p.z()) && (!fFullThetaSphere) )
   {
     rho    = std::sqrt(rho2);
@@ -529,15 +463,15 @@
     if ( in == kInside )
     {
-      if ( (pTheta < fSTheta + kAngTolerance*0.5)
-        || (pTheta > fSTheta + fDTheta - kAngTolerance*0.5) )
-      {
-        if ( (pTheta >= fSTheta - kAngTolerance*0.5)
-          && (pTheta <= fSTheta + fDTheta + kAngTolerance*0.5) )
-        {
-          in = kSurface ;
+      if ( (pTheta < fSTheta + halfAngTolerance)
+        || (pTheta > eTheta - halfAngTolerance) )
+      {
+        if ( (pTheta >= fSTheta - halfAngTolerance)
+          && (pTheta <= eTheta + halfAngTolerance) )
+        {
+          in = kSurface;
         }
         else
         {
-          in = kOutside ;
+          in = kOutside;
         }
       }
@@ -545,8 +479,8 @@
     else
     {
-      if ( (pTheta < fSTheta - kAngTolerance*0.5)
-        || (pTheta > fSTheta + fDTheta + kAngTolerance*0.5) )
-      {
-        in = kOutside ;
+      if ( (pTheta < fSTheta - halfAngTolerance)
+        || (pTheta > eTheta + halfAngTolerance) )
+      {
+        in = kOutside;
       }
     }
@@ -568,7 +502,9 @@
   G4double distSPhi = kInfinity, distEPhi = kInfinity;
   G4double distSTheta = kInfinity, distETheta = kInfinity;
-  G4double delta = 0.5*kCarTolerance, dAngle = 0.5*kAngTolerance;
   G4ThreeVector nR, nPs, nPe, nTs, nTe, nZ(0.,0.,1.);
   G4ThreeVector norm, sumnorm(0.,0.,0.);
+
+  static const G4double halfCarTolerance = 0.5*kCarTolerance;
+  static const G4double halfAngTolerance = 0.5*kAngTolerance;
 
   rho2 = p.x()*p.x()+p.y()*p.y();
@@ -579,17 +515,17 @@
   if (fRmin)  distRMin = std::fabs(rad-fRmin);
     
-  if ( rho && (fDPhi < twopi || fDTheta < pi) )
+  if ( rho && !fFullSphere )
   {
     pPhi = std::atan2(p.y(),p.x());
 
-    if(pPhi  < fSPhi-dAngle)           pPhi     += twopi;
-    else if(pPhi > fSPhi+fDPhi+dAngle) pPhi     -= twopi;
-  }
-  if ( fDPhi < twopi ) // && rho ) // old limitation against (0,0,z)
+    if (pPhi < fSPhi-halfAngTolerance)     { pPhi += twopi; }
+    else if (pPhi > ePhi+halfAngTolerance) { pPhi -= twopi; }
+  }
+  if ( !fFullPhiSphere )
   {
     if ( rho )
     {
-      distSPhi = std::fabs( pPhi - fSPhi ); 
-      distEPhi = std::fabs(pPhi-fSPhi-fDPhi); 
+      distSPhi = std::fabs( pPhi-fSPhi ); 
+      distEPhi = std::fabs( pPhi-ePhi ); 
     }
     else if( !fRmin )
@@ -598,8 +534,8 @@
       distEPhi = 0.; 
     }
-    nPs = G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
-    nPe = G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
+    nPs = G4ThreeVector(sinSPhi,-cosSPhi,0);
+    nPe = G4ThreeVector(-sinEPhi,cosEPhi,0);
   }        
-  if ( fDTheta < pi ) // && rad ) // old limitation against (0,0,0)
+  if ( !fFullThetaSphere )
   {
     if ( rho )
@@ -607,13 +543,13 @@
       pTheta     = std::atan2(rho,p.z());
       distSTheta = std::fabs(pTheta-fSTheta); 
-      distETheta = std::fabs(pTheta-fSTheta-fDTheta);
+      distETheta = std::fabs(pTheta-eTheta);
  
-      nTs = G4ThreeVector(-std::cos(fSTheta)*p.x()/rho, //  *std::cos(pPhi),
-                          -std::cos(fSTheta)*p.y()/rho, //  *std::sin(pPhi),
-                           std::sin(fSTheta)                   );
-
-      nTe = G4ThreeVector( std::cos(fSTheta+fDTheta)*p.x()/rho, // *std::cos(pPhi),
-                           std::cos(fSTheta+fDTheta)*p.y()/rho, // *std::sin(pPhi),
-                          -std::sin(fSTheta+fDTheta)                  );    
+      nTs = G4ThreeVector(-cosSTheta*p.x()/rho,
+                          -cosSTheta*p.y()/rho,
+                           sinSTheta          );
+
+      nTe = G4ThreeVector( cosETheta*p.x()/rho,
+                           cosETheta*p.y()/rho,
+                          -sinETheta          );    
     }
     else if( !fRmin )
@@ -622,33 +558,33 @@
       {              
         distSTheta = 0.;
-	nTs = G4ThreeVector(0.,0.,-1.);
-      }
-      if ( fSTheta + fDTheta < pi ) // distETheta = 0.;
+        nTs = G4ThreeVector(0.,0.,-1.);
+      }
+      if ( eTheta < pi )
       {              
         distETheta = 0.;
-	nTe = G4ThreeVector(0.,0.,1.);
+        nTe = G4ThreeVector(0.,0.,1.);
       }
     }    
   }
-  if( rad )  nR = G4ThreeVector(p.x()/rad,p.y()/rad,p.z()/rad);
-
-  if( distRMax <= delta )
+  if( rad )  { nR = G4ThreeVector(p.x()/rad,p.y()/rad,p.z()/rad); }
+
+  if( distRMax <= halfCarTolerance )
   {
     noSurfaces ++;
     sumnorm += nR;
   }
-  if( fRmin && distRMin <= delta )
+  if( fRmin && (distRMin <= halfCarTolerance) )
   {
     noSurfaces ++;
     sumnorm -= nR;
   }
-  if( fDPhi < twopi )   
-  {
-    if (distSPhi <= dAngle)
+  if( !fFullPhiSphere )   
+  {
+    if (distSPhi <= halfAngTolerance)
     {
       noSurfaces ++;
       sumnorm += nPs;
     }
-    if (distEPhi <= dAngle) 
+    if (distEPhi <= halfAngTolerance) 
     {
       noSurfaces ++;
@@ -656,18 +592,18 @@
     }
   }
-  if ( fDTheta < pi )
-  {
-    if (distSTheta <= dAngle && fSTheta > 0.)
+  if ( !fFullThetaSphere )
+  {
+    if ((distSTheta <= halfAngTolerance) && (fSTheta > 0.))
     {
       noSurfaces ++;
-      if( rad <= delta && fDPhi >= twopi) sumnorm += nZ;
-      else                                sumnorm += nTs;
-    }
-    if (distETheta <= dAngle && fSTheta+fDTheta < pi) 
+      if ((rad <= halfCarTolerance) && fFullPhiSphere)  { sumnorm += nZ;  }
+      else                                              { sumnorm += nTs; }
+    }
+    if ((distETheta <= halfAngTolerance) && (eTheta < pi)) 
     {
       noSurfaces ++;
-      if( rad <= delta && fDPhi >= twopi) sumnorm -= nZ;
-      else                                sumnorm += nTe;
-      if(sumnorm.z() == 0.)               sumnorm += nZ;
+      if ((rad <= halfCarTolerance) && fFullPhiSphere)  { sumnorm -= nZ;  }
+      else                                              { sumnorm += nTe; }
+      if(sumnorm.z() == 0.)  { sumnorm += nZ; }
     }
   }
@@ -680,6 +616,6 @@
      norm = ApproxSurfaceNormal(p);
   }
-  else if ( noSurfaces == 1 ) norm = sumnorm;
-  else                        norm = sumnorm.unit();
+  else if ( noSurfaces == 1 )  { norm = sumnorm; }
+  else                         { norm = sumnorm.unit(); }
   return norm;
 }
@@ -735,7 +671,7 @@
     
   pPhi = std::atan2(p.y(),p.x());
-  if (pPhi<0) pPhi += twopi;
-
-  if (fDPhi<twopi&&rho)
+  if (pPhi<0) { pPhi += twopi; }
+
+  if (!fFullPhiSphere && rho)
   {
     if (fSPhi<0)
@@ -774,5 +710,5 @@
   //
 
-  if (fDTheta<pi&&rad)
+  if (!fFullThetaSphere && rad)
   {
     pTheta=std::atan2(rho,p.z());
@@ -809,38 +745,25 @@
       break;
     case kNSPhi:
-      norm=G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
+      norm=G4ThreeVector(sinSPhi,-cosSPhi,0);
       break;
     case kNEPhi:
-      norm=G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
+      norm=G4ThreeVector(-sinEPhi,cosEPhi,0);
       break;
     case kNSTheta:
-      norm=G4ThreeVector(-std::cos(fSTheta)*std::cos(pPhi),
-                         -std::cos(fSTheta)*std::sin(pPhi),
-                          std::sin(fSTheta)            );
-      //  G4cout<<G4endl<<" case kNSTheta:"<<G4endl;
-      //  G4cout<<"pPhi = "<<pPhi<<G4endl;
-      //  G4cout<<"rad  = "<<rad<<G4endl;
-      //  G4cout<<"pho  = "<<rho<<G4endl;
-      //  G4cout<<"p:    "<<p.x()<<"; "<<p.y()<<"; "<<p.z()<<G4endl;
-      //  G4cout<<"norm: "<<norm.x()<<"; "<<norm.y()<<"; "<<norm.z()<<G4endl;
+      norm=G4ThreeVector(-cosSTheta*std::cos(pPhi),
+                         -cosSTheta*std::sin(pPhi),
+                          sinSTheta            );
       break;
     case kNETheta:
-      norm=G4ThreeVector( std::cos(fSTheta+fDTheta)*std::cos(pPhi),
-                          std::cos(fSTheta+fDTheta)*std::sin(pPhi),
-                         -std::sin(fSTheta+fDTheta)              );
-
-      //  G4cout<<G4endl<<" case kNETheta:"<<G4endl;
-      //  G4cout<<"pPhi = "<<pPhi<<G4endl;
-      //  G4cout<<"rad  = "<<rad<<G4endl;
-      //  G4cout<<"pho  = "<<rho<<G4endl;
-      //  G4cout<<"p:    "<<p.x()<<"; "<<p.y()<<"; "<<p.z()<<G4endl;
-      //  G4cout<<"norm: "<<norm.x()<<"; "<<norm.y()<<"; "<<norm.z()<<G4endl;
+      norm=G4ThreeVector( cosETheta*std::cos(pPhi),
+                          cosETheta*std::sin(pPhi),
+                         -sinETheta              );
       break;
     default:
       DumpInfo();
-      G4Exception("G4Sphere::ApproxSurfaceNormal()", "Notification", JustWarning,
+      G4Exception("G4Sphere::ApproxSurfaceNormal()","Notification",JustWarning,
                   "Undefined side for valid surface normal to solid.");
       break;    
-  } // end case
+  }
 
   return norm;
@@ -880,33 +803,40 @@
 {
   G4double snxt = kInfinity ;      // snxt = default return value
-
   G4double rho2, rad2, pDotV2d, pDotV3d, pTheta ;
-
-  G4double tolIRMin2, tolORMin2, tolORMax2, tolIRMax2 ;
   G4double tolSTheta=0., tolETheta=0. ;
+  const G4double dRmax = 100.*fRmax;
+
+  static const G4double halfCarTolerance = kCarTolerance*0.5;
+  static const G4double halfAngTolerance = kAngTolerance*0.5;
+  const G4double halfRmaxTolerance = fRmaxTolerance*0.5;
+  const G4double halfRminTolerance = fRminTolerance*0.5;
+  const G4double tolORMin2 = (fRmin>halfRminTolerance)
+               ? (fRmin-halfRminTolerance)*(fRmin-halfRminTolerance) : 0;
+  const G4double tolIRMin2 =
+               (fRmin+halfRminTolerance)*(fRmin+halfRminTolerance);
+  const G4double tolORMax2 =
+               (fRmax+halfRmaxTolerance)*(fRmax+halfRmaxTolerance);
+  const G4double tolIRMax2 =
+               (fRmax-halfRmaxTolerance)*(fRmax-halfRmaxTolerance);
 
   // Intersection point
-
+  //
   G4double xi, yi, zi, rhoi, rhoi2, radi2, iTheta ;
 
   // Phi intersection
-
-  G4double sinSPhi, cosSPhi, ePhi, sinEPhi, cosEPhi , Comp ; 
-
-  // Phi flag and precalcs
-
-  G4bool segPhi ;        
-  G4double hDPhi, hDPhiOT, hDPhiIT, cPhi, sinCPhi=0., cosCPhi=0. ; 
-  G4double cosHDPhiOT=0., cosHDPhiIT=0. ;
+  //
+  G4double Comp ; 
+
+  // Phi precalcs
+  //
   G4double Dist, cosPsi ;
 
-  G4bool segTheta ;                             // Theta flag and precals
-  G4double tanSTheta, tanETheta ;
-  G4double tanSTheta2, tanETheta2 ;
+  // Theta precalcs
+  //
   G4double dist2STheta, dist2ETheta ;
   G4double t1, t2, b, c, d2, d, s = kInfinity ;
 
   // General Precalcs
-
+  //
   rho2 = p.x()*p.x() + p.y()*p.y() ;
   rad2 = rho2 + p.z()*p.z() ;
@@ -916,50 +846,10 @@
   pDotV3d = pDotV2d + p.z()*v.z() ;
 
-  // Radial Precalcs
-
-  if (fRmin > kRadTolerance*0.5)
-  {
-    tolORMin2=(fRmin-kRadTolerance*0.5)*(fRmin-kRadTolerance*0.5);
-  }
-  else
-  {
-    tolORMin2 = 0 ;
-  }
-  tolIRMin2 = (fRmin+kRadTolerance*0.5)*(fRmin+kRadTolerance*0.5) ;
-  tolORMax2 = (fRmax+kRadTolerance*0.5)*(fRmax+kRadTolerance*0.5) ;
-  tolIRMax2 = (fRmax-kRadTolerance*0.5)*(fRmax-kRadTolerance*0.5) ;
-
-  // Set phi divided flag and precalcs
-
-  if (fDPhi < twopi)
-  {
-    segPhi = true ;
-    hDPhi = 0.5*fDPhi ;    // half delta phi
-    cPhi = fSPhi + hDPhi ;
-
-    hDPhiOT = hDPhi+0.5*kAngTolerance; // Outer Tolerant half delta phi 
-    hDPhiIT = hDPhi-0.5*kAngTolerance;
-
-    sinCPhi    = std::sin(cPhi) ;
-    cosCPhi    = std::cos(cPhi) ;
-    cosHDPhiOT = std::cos(hDPhiOT) ;
-    cosHDPhiIT = std::cos(hDPhiIT) ;
-  }
-  else
-  {
-    segPhi = false ;
-  }
-
   // Theta precalcs
-    
-  if (fDTheta < pi )
-  {
-    segTheta  = true ;
-    tolSTheta = fSTheta - kAngTolerance*0.5 ;
-    tolETheta = fSTheta + fDTheta + kAngTolerance*0.5 ;
-  }
-  else
-  {
-    segTheta = false ;
+  //
+  if (!fFullThetaSphere)
+  {
+    tolSTheta = fSTheta - halfAngTolerance ;
+    tolETheta = eTheta + halfAngTolerance ;
   }
 
@@ -979,12 +869,9 @@
 
   c = rad2 - fRmax*fRmax ;
-  const G4double  flexRadMaxTolerance = // kRadTolerance;
-    std::max(kRadTolerance, fEpsilon * fRmax);
-
-  //  if (c > kRadTolerance*fRmax)
-  if (c > flexRadMaxTolerance*fRmax)
-  {
-    // If outside toleranct boundary of outer G4Sphere
-    // [should be std::sqrt(rad2)-fRmax > kRadTolerance*0.5]
+
+  if (c > fRmaxTolerance*fRmax)
+  {
+    // If outside tolerant boundary of outer G4Sphere
+    // [should be std::sqrt(rad2)-fRmax > halfRmaxTolerance]
 
     d2 = pDotV3d*pDotV3d - c ;
@@ -996,9 +883,14 @@
       if (s >= 0 )
       {
+        if ( s>dRmax ) // Avoid rounding errors due to precision issues seen on
+        {              // 64 bits systems. Split long distances and recompute
+          G4double fTerm = s-std::fmod(s,dRmax);
+          s = fTerm + DistanceToIn(p+fTerm*v,v);
+        } 
         xi   = p.x() + s*v.x() ;
         yi   = p.y() + s*v.y() ;
         rhoi = std::sqrt(xi*xi + yi*yi) ;
 
-        if (segPhi && rhoi)    // Check phi intersection
+        if (!fFullPhiSphere && rhoi)    // Check phi intersection
         {
           cosPsi = (xi*cosCPhi + yi*sinCPhi)/rhoi ;
@@ -1006,5 +898,5 @@
           if (cosPsi >= cosHDPhiOT)
           {
-            if (segTheta)   // Check theta intersection
+            if (!fFullThetaSphere)   // Check theta intersection
             {
               zi = p.z() + s*v.z() ;
@@ -1027,5 +919,5 @@
         else
         {
-          if (segTheta)    // Check theta intersection
+          if (!fFullThetaSphere)    // Check theta intersection
           {
             zi = p.z() + s*v.z() ;
@@ -1059,9 +951,8 @@
     d2 = pDotV3d*pDotV3d - c ;
 
-    // if (rad2 > tolIRMin2 && pDotV3d < 0 )
-
-    if (rad2 > tolIRMax2 && ( d2 >= flexRadMaxTolerance*fRmax && pDotV3d < 0 ) )
-    {
-      if (segPhi)
+    if ( (rad2 > tolIRMax2)
+      && ( (d2 >= fRmaxTolerance*fRmax) && (pDotV3d < 0) ) )
+    {
+      if (!fFullPhiSphere)
       {
         // Use inner phi tolerant boundary -> if on tolerant
@@ -1074,5 +965,5 @@
           // inside radii, delta r -ve, inside phi
 
-          if (segTheta)
+          if ( !fFullThetaSphere )
           {
             if ( (pTheta >= tolSTheta + kAngTolerance)
@@ -1090,5 +981,5 @@
       else
       {
-        if ( segTheta )
+        if ( !fFullThetaSphere )
         {
           if ( (pTheta >= tolSTheta + kAngTolerance)
@@ -1109,5 +1000,5 @@
   // - Always farthest root, because would have passed through outer
   //   surface first.
-  // - Tolerant check for if travelling through solid
+  // - Tolerant check if travelling through solid
 
   if (fRmin)
@@ -1119,10 +1010,8 @@
     // Check for immediate entry/already inside and travelling outwards
 
-    // if (c >- kRadTolerance*0.5 && pDotV3d >= 0 && rad2 < tolIRMin2 )
-
-    if ( c > -kRadTolerance*0.5 && rad2 < tolIRMin2 && 
-         ( d2 < fRmin*kCarTolerance || pDotV3d >= 0 ) )
-    {
-      if (segPhi)
+    if ( (c > -halfRminTolerance) && (rad2 < tolIRMin2)
+      && ( (d2 < fRmin*kCarTolerance) || (pDotV3d >= 0) ) )
+    {
+      if ( !fFullPhiSphere )
       {
         // Use inner phi tolerant boundary -> if on tolerant
@@ -1134,5 +1023,5 @@
           // inside radii, delta r -ve, inside phi
           //
-          if (segTheta)
+          if ( !fFullThetaSphere )
           {
             if ( (pTheta >= tolSTheta + kAngTolerance)
@@ -1150,5 +1039,5 @@
       else
       {
-        if (segTheta)
+        if ( !fFullThetaSphere )
         {
           if ( (pTheta >= tolSTheta + kAngTolerance)
@@ -1166,10 +1055,8 @@
     else   // Not special tolerant case
     {
-      //  d2 = pDotV3d*pDotV3d - c ;
-
       if (d2 >= 0)
       {
         s = -pDotV3d + std::sqrt(d2) ;
-        if ( s >= kRadTolerance*0.5 )  // It was >= 0 ??
+        if ( s >= halfRminTolerance )  // It was >= 0 ??
         {
           xi   = p.x() + s*v.x() ;
@@ -1177,5 +1064,5 @@
           rhoi = std::sqrt(xi*xi+yi*yi) ;
 
-          if ( segPhi && rhoi )   // Check phi intersection
+          if ( !fFullPhiSphere && rhoi )   // Check phi intersection
           {
             cosPsi = (xi*cosCPhi + yi*sinCPhi)/rhoi ;
@@ -1183,5 +1070,5 @@
             if (cosPsi >= cosHDPhiOT)
             {
-              if (segTheta)  // Check theta intersection
+              if ( !fFullThetaSphere )  // Check theta intersection
               {
                 zi = p.z() + s*v.z() ;
@@ -1204,5 +1091,5 @@
           else
           {
-            if (segTheta)   // Check theta intersection
+            if ( !fFullThetaSphere )   // Check theta intersection
             {
               zi = p.z() + s*v.z() ;
@@ -1214,10 +1101,10 @@
               if ( (iTheta >= tolSTheta) && (iTheta <= tolETheta) )
               {
-                snxt = s ;
+                snxt = s;
               }
             }
             else
             {
-              snxt=s;
+              snxt = s;
             }
           }
@@ -1236,14 +1123,10 @@
   //         -> Should use some form of loop Construct
   //
-  if ( segPhi )
-  {
-    // First phi surface (`S'tarting phi)
-
-    sinSPhi = std::sin(fSPhi) ;
-    cosSPhi = std::cos(fSPhi) ;
-
+  if ( !fFullPhiSphere )
+  {
+    // First phi surface ('S'tarting phi)
     // Comp = Component in outwards normal dirn
     //
-    Comp    = v.x()*sinSPhi - v.y()*cosSPhi  ;
+    Comp = v.x()*sinSPhi - v.y()*cosSPhi ;
                     
     if ( Comp < 0 )
@@ -1251,5 +1134,5 @@
       Dist = p.y()*cosSPhi - p.x()*sinSPhi ;
 
-      if (Dist < kCarTolerance*0.5)
+      if (Dist < halfCarTolerance)
       {
         s = Dist/Comp ;
@@ -1282,5 +1165,5 @@
             // (=>intersect at origin =>fRmax=0)
             //
-            if ( segTheta )
+            if ( !fFullThetaSphere )
             {
               iTheta = std::atan2(std::sqrt(rhoi2),zi) ;
@@ -1305,18 +1188,13 @@
     }
 
-    // Second phi surface (`E'nding phi)
-
-    ePhi    = fSPhi + fDPhi ;
-    sinEPhi = std::sin(ePhi)     ;
-    cosEPhi = std::cos(ePhi)     ;
-
-    // Compnent in outwards normal dirn
-
-    Comp    = -( v.x()*sinEPhi-v.y()*cosEPhi ) ;
+    // Second phi surface ('E'nding phi)
+    // Component in outwards normal dirn
+
+    Comp = -( v.x()*sinEPhi-v.y()*cosEPhi ) ;
         
     if (Comp < 0)
     {
       Dist = -(p.y()*cosEPhi-p.x()*sinEPhi) ;
-      if ( Dist < kCarTolerance*0.5 )
+      if ( Dist < halfCarTolerance )
       {
         s = Dist/Comp ;
@@ -1340,5 +1218,6 @@
             rhoi2 = rho2  ;
             radi2 = rad2  ;
-          } if ( (radi2 <= tolORMax2)
+          }
+          if ( (radi2 <= tolORMax2)
             && (radi2 >= tolORMin2)
             && ((yi*cosCPhi-xi*sinCPhi) >= 0) )
@@ -1348,5 +1227,5 @@
             // (=>intersect at origin =>fRmax=0)
             //
-            if ( segTheta )
+            if ( !fFullThetaSphere )
             {
               iTheta = std::atan2(std::sqrt(rhoi2),zi) ;
@@ -1374,5 +1253,5 @@
   // Theta segment intersection
 
-  if ( segTheta )
+  if ( !fFullThetaSphere )
   {
 
@@ -1396,9 +1275,4 @@
     // => s^2(1-vz^2(1+tan^2(t))+2s(pdotv2d-pzvztan^2(t))+(rho2-pz^2tan^2(t))=0
 
-    tanSTheta  = std::tan(fSTheta)         ;
-    tanSTheta2 = tanSTheta*tanSTheta  ;
-    tanETheta  = std::tan(fSTheta+fDTheta) ;
-    tanETheta2 = tanETheta*tanETheta  ;
-      
     if (fSTheta)
     {
@@ -1409,13 +1283,13 @@
       dist2STheta = kInfinity ;
     }
-    if ( fSTheta + fDTheta < pi )
+    if ( eTheta < pi )
     {
       dist2ETheta=rho2-p.z()*p.z()*tanETheta2;
     }
-      else
+    else
     {
       dist2ETheta=kInfinity;
     }      
-    if ( pTheta < tolSTheta) // dist2STheta<-kRadTolerance*0.5 && dist2ETheta>0)
+    if ( pTheta < tolSTheta )
     {
       // Inside (theta<stheta-tol) s theta cone
@@ -1424,41 +1298,43 @@
       t1 = 1 - v.z()*v.z()*(1 + tanSTheta2) ;
       t2 = pDotV2d - p.z()*v.z()*tanSTheta2 ;
-        
-      b  = t2/t1 ;
-      c  = dist2STheta/t1 ;
-      d2 = b*b - c ;
-
-      if ( d2 >= 0 )
-      {
-        d = std::sqrt(d2) ;
-        s = -b - d ;    // First root
-        zi    = p.z() + s*v.z();
-
-        if ( s < 0 || zi*(fSTheta - halfpi) > 0 )
-        {
-          s = -b+d;    // Second root
-        }
-        if (s >= 0 && s < snxt)
-        {
-          xi    = p.x() + s*v.x();
-          yi    = p.y() + s*v.y();
+      if (t1)
+      {   
+        b  = t2/t1 ;
+        c  = dist2STheta/t1 ;
+        d2 = b*b - c ;
+
+        if ( d2 >= 0 )
+        {
+          d = std::sqrt(d2) ;
+          s = -b - d ;    // First root
           zi    = p.z() + s*v.z();
-          rhoi2 = xi*xi + yi*yi;
-          radi2 = rhoi2 + zi*zi;
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2)
-            && (zi*(fSTheta - halfpi) <= 0) )
-          {
-            if ( segPhi && rhoi2 )  // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if (cosPsi >= cosHDPhiOT)
+
+          if ( (s < 0) || (zi*(fSTheta - halfpi) > 0) )
+          {
+            s = -b+d;    // Second root
+          }
+          if ((s >= 0) && (s < snxt))
+          {
+            xi    = p.x() + s*v.x();
+            yi    = p.y() + s*v.y();
+            zi    = p.z() + s*v.z();
+            rhoi2 = xi*xi + yi*yi;
+            radi2 = rhoi2 + zi*zi;
+            if ( (radi2 <= tolORMax2)
+              && (radi2 >= tolORMin2)
+              && (zi*(fSTheta - halfpi) <= 0) )
+            {
+              if ( !fFullPhiSphere && rhoi2 )  // Check phi intersection
+              {
+                cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                if (cosPsi >= cosHDPhiOT)
+                {
+                  snxt = s ;
+                }
+              }
+              else
               {
                 snxt = s ;
               }
-            }
-            else
-            {
-              snxt = s ;
             }
           }
@@ -1469,9 +1345,59 @@
       // Second >= 0 root should be considered
         
-      if ( fSTheta + fDTheta < pi )
+      if ( eTheta < pi )
       {
         t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
         t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
-        
+        if (t1)
+        { 
+          b  = t2/t1 ;
+          c  = dist2ETheta/t1 ;
+          d2 = b*b - c ;
+
+          if (d2 >= 0)
+          {
+            d = std::sqrt(d2) ;
+            s = -b + d ;    // Second root
+
+            if ( (s >= 0) && (s < snxt) )
+            {
+              xi    = p.x() + s*v.x() ;
+              yi    = p.y() + s*v.y() ;
+              zi    = p.z() + s*v.z() ;
+              rhoi2 = xi*xi + yi*yi   ;
+              radi2 = rhoi2 + zi*zi   ;
+
+              if ( (radi2 <= tolORMax2)
+                && (radi2 >= tolORMin2)
+                && (zi*(eTheta - halfpi) <= 0) )
+              {
+                if (!fFullPhiSphere && rhoi2)   // Check phi intersection
+                {
+                  cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                  if (cosPsi >= cosHDPhiOT)
+                  {
+                    snxt = s ;
+                  }
+                }
+                else
+                {
+                  snxt = s ;
+                }
+              }
+            }
+          }
+        }
+      }
+    }  
+    else if ( pTheta > tolETheta ) 
+    { 
+      // dist2ETheta<-kRadTolerance*0.5 && dist2STheta>0)
+      // Inside (theta > etheta+tol) e-theta cone
+      // First root of etheta cone, second if first root 'imaginary'
+
+      t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
+      t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
+      if (t1)
+      {  
         b  = t2/t1 ;
         c  = dist2ETheta/t1 ;
@@ -1481,7 +1407,12 @@
         {
           d = std::sqrt(d2) ;
-          s = -b + d ;    // Second root
-
-          if (s >= 0 && s < snxt)
+          s = -b - d ;    // First root
+          zi    = p.z() + s*v.z();
+
+          if ( (s < 0) || (zi*(eTheta - halfpi) > 0) )
+          {
+            s = -b + d ;           // second root
+          }
+          if ( (s >= 0) && (s < snxt) )
           {
             xi    = p.x() + s*v.x() ;
@@ -1492,8 +1423,8 @@
 
             if ( (radi2 <= tolORMax2)
-              && (radi2 >= tolORMin2)
-              && (zi*(fSTheta + fDTheta - halfpi) <= 0) )
-            {
-              if (segPhi && rhoi2)   // Check phi intersection
+              && (radi2 >= tolORMin2) 
+              && (zi*(eTheta - halfpi) <= 0) )
+            {
+              if (!fFullPhiSphere && rhoi2)  // Check phi intersection
               {
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
@@ -1511,55 +1442,4 @@
         }
       }
-    }  
-    else if ( pTheta > tolETheta ) 
-    { 
-      // dist2ETheta<-kRadTolerance*0.5 && dist2STheta>0)
-      // Inside (theta > etheta+tol) e-theta cone
-      // First root of etheta cone, second if first root `imaginary'
-
-      t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
-      t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
-        
-      b  = t2/t1 ;
-      c  = dist2ETheta/t1 ;
-      d2 = b*b - c ;
-
-      if (d2 >= 0)
-      {
-        d = std::sqrt(d2) ;
-        s = -b - d ;    // First root
-        zi    = p.z() + s*v.z();
-
-        if (s < 0 || zi*(fSTheta + fDTheta - halfpi) > 0)
-        {
-          s = -b + d ;           // second root
-        }
-        if (s >= 0 && s < snxt)
-        {
-          xi    = p.x() + s*v.x() ;
-          yi    = p.y() + s*v.y() ;
-          zi    = p.z() + s*v.z() ;
-          rhoi2 = xi*xi + yi*yi   ;
-          radi2 = rhoi2 + zi*zi   ;
-
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2) 
-            && (zi*(fSTheta + fDTheta - halfpi) <= 0) )
-          {
-            if (segPhi && rhoi2)  // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if (cosPsi >= cosHDPhiOT)
-              {
-                snxt = s ;
-              }
-            }
-            else
-            {
-              snxt = s ;
-            }
-          }
-        }
-      }
 
       // Possible intersection with STheta cone. 
@@ -1570,5 +1450,76 @@
         t1 = 1 - v.z()*v.z()*(1 + tanSTheta2) ;
         t2 = pDotV2d - p.z()*v.z()*tanSTheta2 ;
-
+        if (t1)
+        { 
+          b  = t2/t1 ;
+          c  = dist2STheta/t1 ;
+          d2 = b*b - c ;
+
+          if (d2 >= 0)
+          {
+            d = std::sqrt(d2) ;
+            s = -b + d ;    // Second root
+
+            if ( (s >= 0) && (s < snxt) )
+            {
+              xi    = p.x() + s*v.x() ;
+              yi    = p.y() + s*v.y() ;
+              zi    = p.z() + s*v.z() ;
+              rhoi2 = xi*xi + yi*yi   ;
+              radi2 = rhoi2 + zi*zi   ;
+
+              if ( (radi2 <= tolORMax2)
+                && (radi2 >= tolORMin2)
+                && (zi*(fSTheta - halfpi) <= 0) )
+              {
+                if (!fFullPhiSphere && rhoi2)   // Check phi intersection
+                {
+                  cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                  if (cosPsi >= cosHDPhiOT)
+                  {
+                    snxt = s ;
+                  }
+                }
+                else
+                {
+                  snxt = s ;
+                }
+              }
+            }
+          }
+        }
+      }  
+    }     
+    else if ( (pTheta < tolSTheta + kAngTolerance)
+           && (fSTheta > halfAngTolerance) )
+    {
+      // In tolerance of stheta
+      // If entering through solid [r,phi] => 0 to in
+      // else try 2nd root
+
+      t2 = pDotV2d - p.z()*v.z()*tanSTheta2 ;
+      if ( (t2>=0 && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta<halfpi)
+        || (t2<0  && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta>halfpi)
+        || (v.z()<0 && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta==halfpi) )
+      {
+        if (!fFullPhiSphere && rho2)  // Check phi intersection
+        {
+          cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(rho2) ;
+          if (cosPsi >= cosHDPhiIT)
+          {
+            return 0 ;
+          }
+        }
+        else
+        {
+          return 0 ;
+        }
+      }
+
+      // Not entering immediately/travelling through
+
+      t1 = 1 - v.z()*v.z()*(1 + tanSTheta2) ;
+      if (t1)
+      { 
         b  = t2/t1 ;
         c  = dist2STheta/t1 ;
@@ -1578,8 +1529,7 @@
         {
           d = std::sqrt(d2) ;
-          s = -b + d ;    // Second root
-
-          if ( (s >= 0) && (s < snxt) )
-          {
+          s = -b + d ;
+          if ( (s >= halfCarTolerance) && (s < snxt) && (fSTheta < halfpi) )
+          {  // ^^^^^^^^^^^^^^^^^^^^^  shouldn't it be >=0 instead ?
             xi    = p.x() + s*v.x() ;
             yi    = p.y() + s*v.y() ;
@@ -1592,5 +1542,79 @@
               && (zi*(fSTheta - halfpi) <= 0) )
             {
-              if (segPhi && rhoi2)   // Check phi intersection
+              if ( !fFullPhiSphere && rhoi2 )    // Check phi intersection
+              {
+                cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                if ( cosPsi >= cosHDPhiOT )
+                {
+                  snxt = s ;
+                }
+              }
+              else
+              {
+                snxt = s ;
+              }
+            }
+          }
+        }
+      }
+    }   
+    else if ((pTheta > tolETheta-kAngTolerance) && (eTheta < pi-kAngTolerance))
+    {
+
+      // In tolerance of etheta
+      // If entering through solid [r,phi] => 0 to in
+      // else try 2nd root
+
+      t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
+
+      if (   ((t2<0) && (eTheta < halfpi)
+          && (tolIRMin2 < rad2) && (rad2 < tolIRMax2))
+        ||   ((t2>=0) && (eTheta > halfpi)
+          && (tolIRMin2 < rad2) && (rad2 < tolIRMax2))
+        ||   ((v.z()>0) && (eTheta == halfpi)
+          && (tolIRMin2 < rad2) && (rad2 < tolIRMax2))  )
+      {
+        if (!fFullPhiSphere && rho2)   // Check phi intersection
+        {
+          cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(rho2) ;
+          if (cosPsi >= cosHDPhiIT)
+          {
+            return 0 ;
+          }
+        }
+        else
+        {
+          return 0 ;
+        }
+      }
+
+      // Not entering immediately/travelling through
+
+      t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
+      if (t1)
+      { 
+        b  = t2/t1 ;
+        c  = dist2ETheta/t1 ;
+        d2 = b*b - c ;
+
+        if (d2 >= 0)
+        {
+          d = std::sqrt(d2) ;
+          s = -b + d ;
+        
+          if ( (s >= halfCarTolerance)
+            && (s < snxt) && (eTheta > halfpi) )
+          {
+            xi    = p.x() + s*v.x() ;
+            yi    = p.y() + s*v.y() ;
+            zi    = p.z() + s*v.z() ;
+            rhoi2 = xi*xi + yi*yi   ;
+            radi2 = rhoi2 + zi*zi   ;
+
+            if ( (radi2 <= tolORMax2)
+              && (radi2 >= tolORMin2)
+              && (zi*(eTheta - halfpi) <= 0) )
+            {
+              if (!fFullPhiSphere && rhoi2)   // Check phi intersection
               {
                 cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
@@ -1606,142 +1630,6 @@
             }
           }
-        }
-      }  
-    }     
-    else if ( (pTheta <tolSTheta + kAngTolerance)
-           && (fSTheta > kAngTolerance) )
-    {
-      // In tolerance of stheta
-      // If entering through solid [r,phi] => 0 to in
-      // else try 2nd root
-
-      t2 = pDotV2d - p.z()*v.z()*tanSTheta2 ;
-      if ( (t2>=0 && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta<pi*.5)
-        || (t2<0  && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta>pi*.5)
-        || (v.z()<0 && tolIRMin2<rad2 && rad2<tolIRMax2 && fSTheta==pi*.5) )
-      {
-        if (segPhi && rho2)  // Check phi intersection
-        {
-          cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(rho2) ;
-          if (cosPsi >= cosHDPhiIT)
-          {
-            return 0 ;
-          }
-        }
-        else
-        {
-          return 0 ;
-        }
-      }
-
-      // Not entering immediately/travelling through
-
-      t1 = 1 - v.z()*v.z()*(1 + tanSTheta2) ;
-      b  = t2/t1 ;
-      c  = dist2STheta/t1 ;
-      d2 = b*b - c ;
-
-      if (d2 >= 0)
-      {
-        d = std::sqrt(d2) ;
-        s = -b + d ;
-        if ( (s >= kCarTolerance*0.5) && (s < snxt) && (fSTheta < pi*0.5) )
-        {
-          xi    = p.x() + s*v.x() ;
-          yi    = p.y() + s*v.y() ;
-          zi    = p.z() + s*v.z() ;
-          rhoi2 = xi*xi + yi*yi   ;
-          radi2 = rhoi2 + zi*zi   ;
-
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2)
-            && (zi*(fSTheta - halfpi) <= 0) )
-          {
-            if ( segPhi && rhoi2 )    // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if ( cosPsi >= cosHDPhiOT )
-              {
-                snxt = s ;
-              }
-            }
-            else
-            {
-              snxt = s ;
-            }
-          }
-        }
-      }
-    }   
-    else if ( (pTheta > tolETheta - kAngTolerance)
-           && ((fSTheta + fDTheta) < pi-kAngTolerance) )   
-    {
-
-      // In tolerance of etheta
-      // If entering through solid [r,phi] => 0 to in
-      // else try 2nd root
-
-      t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
-
-      if (
-    (t2<0    && (fSTheta+fDTheta) <pi*0.5 && tolIRMin2<rad2 && rad2<tolIRMax2)
- || (t2>=0   && (fSTheta+fDTheta) >pi*0.5 && tolIRMin2<rad2 && rad2<tolIRMax2)
- || (v.z()>0 && (fSTheta+fDTheta)==pi*0.5 && tolIRMin2<rad2 && rad2<tolIRMax2)
-         )
-      {
-        if (segPhi && rho2)   // Check phi intersection
-        {
-          cosPsi = (p.x()*cosCPhi + p.y()*sinCPhi)/std::sqrt(rho2) ;
-          if (cosPsi >= cosHDPhiIT)
-          {
-            return 0 ;
-          }
-        }
-        else
-        {
-          return 0 ;
-        }
-      }
-
-      // Not entering immediately/travelling through
-
-      t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
-      b  = t2/t1 ;
-      c  = dist2ETheta/t1 ;
-      d2 = b*b - c ;
-
-      if (d2 >= 0)
-      {
-        d = std::sqrt(d2) ;
-        s = -b + d ;
-        
-        if ( (s >= kCarTolerance*0.5)
-          && (s < snxt) && ((fSTheta + fDTheta) > pi*0.5) )
-        {
-          xi    = p.x() + s*v.x() ;
-          yi    = p.y() + s*v.y() ;
-          zi    = p.z() + s*v.z() ;
-          rhoi2 = xi*xi + yi*yi   ;
-          radi2 = rhoi2 + zi*zi   ;
-
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2)
-            && (zi*(fSTheta + fDTheta - halfpi) <= 0) )
-          {
-            if (segPhi && rhoi2)   // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if (cosPsi>=cosHDPhiOT)
-              {
-                snxt = s ;
-              }
-            }
-            else
-            {
-              snxt = s ;
-            }
-          }
-        }
-      }    
+        } 
+      }   
     }  
     else
@@ -1752,37 +1640,39 @@
       t1 = 1 - v.z()*v.z()*(1 + tanSTheta2) ;
       t2 = pDotV2d - p.z()*v.z()*tanSTheta2 ;
-
-      b  = t2/t1;
-      c  = dist2STheta/t1 ;
-      d2 = b*b - c ;
-
-      if (d2 >= 0)
-      {
-        d = std::sqrt(d2) ;
-        s = -b + d ;    // second root
-
-        if (s >= 0 && s < snxt)
-        {
-          xi    = p.x() + s*v.x() ;
-          yi    = p.y() + s*v.y() ;
-          zi    = p.z() + s*v.z() ;
-          rhoi2 = xi*xi + yi*yi   ;
-          radi2 = rhoi2 + zi*zi   ;
-
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2)
-            && (zi*(fSTheta - halfpi) <= 0) )
-          {
-            if (segPhi && rhoi2)   // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if (cosPsi >= cosHDPhiOT)
+      if (t1)
+      { 
+        b  = t2/t1;
+        c  = dist2STheta/t1 ;
+        d2 = b*b - c ;
+
+        if (d2 >= 0)
+        {
+          d = std::sqrt(d2) ;
+          s = -b + d ;    // second root
+
+          if ((s >= 0) && (s < snxt))
+          {
+            xi    = p.x() + s*v.x() ;
+            yi    = p.y() + s*v.y() ;
+            zi    = p.z() + s*v.z() ;
+            rhoi2 = xi*xi + yi*yi   ;
+            radi2 = rhoi2 + zi*zi   ;
+
+            if ( (radi2 <= tolORMax2)
+              && (radi2 >= tolORMin2)
+              && (zi*(fSTheta - halfpi) <= 0) )
+            {
+              if (!fFullPhiSphere && rhoi2)   // Check phi intersection
+              {
+                cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                if (cosPsi >= cosHDPhiOT)
+                {
+                  snxt = s ;
+                }
+              }
+              else
               {
                 snxt = s ;
               }
-            }
-            else
-            {
-              snxt = s ;
             }
           }
@@ -1791,37 +1681,39 @@
       t1 = 1 - v.z()*v.z()*(1 + tanETheta2) ;
       t2 = pDotV2d - p.z()*v.z()*tanETheta2 ;
-        
-      b  = t2/t1 ;
-      c  = dist2ETheta/t1 ;
-      d2 = b*b - c ;
-
-      if (d2 >= 0)
-      {
-        d = std::sqrt(d2) ;
-        s = -b + d;    // second root
-
-        if (s >= 0 && s < snxt)
-        {
-          xi    = p.x() + s*v.x() ;
-          yi    = p.y() + s*v.y() ;
-          zi    = p.z() + s*v.z() ;
-          rhoi2 = xi*xi + yi*yi   ;
-          radi2 = rhoi2 + zi*zi   ;
-
-          if ( (radi2 <= tolORMax2)
-            && (radi2 >= tolORMin2)
-            && (zi*(fSTheta + fDTheta - halfpi) <= 0) )
-          {
-            if (segPhi && rhoi2)   // Check phi intersection
-            {
-              cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
-              if ( cosPsi >= cosHDPhiOT )
-              {
-                snxt=s;
-              }
-            }
-            else
-            {
-              snxt = s ;
+      if (t1)
+      {   
+        b  = t2/t1 ;
+        c  = dist2ETheta/t1 ;
+        d2 = b*b - c ;
+
+        if (d2 >= 0)
+        {
+          d = std::sqrt(d2) ;
+          s = -b + d;    // second root
+
+          if ((s >= 0) && (s < snxt))
+          {
+            xi    = p.x() + s*v.x() ;
+            yi    = p.y() + s*v.y() ;
+            zi    = p.z() + s*v.z() ;
+            rhoi2 = xi*xi + yi*yi   ;
+            radi2 = rhoi2 + zi*zi   ;
+
+            if ( (radi2 <= tolORMax2)
+              && (radi2 >= tolORMin2)
+              && (zi*(eTheta - halfpi) <= 0) )
+            {
+              if (!fFullPhiSphere && rhoi2)   // Check phi intersection
+              {
+                cosPsi = (xi*cosCPhi + yi*sinCPhi)/std::sqrt(rhoi2) ;
+                if ( cosPsi >= cosHDPhiOT )
+                {
+                  snxt=s;
+                }
+              }
+              else
+              {
+                snxt = s ;
+              }
             }
           }
@@ -1844,9 +1736,9 @@
 {
   G4double safe=0.0,safeRMin,safeRMax,safePhi,safeTheta;
-  G4double rho2,rad,rho;
-  G4double phiC,cosPhiC,sinPhiC,cosPsi,ePhi;
+  G4double rho2,rds,rho;
+  G4double cosPsi;
   G4double pTheta,dTheta1,dTheta2;
   rho2=p.x()*p.x()+p.y()*p.y();
-  rad=std::sqrt(rho2+p.z()*p.z());
+  rds=std::sqrt(rho2+p.z()*p.z());
   rho=std::sqrt(rho2);
 
@@ -1856,6 +1748,6 @@
   if (fRmin)
   {
-    safeRMin=fRmin-rad;
-    safeRMax=rad-fRmax;
+    safeRMin=fRmin-rds;
+    safeRMax=rds-fRmax;
     if (safeRMin>safeRMax)
     {
@@ -1869,5 +1761,5 @@
   else
   {
-    safe=rad-fRmax;
+    safe=rds-fRmax;
   }
 
@@ -1875,27 +1767,22 @@
   // Distance to phi extent
   //
-  if (fDPhi<twopi&&rho)
-  {
-    phiC=fSPhi+fDPhi*0.5;
-    cosPhiC=std::cos(phiC);
-    sinPhiC=std::sin(phiC);
-
+  if (!fFullPhiSphere && rho)
+  {
     // Psi=angle from central phi to point
     //
-    cosPsi=(p.x()*cosPhiC+p.y()*sinPhiC)/rho;
-    if (cosPsi<std::cos(fDPhi*0.5))
+    cosPsi=(p.x()*cosCPhi+p.y()*sinCPhi)/rho;
+    if (cosPsi<std::cos(hDPhi))
     {
       // Point lies outside phi range
       //
-      if ((p.y()*cosPhiC-p.x()*sinPhiC)<=0)
-      {
-        safePhi=std::fabs(p.x()*std::sin(fSPhi)-p.y()*std::cos(fSPhi));
+      if ((p.y()*cosCPhi-p.x()*sinCPhi)<=0)
+      {
+        safePhi=std::fabs(p.x()*sinSPhi-p.y()*cosSPhi);
       }
       else
       {
-        ePhi=fSPhi+fDPhi;
-        safePhi=std::fabs(p.x()*std::sin(ePhi)-p.y()*std::cos(ePhi));
-      }
-      if (safePhi>safe) safe=safePhi;
+        safePhi=std::fabs(p.x()*sinEPhi-p.y()*cosEPhi);
+      }
+      if (safePhi>safe)  { safe=safePhi; }
     }
   }
@@ -1903,15 +1790,15 @@
   // Distance to Theta extent
   //    
-  if ((rad!=0.0) && (fDTheta<pi))
-  {
-    pTheta=std::acos(p.z()/rad);
-    if (pTheta<0) pTheta+=pi;
+  if ((rds!=0.0) && (!fFullThetaSphere))
+  {
+    pTheta=std::acos(p.z()/rds);
+    if (pTheta<0)  { pTheta+=pi; }
     dTheta1=fSTheta-pTheta;
-    dTheta2=pTheta-(fSTheta+fDTheta);
+    dTheta2=pTheta-eTheta;
     if (dTheta1>dTheta2)
     {
       if (dTheta1>=0)             // WHY ???????????
       {
-        safeTheta=rad*std::sin(dTheta1);
+        safeTheta=rds*std::sin(dTheta1);
         if (safe<=safeTheta)
         {
@@ -1924,5 +1811,5 @@
       if (dTheta2>=0)
       {
-        safeTheta=rad*std::sin(dTheta2);
+        safeTheta=rds*std::sin(dTheta2);
         if (safe<=safeTheta)
         {
@@ -1933,5 +1820,5 @@
   }
 
-  if (safe<0) safe=0;
+  if (safe<0)  { safe=0; }
   return safe;
 }
@@ -1939,5 +1826,5 @@
 /////////////////////////////////////////////////////////////////////
 //
-// Calculate distance to surface of shape from `inside', allowing for tolerance
+// Calculate distance to surface of shape from 'inside', allowing for tolerance
 // - Only Calc rmax intersection if no valid rmin intersection
 
@@ -1952,4 +1839,10 @@
   ESide side=kNull,sidephi=kNull,sidetheta=kNull;  
 
+  static const G4double halfCarTolerance = kCarTolerance*0.5;
+  static const G4double halfAngTolerance = kAngTolerance*0.5;
+  const G4double halfRmaxTolerance = fRmaxTolerance*0.5;
+  const G4double halfRminTolerance = fRminTolerance*0.5;
+  const G4double Rmax_plus  = fRmax + halfRmaxTolerance;
+  const G4double Rmin_minus = (fRmin) ? fRmin-halfRminTolerance : 0;
   G4double t1,t2;
   G4double b,c,d;
@@ -1957,6 +1850,4 @@
   // Variables for phi intersection:
 
-  G4double sinSPhi,cosSPhi,ePhi,sinEPhi,cosEPhi;
-  G4double cPhi,sinCPhi,cosCPhi;
   G4double pDistS,compS,pDistE,compE,sphi2,vphi;
     
@@ -1966,21 +1857,14 @@
   G4double xi,yi,zi;      // Intersection point
 
-  // G4double Comp; // Phi intersection
-
-  G4bool segPhi;        // Phi flag and precalcs
-  G4double hDPhi,hDPhiOT,hDPhiIT; 
-  G4double cosHDPhiOT,cosHDPhiIT;
-
-  G4bool segTheta;                             // Theta flag and precals
-  G4double tanSTheta=0.,tanETheta=0., rhoSecTheta;
-  G4double tanSTheta2=0.,tanETheta2=0.;
+  // Theta precals
+  //
+  G4double rhoSecTheta;
   G4double dist2STheta, dist2ETheta, distTheta;
   G4double d2,s;
 
   // General Precalcs
-
+  //
   rho2 = p.x()*p.x()+p.y()*p.y();
   rad2 = rho2+p.z()*p.z();
-  //  G4double rad=std::sqrt(rad2);
 
   pTheta = std::atan2(std::sqrt(rho2),p.z());
@@ -1989,33 +1873,11 @@
   pDotV3d = pDotV2d+p.z()*v.z();
 
-  // Set phi divided flag and precalcs
-
-  if( fDPhi < twopi )
-  {
-    segPhi=true;
-    hDPhi=0.5*fDPhi;    // half delta phi
-    cPhi=fSPhi+hDPhi;;
-    hDPhiOT=hDPhi+0.5*kAngTolerance; // Outer Tolerant half delta phi 
-    hDPhiIT=hDPhi-0.5*kAngTolerance;
-    sinCPhi=std::sin(cPhi);
-    cosCPhi=std::cos(cPhi);
-    cosHDPhiOT=std::cos(hDPhiOT);
-    cosHDPhiIT=std::cos(hDPhiIT);
-  }
-  else
-  {
-    segPhi=false;
-  }
-
   // Theta precalcs
     
-  if ( fDTheta < pi )
-  {
-    segTheta  = true;
-    tolSTheta = fSTheta - kAngTolerance*0.5;
-    tolETheta = fSTheta + fDTheta + kAngTolerance*0.5;
-  }
-  else segTheta = false;
-
+  if ( !fFullThetaSphere )
+  {
+    tolSTheta = fSTheta - halfAngTolerance;
+    tolETheta = eTheta + halfAngTolerance;
+  }
     
   // Radial Intersections from G4Sphere::DistanceToIn
@@ -2034,23 +1896,10 @@
   //
   // => s=-pDotV3d+-std::sqrt(pDotV3d^2-(rad2-R^2))
-  //
-  // const G4double  fractionTolerance = 1.0e-12;
-
-  const G4double  flexRadMaxTolerance =            // kRadTolerance;
-    std::max(kRadTolerance, fEpsilon * fRmax);
-
-  const G4double  Rmax_plus = fRmax + flexRadMaxTolerance*0.5;
-
-  const G4double  flexRadMinTolerance = std::max(kRadTolerance, 
-                     fEpsilon * fRmin);
-
-  const G4double  Rmin_minus= (fRmin > 0) ? fRmin-flexRadMinTolerance*0.5 : 0 ;
-
-  if(rad2 <= Rmax_plus*Rmax_plus && rad2 >= Rmin_minus*Rmin_minus)
-    //  if(rad <= Rmax_plus && rad >= Rmin_minus)
+
+  if( (rad2 <= Rmax_plus*Rmax_plus) && (rad2 >= Rmin_minus*Rmin_minus) )
   {
     c = rad2 - fRmax*fRmax;
 
-    if (c < flexRadMaxTolerance*fRmax) 
+    if (c < fRmaxTolerance*fRmax) 
     {
       // Within tolerant Outer radius 
@@ -2065,7 +1914,7 @@
       d2 = pDotV3d*pDotV3d - c;
 
-      if( (c >- flexRadMaxTolerance*fRmax)       // on tolerant surface
-       && ((pDotV3d >=0) || (d2 < 0)) )          // leaving outside from Rmax 
-                                                 // not re-entering
+      if( (c >- fRmaxTolerance*fRmax)       // on tolerant surface
+       && ((pDotV3d >=0) || (d2 < 0)) )     // leaving outside from Rmax 
+                                            // not re-entering
       {
         if(calcNorm)
@@ -2092,11 +1941,11 @@
       d2 = pDotV3d*pDotV3d - c;
 
-      if ( c >- flexRadMinTolerance*fRmin ) // 2.0 * (0.5*kRadTolerance) * fRmin
-      {
-        if( c < flexRadMinTolerance*fRmin && 
-            d2 >= flexRadMinTolerance*fRmin && pDotV3d < 0 ) // leaving from Rmin
-        {
-          if(calcNorm)  *validNorm = false ;   // Rmin surface is concave         
-                       return snxt = 0 ;
+      if (c >- fRminTolerance*fRmin) // 2.0 * (0.5*kRadTolerance) * fRmin
+      {
+        if ( (c < fRminTolerance*fRmin)              // leaving from Rmin
+          && (d2 >= fRminTolerance*fRmin) && (pDotV3d < 0) )
+        {
+          if(calcNorm)  { *validNorm = false; }  // Rmin surface is concave         
+          return snxt = 0 ;
         }
         else
@@ -2119,5 +1968,5 @@
   // Theta segment intersection
 
-  if (segTheta)
+  if ( !fFullThetaSphere )
   {
     // Intersection with theta surfaces
@@ -2143,186 +1992,11 @@
     //
   
-    /* ////////////////////////////////////////////////////////
-
-    tanSTheta=std::tan(fSTheta);
-    tanSTheta2=tanSTheta*tanSTheta;
-    tanETheta=std::tan(fSTheta+fDTheta);
-    tanETheta2=tanETheta*tanETheta;
-      
-    if (fSTheta)
-    {
-      dist2STheta=rho2-p.z()*p.z()*tanSTheta2;
-    }
-    else
-    {
-      dist2STheta = kInfinity;
-    }
-    if (fSTheta + fDTheta < pi)
-    {
-      dist2ETheta = rho2-p.z()*p.z()*tanETheta2;
-    }
-    else
-    {
-      dist2ETheta = kInfinity ;
-    }
-    if (pTheta > tolSTheta && pTheta < tolETheta)   // Inside theta  
-    {
-      // In tolerance of STheta and possible leaving out to small thetas N-
-
-      if(pTheta < tolSTheta + kAngTolerance  && fSTheta > kAngTolerance)  
-      {
-        t2=pDotV2d-p.z()*v.z()*tanSTheta2 ; // =(VdotN+)*rhoSecSTheta
-
-        if( fSTheta < pi*0.5 && t2 < 0)
-        {
-          if(calcNorm) *validNorm = false ;
-          return snxt = 0 ;
-        }
-        else if(fSTheta > pi*0.5 && t2 >= 0)
-        {
-          if(calcNorm)
-          {
-            rhoSecTheta = std::sqrt(rho2*(1+tanSTheta2)) ;
-            *validNorm = true ;
-            *n = G4ThreeVector(-p.x()/rhoSecTheta,   // N-
-                               -p.y()/rhoSecTheta,
-                               tanSTheta/std::sqrt(1+tanSTheta2) ) ;
-          }
-          return snxt = 0 ;
-        }
-        else if( fSTheta == pi*0.5 && v.z() > 0)
-        {
-          if(calcNorm)
-          {
-            *validNorm = true ;
-            *n = G4ThreeVector(0,0,1) ;
-          }
-          return snxt = 0 ;
-        }
-      }
-
-      // In tolerance of ETheta and possible leaving out to larger thetas N+
-
-      if ( (pTheta  > tolETheta - kAngTolerance)
-        && (( fSTheta + fDTheta) < pi - kAngTolerance) )  
-      {
-        t2=pDotV2d-p.z()*v.z()*tanETheta2 ;
-        if((fSTheta+fDTheta)>pi*0.5 && t2<0)
-        {
-          if(calcNorm) *validNorm = false ;
-          return snxt = 0 ;
-        }
-        else if( (fSTheta+fDTheta) < pi*0.5 && t2 >= 0 )
-        {
-          if(calcNorm)
-          {
-            rhoSecTheta = std::sqrt(rho2*(1+tanETheta2)) ;
-            *validNorm = true ;
-            *n = G4ThreeVector( p.x()/rhoSecTheta,  // N+
-                                p.y()/rhoSecTheta,
-                                -tanETheta/std::sqrt(1+tanETheta2)  ) ; 
-          }
-          return snxt = 0 ;
-        }
-        else if( ( fSTheta+fDTheta) == pi*0.5 && v.z() < 0 )
-        {
-          if(calcNorm)
-          {
-            *validNorm = true ;
-            *n = G4ThreeVector(0,0,-1) ;
-          }
-          return snxt = 0 ;
-        }
-      }
-      if( fSTheta > 0 )
-      {       
-        // First root of fSTheta cone, second if first root -ve
-
-        t1 = 1-v.z()*v.z()*(1+tanSTheta2);
-        t2 = pDotV2d-p.z()*v.z()*tanSTheta2;
-        
-        b  = t2/t1;
-        c  = dist2STheta/t1;
-        d2 = b*b - c ;
-
-        if ( d2 >= 0 )
-        {
-          d = std::sqrt(d2) ;
-          s = -b - d ;    // First root
-
-          if ( s < 0 )
-          {
-            s = -b + d ;    // Second root
-          }
-          if (s > flexRadMaxTolerance*0.5 )   // && s<sr)
-          {
-            // check against double cone solution
-            zi=p.z()+s*v.z();
-            if (fSTheta<pi*0.5 && zi<0)
-            {
-              s = kInfinity ;  // wrong cone
-            }
-            if (fSTheta>pi*0.5 && zi>0)
-            {
-              s = kInfinity ;  // wrong cone
-            }
-            stheta = s ;
-            sidetheta = kSTheta ;
-          }
-        }
-      }
-
-      // Possible intersection with ETheta cone  
-      
-      if (fSTheta + fDTheta < pi)
-      {
-        t1 = 1-v.z()*v.z()*(1+tanETheta2);
-        t2 = pDotV2d-p.z()*v.z()*tanETheta2;        
-        b  = t2/t1;
-        c  = dist2ETheta/t1;
-        d2 = b*b-c ;
-
-        if ( d2 >= 0 )
-        {
-          d = std::sqrt(d2);
-          s = -b - d ;          // First root
-
-          if ( s < 0 )
-          {
-            s=-b+d;    // Second root
-          }
-          if (s > flexRadMaxTolerance*0.5 && s < stheta )
-          {
-            // check against double cone solution
-            zi=p.z()+s*v.z();
-            if (fSTheta+fDTheta<pi*0.5 && zi<0)
-            {
-              s = kInfinity ;  // wrong cone
-            }
-            if (fSTheta+fDTheta>pi*0.5 && zi>0)
-            {
-              s = kInfinity ;  // wrong cone
-            }
-          }
-          if (s < stheta)
-          {
-            stheta = s ;
-            sidetheta = kETheta ;
-          }
-        }
-      }
-    }  
-    */  ////////////////////////////////////////////////////////////
-
     if(fSTheta) // intersection with first cons
     {
-
-      tanSTheta = std::tan(fSTheta);
-
       if( std::fabs(tanSTheta) > 5./kAngTolerance ) // kons is plane z=0
       {
         if( v.z() > 0. ) 
         {
-          if ( std::fabs( p.z() ) <= flexRadMaxTolerance*0.5 )
+          if ( std::fabs( p.z() ) <= halfRmaxTolerance )
           {
             if(calcNorm)
@@ -2333,5 +2007,4 @@
             return snxt = 0 ;
           }  
-          // s = -p.z()/v.z();
           stheta    = -p.z()/v.z();
           sidetheta = kSTheta;
@@ -2340,24 +2013,22 @@
       else // kons is not plane 
       {
-        tanSTheta2  = tanSTheta*tanSTheta;
         t1          = 1-v.z()*v.z()*(1+tanSTheta2);
         t2          = pDotV2d-p.z()*v.z()*tanSTheta2;  // ~vDotN if p on cons
-        dist2STheta = rho2-p.z()*p.z()*tanSTheta2;      // t3
-
-        // distTheta = std::sqrt(std::fabs(dist2STheta/(1+tanSTheta2)));
+        dist2STheta = rho2-p.z()*p.z()*tanSTheta2;     // t3
+
         distTheta = std::sqrt(rho2)-p.z()*tanSTheta;
 
-        if( std::fabs(t1) < 0.5*kAngTolerance ) // 1st order equation, v parallel to kons
-        {
+        if( std::fabs(t1) < halfAngTolerance ) // 1st order equation,
+        {                                      // v parallel to kons
           if( v.z() > 0. )
           {
-            if(std::fabs(distTheta) < flexRadMaxTolerance*0.5) // p on surface
-            {
-              if( fSTheta < halfpi && p.z() > 0. )
-              {
-                if( calcNorm ) *validNorm = false;
-                              return snxt = 0.;
-              }
-              else if( fSTheta > halfpi && p.z() <= 0)
+            if(std::fabs(distTheta) < halfRmaxTolerance) // p on surface
+            {
+              if( (fSTheta < halfpi) && (p.z() > 0.) )
+              {
+                if( calcNorm )  { *validNorm = false; }
+                return snxt = 0.;
+              }
+              else if( (fSTheta > halfpi) && (p.z() <= 0) )
               {
                 if( calcNorm ) 
@@ -2377,15 +2048,13 @@
               }
             }
-            // s = -0.5*dist2STheta/t2;
-
             stheta    = -0.5*dist2STheta/t2;
             sidetheta = kSTheta;
           }  
-        }
-        else   // 2nd order equation, 1st root of fSTheta cone, 2nd if 1st root -ve
-        {
-          if( std::fabs(distTheta) < flexRadMaxTolerance*0.5) // && t2 >= 0.) surface
-          {
-            if( fSTheta > halfpi && t2 >= 0. ) // leave
+        }      // 2nd order equation, 1st root of fSTheta cone,
+        else   // 2nd if 1st root -ve
+        {
+          if( std::fabs(distTheta) < halfRmaxTolerance )
+          {
+            if( (fSTheta > halfpi) && (t2 >= 0.) ) // leave
             {
               if( calcNorm ) 
@@ -2394,18 +2063,18 @@
                 if (rho2)
                 {
-                    rhoSecTheta = std::sqrt(rho2*(1+tanSTheta2));
+                  rhoSecTheta = std::sqrt(rho2*(1+tanSTheta2));
                    
-                    *n = G4ThreeVector( p.x()/rhoSecTheta,   
-                                        p.y()/rhoSecTheta,
-                                        std::sin(fSTheta)  );
+                  *n = G4ThreeVector( p.x()/rhoSecTheta,   
+                                      p.y()/rhoSecTheta,
+                                      std::sin(fSTheta)  );
                 }
-                else *n = G4ThreeVector(0.,0.,1.);
-              }                           
+                else  { *n = G4ThreeVector(0.,0.,1.); }
+              }
               return snxt = 0.;
             }
-            else if( fSTheta < halfpi  && t2 < 0. && p.z() >=0. ) // leave
-            {
-                if( calcNorm )   *validNorm = false;                                                 
-                return snxt = 0.;
+            else if( (fSTheta < halfpi) && (t2 < 0.) && (p.z() >=0.) ) // leave
+            {
+              if( calcNorm )  { *validNorm = false; }
+              return snxt = 0.;
             }                               
           }
@@ -2422,11 +2091,10 @@
               s = -b - d;         // First root
 
-              if( (std::fabs(s) < flexRadMaxTolerance*0.5 && t2 < 0.) ||
-                              s < 0.  ||
-                  ( s > 0. && p.z() + s*v.z() > 0.)                   ) 
+              if ( ((std::fabs(s) < halfRmaxTolerance) && (t2 < 0.))
+               ||  (s < 0.)  || ( (s > 0.) && (p.z() + s*v.z() > 0.) )     ) 
               {
                 s = -b + d ; // 2nd root
               }
-              if( s >  flexRadMaxTolerance*0.5 && p.z() + s*v.z() <= 0.)  
+              if( (s > halfRmaxTolerance) && (p.z() + s*v.z() <= 0.) )  
               {
                 stheta    = s;
@@ -2438,11 +2106,10 @@
               s = -b - d;         // First root
 
-              if( (std::fabs(s) < flexRadMaxTolerance*0.5 && t2 >= 0.) ||
-                              s < 0.                                   ||
-                  ( s > 0. && p.z() + s*v.z() < 0.)                      )
+              if ( ( (std::fabs(s) < halfRmaxTolerance) && (t2 >= 0.) )
+                || (s < 0.) || ( (s > 0.) && (p.z() + s*v.z() < 0.) )   )
               {
                 s = -b + d ; // 2nd root
               }
-              if( s >  flexRadMaxTolerance*0.5 && p.z() + s*v.z() >= 0.)  
+              if( (s > halfRmaxTolerance) && (p.z() + s*v.z() >= 0.) )  
               {
                 stheta    = s;
@@ -2454,14 +2121,11 @@
       }
     }
-    if (fSTheta + fDTheta < pi) // intersection with second cons
-    {
-
-      tanETheta = std::tan(fSTheta+fDTheta);
-
+    if (eTheta < pi) // intersection with second cons
+    {
       if( std::fabs(tanETheta) > 5./kAngTolerance ) // kons is plane z=0
       {
         if( v.z() < 0. ) 
         {
-          if ( std::fabs( p.z() ) <= flexRadMaxTolerance*0.5 )
+          if ( std::fabs( p.z() ) <= halfRmaxTolerance )
           {
             if(calcNorm)
@@ -2474,5 +2138,5 @@
           s = -p.z()/v.z();
 
-          if( s < stheta)
+          if( s < stheta )
           {
             stheta    = s;
@@ -2483,24 +2147,22 @@
       else // kons is not plane 
       {
-        tanETheta2  = tanETheta*tanETheta;
         t1          = 1-v.z()*v.z()*(1+tanETheta2);
         t2          = pDotV2d-p.z()*v.z()*tanETheta2;  // ~vDotN if p on cons
-        dist2ETheta = rho2-p.z()*p.z()*tanETheta2;      // t3
-
-        // distTheta = std::sqrt(std::fabs(dist2ETheta/(1+tanETheta2)));
+        dist2ETheta = rho2-p.z()*p.z()*tanETheta2;     // t3
+
         distTheta = std::sqrt(rho2)-p.z()*tanETheta;
 
-        if( std::fabs(t1) < 0.5*kAngTolerance ) // 1st order equation, v parallel to kons
-        {
+        if( std::fabs(t1) < halfAngTolerance ) // 1st order equation,
+        {                                      // v parallel to kons
           if( v.z() < 0. )
           {
-            if(std::fabs(distTheta) < flexRadMaxTolerance*0.5) // p on surface
-            {
-              if( fSTheta+fDTheta > halfpi && p.z() < 0. )
-              {
-                if( calcNorm ) *validNorm = false;
-                              return snxt = 0.;
-              }
-              else if( fSTheta+fDTheta < halfpi && p.z() >= 0)
+            if(std::fabs(distTheta) < halfRmaxTolerance) // p on surface
+            {
+              if( (eTheta > halfpi) && (p.z() < 0.) )
+              {
+                if( calcNorm )  { *validNorm = false; }
+                return snxt = 0.;
+              }
+              else if ( (eTheta < halfpi) && (p.z() >= 0) )
               {
                 if( calcNorm ) 
@@ -2510,10 +2172,9 @@
                   {
                     rhoSecTheta = std::sqrt(rho2*(1+tanETheta2));
-                   
                     *n = G4ThreeVector( p.x()/rhoSecTheta,   
                                         p.y()/rhoSecTheta,
-                                        -std::sin(fSTheta+fDTheta)  );
+                                        -sinETheta  );
                   }
-                  else *n = G4ThreeVector(0.,0.,-1.);
+                  else  { *n = G4ThreeVector(0.,0.,-1.); }
                 }
                 return snxt = 0.;               
@@ -2522,5 +2183,5 @@
             s = -0.5*dist2ETheta/t2;
 
-            if( s < stheta)
+            if( s < stheta )
             {
               stheta    = s;
@@ -2528,10 +2189,10 @@
             }
           }  
-        }
-        else   // 2nd order equation, 1st root of fSTheta cone, 2nd if 1st root -ve
-        {
-          if( std::fabs(distTheta) < flexRadMaxTolerance*0.5) // && t2 >= 0.) surface
-          {
-            if( fSTheta+fDTheta < halfpi && t2 >= 0. ) // leave
+        }      // 2nd order equation, 1st root of fSTheta cone
+        else   // 2nd if 1st root -ve
+        {
+          if ( std::fabs(distTheta) < halfRmaxTolerance )
+          {
+            if( (eTheta < halfpi) && (t2 >= 0.) ) // leave
             {
               if( calcNorm ) 
@@ -2541,8 +2202,7 @@
                 {
                     rhoSecTheta = std::sqrt(rho2*(1+tanETheta2));
-                   
                     *n = G4ThreeVector( p.x()/rhoSecTheta,   
                                         p.y()/rhoSecTheta,
-                                        -std::sin(fSTheta+fDTheta)  );
+                                        -sinETheta  );
                 }
                 else *n = G4ThreeVector(0.,0.,-1.);
@@ -2550,8 +2210,9 @@
               return snxt = 0.;
             }
-            else if( fSTheta+fDTheta > halfpi  && t2 < 0. && p.z() <=0. ) // leave
-            {
-                if( calcNorm )   *validNorm = false;                                                 
-                return snxt = 0.;
+            else if ( (eTheta > halfpi)
+                   && (t2 < 0.) && (p.z() <=0.) ) // leave
+            {
+              if( calcNorm )  { *validNorm = false; }
+              return snxt = 0.;
             }                               
           }
@@ -2564,14 +2225,14 @@
             d = std::sqrt(d2);
 
-            if( fSTheta+fDTheta < halfpi )
+            if( eTheta < halfpi )
             {
               s = -b - d;         // First root
 
-              if( (std::fabs(s) < flexRadMaxTolerance*0.5 && t2 < 0.) ||
-                              s < 0. ) 
+              if( ((std::fabs(s) < halfRmaxTolerance) && (t2 < 0.))
+               || (s < 0.) ) 
               {
                 s = -b + d ; // 2nd root
               }
-              if( s >  flexRadMaxTolerance*0.5 )  
+              if( s > halfRmaxTolerance )  
               {
                 if( s < stheta )
@@ -2586,11 +2247,10 @@
               s = -b - d;         // First root
 
-              if( (std::fabs(s) < flexRadMaxTolerance*0.5 && t2 >= 0.) ||
-                              s < 0.                                   ||
-                  ( s > 0. && p.z() + s*v.z() > 0.)                      )
+              if ( ((std::fabs(s) < halfRmaxTolerance) && (t2 >= 0.))
+                || (s < 0.) || ( (s > 0.) && (p.z() + s*v.z() > 0.) ) )
               {
                 s = -b + d ; // 2nd root
               }
-              if( s >  flexRadMaxTolerance*0.5 && p.z() + s*v.z() <= 0.)  
+              if( (s > halfRmaxTolerance) && (p.z() + s*v.z() <= 0.) )  
               {
                 if( s < stheta )
@@ -2610,16 +2270,7 @@
   // Phi Intersection
     
-  if ( fDPhi < twopi)
-  {
-    sinSPhi=std::sin(fSPhi);
-    cosSPhi=std::cos(fSPhi);
-    ePhi=fSPhi+fDPhi;
-    sinEPhi=std::sin(ePhi);
-    cosEPhi=std::cos(ePhi);
-    cPhi=fSPhi+fDPhi*0.5;
-    sinCPhi=std::sin(cPhi);
-    cosCPhi=std::cos(cPhi);
-
-    if ( p.x()||p.y() ) // Check if on z axis (rho not needed later)
+  if ( !fFullPhiSphere )
+  {
+    if ( p.x() || p.y() ) // Check if on z axis (rho not needed later)
     {
       // pDist -ve when inside
@@ -2634,5 +2285,5 @@
       sidephi = kNull ;
 
-      if ( pDistS <= 0 && pDistE <= 0 )
+      if ( (pDistS <= 0) && (pDistE <= 0) )
       {
         // Inside both phi *full* planes
@@ -2644,8 +2295,17 @@
           yi   = p.y()+sphi*v.y() ;
 
-          // Check intersecting with correct half-plane
-          // (if not -> no intersect)
-
-          if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
+          // Check intersection with correct half-plane (if not -> no intersect)
+          //
+          if( (std::abs(xi)<=kCarTolerance) && (std::abs(yi)<=kCarTolerance) )
+          {
+            vphi = std::atan2(v.y(),v.x());
+            sidephi = kSPhi;
+            if ( ( (fSPhi-halfAngTolerance) <= vphi)
+              && ( (ePhi+halfAngTolerance)  >= vphi) )
+            {
+              sphi = kInfinity;
+            }
+          }
+          else if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
           {
             sphi=kInfinity;
@@ -2654,8 +2314,8 @@
           {
             sidephi = kSPhi ;
-            if ( pDistS > -0.5*kCarTolerance) sphi =0 ; // Leave by sphi 
-          }
-        }
-        else sphi = kInfinity ;
+            if ( pDistS > -halfCarTolerance)  { sphi = 0; } // Leave by sphi 
+          }
+        }
+        else  { sphi = kInfinity; }
 
         if ( compE < 0 )
@@ -2667,10 +2327,24 @@
             yi = p.y()+sphi2*v.y() ;
 
-            // Check intersecting with correct half-plane
- 
-            if ((yi*cosCPhi-xi*sinCPhi)>=0) // Leaving via ending phi
+            // Check intersection with correct half-plane
+            //
+            if ((std::abs(xi)<=kCarTolerance) && (std::abs(yi)<=kCarTolerance))
+            {
+              // Leaving via ending phi
+              //
+              vphi = std::atan2(v.y(),v.x()) ;
+               
+              if( !((fSPhi-halfAngTolerance <= vphi)
+                  &&(fSPhi+fDPhi+halfAngTolerance >= vphi)) )
+              { 
+                sidephi = kEPhi;
+                if ( pDistE <= -halfCarTolerance )  { sphi = sphi2; }
+                else                                { sphi = 0.0;   }
+              }
+            }
+            else if ((yi*cosCPhi-xi*sinCPhi)>=0) // Leaving via ending phi
             {
               sidephi = kEPhi ;
-              if ( pDistE <= -0.5*kCarTolerance )
+              if ( pDistE <= -halfCarTolerance )
               {
                 sphi=sphi2;
@@ -2684,5 +2358,5 @@
         }        
       }
-      else if ( pDistS >= 0 && pDistE >= 0 ) // Outside both *full* phi planes
+      else if ((pDistS >= 0) && (pDistE >= 0)) // Outside both *full* phi planes
       {
         if ( pDistS <= pDistE )
@@ -2696,6 +2370,6 @@
         if ( fDPhi > pi )
         {
-          if ( compS < 0 && compE < 0 ) sphi = 0 ;
-          else                          sphi = kInfinity ;
+          if ( (compS < 0) && (compE < 0) )  { sphi = 0; }
+          else                               { sphi = kInfinity; }
         }
         else
@@ -2704,15 +2378,9 @@
           // will remain inside
 
-          if ( compS >= 0 && compE >= 0 )
-          {
-            sphi=kInfinity;
-          }
-          else
-          {
-            sphi=0;
-          }
+          if ( (compS >= 0) && (compE >= 0) ) { sphi = kInfinity; }
+          else                                { sphi = 0; }
         }    
       }
-      else if ( pDistS > 0 && pDistE < 0 )
+      else if ( (pDistS > 0) && (pDistE < 0) )
       {
         // Outside full starting plane, inside full ending plane
@@ -2729,5 +2397,15 @@
             // (if not -> not leaving phi extent)
             //
-            if ( ( yi*cosCPhi - xi*sinCPhi ) <= 0 )
+            if( (std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance) )
+            {
+              vphi = std::atan2(v.y(),v.x());
+              sidephi = kSPhi;
+              if ( ( (fSPhi-halfAngTolerance) <= vphi)
+                && ( (ePhi+halfAngTolerance)  >= vphi) )
+              {
+                sphi = kInfinity;
+              }
+            }
+            else if ( ( yi*cosCPhi - xi*sinCPhi ) <= 0 )
             {
               sphi = kInfinity ;
@@ -2736,5 +2414,5 @@
             {
               sidephi = kEPhi ;
-              if ( pDistE > -0.5*kCarTolerance ) sphi = 0. ;
+              if ( pDistE > -halfCarTolerance )  { sphi = 0.; }
             }
           }
@@ -2757,5 +2435,15 @@
               // (if not -> remain in extent)
               //
-              if ( ( yi*cosCPhi - xi*sinCPhi) <= 0 )
+              if( (std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance) )
+              {
+                vphi = std::atan2(v.y(),v.x());
+                sidephi = kSPhi;
+                if ( ( (fSPhi-halfAngTolerance) <= vphi)
+                  && ( (ePhi+halfAngTolerance)  >= vphi) )
+                {
+                  sphi = kInfinity;
+                }
+              }
+              else if ( ( yi*cosCPhi - xi*sinCPhi) <= 0 )
               {
                 sphi=kInfinity;
@@ -2787,16 +2475,26 @@
             xi=p.x()+sphi*v.x();
             yi=p.y()+sphi*v.y();
-
+            
             // Check intersection in correct half-plane
             // (if not -> not leaving phi extent)
             //
-            if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
+            if( (std::abs(xi)<=kCarTolerance)&&(std::abs(yi)<=kCarTolerance) )
+            {
+              vphi = std::atan2(v.y(),v.x()) ;
+              sidephi = kSPhi;
+              if ( ( (fSPhi-halfAngTolerance) <= vphi)
+                && ( (ePhi+halfAngTolerance)  >= vphi) )
+              {
+              sphi = kInfinity;
+              }
+            }
+            else if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
             {
               sphi = kInfinity ;
             }
-           else  // Leaving via Starting phi
-           {
+            else  // Leaving via Starting phi
+            {
               sidephi = kSPhi ;
-             if ( pDistS > -0.5*kCarTolerance ) sphi = 0 ;
+              if ( pDistS > -halfCarTolerance )  { sphi = 0; }
             }
           }
@@ -2815,9 +2513,19 @@
               xi   = p.x()+sphi*v.x() ;
               yi   = p.y()+sphi*v.y() ;
-
+              
               // Check intersection in correct half-plane
               // (if not -> remain in extent)
               //
-              if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
+              if((std::abs(xi)<=kCarTolerance) && (std::abs(yi)<=kCarTolerance))
+              {
+                vphi = std::atan2(v.y(),v.x()) ;
+                sidephi = kSPhi;
+                if ( ( (fSPhi-halfAngTolerance) <= vphi)
+                  && ( (ePhi+halfAngTolerance)  >= vphi) )
+                {
+                  sphi = kInfinity;
+                }
+              }
+              else if ( ( yi*cosCPhi - xi*sinCPhi ) >= 0 )
               {
                 sphi = kInfinity ;
@@ -2849,7 +2557,7 @@
       {
         vphi = std::atan2(v.y(),v.x()) ;
-        if ( fSPhi < vphi && vphi < fSPhi + fDPhi )
-        {
-          sphi=kInfinity;
+        if ((fSPhi-halfAngTolerance < vphi) && (vphi < ePhi+halfAngTolerance))
+        {
+          sphi = kInfinity;
         }
         else
@@ -2859,5 +2567,5 @@
         }
       }
-      else  // travel along z - no phi intersaction
+      else  // travel along z - no phi intersection
       {
         sphi = kInfinity ;
@@ -2895,8 +2603,8 @@
         if ( fDPhi <= pi )     // Normal to Phi-
         {
-          *n=G4ThreeVector(std::sin(fSPhi),-std::cos(fSPhi),0);
+          *n=G4ThreeVector(sinSPhi,-cosSPhi,0);
           *validNorm=true;
         }
-        else *validNorm=false;
+        else  { *validNorm=false; }
         break ;
 
@@ -2904,8 +2612,8 @@
         if ( fDPhi <= pi )      // Normal to Phi+
         {
-          *n=G4ThreeVector(-std::sin(fSPhi+fDPhi),std::cos(fSPhi+fDPhi),0);
+          *n=G4ThreeVector(-sinEPhi,cosEPhi,0);
           *validNorm=true;
         }
-        else *validNorm=false;
+        else  { *validNorm=false; }
         break;
 
@@ -2920,30 +2628,44 @@
           xi = p.x() + snxt*v.x();
           yi = p.y() + snxt*v.y();
-          rhoSecTheta = std::sqrt((xi*xi+yi*yi)*(1+tanSTheta2));
-          *n = G4ThreeVector( xi/rhoSecTheta,   // N-
-                              yi/rhoSecTheta,
-                              -tanSTheta/std::sqrt(1+tanSTheta2));
+          rho2=xi*xi+yi*yi;
+          if (rho2)
+          { 
+            rhoSecTheta = std::sqrt(rho2*(1+tanSTheta2));
+            *n = G4ThreeVector( xi/rhoSecTheta, yi/rhoSecTheta,
+                               -tanSTheta/std::sqrt(1+tanSTheta2));
+          }
+          else
+          {
+            *n = G4ThreeVector(0.,0.,1.);
+          }
           *validNorm=true;
         }
-        else *validNorm=false;  // Concave STheta cone
+        else  { *validNorm=false; }  // Concave STheta cone
         break;
 
       case kETheta:
-        if( ( fSTheta + fDTheta ) == halfpi )
+        if( eTheta == halfpi )
         {
           *n         = G4ThreeVector(0.,0.,-1.);
           *validNorm = true;
         }
-        else if ( ( fSTheta + fDTheta ) < halfpi)
+        else if ( eTheta < halfpi )
         {
           xi=p.x()+snxt*v.x();
           yi=p.y()+snxt*v.y();
-          rhoSecTheta = std::sqrt((xi*xi+yi*yi)*(1+tanETheta2));
-          *n = G4ThreeVector( xi/rhoSecTheta,   // N+
-                              yi/rhoSecTheta,
-                              -tanETheta/std::sqrt(1+tanETheta2) );
+          rho2=xi*xi+yi*yi;
+          if (rho2)
+          { 
+            rhoSecTheta = std::sqrt(rho2*(1+tanETheta2));
+            *n = G4ThreeVector( xi/rhoSecTheta, yi/rhoSecTheta,
+                               -tanETheta/std::sqrt(1+tanETheta2) );
+          }
+          else
+          {
+            *n = G4ThreeVector(0.,0.,-1.);
+          }
           *validNorm=true;
         }
-        else *validNorm=false;   // Concave ETheta cone
+        else  { *validNorm=false; }   // Concave ETheta cone
         break;
 
@@ -2995,14 +2717,13 @@
 /////////////////////////////////////////////////////////////////////////
 //
-// Calcluate distance (<=actual) to closest surface of shape from inside
+// Calculate distance (<=actual) to closest surface of shape from inside
 
 G4double G4Sphere::DistanceToOut( const G4ThreeVector& p ) const
 {
   G4double safe=0.0,safeRMin,safeRMax,safePhi,safeTheta;
-  G4double rho2,rad,rho;
-  G4double phiC,cosPhiC,sinPhiC,ePhi;
+  G4double rho2,rds,rho;
   G4double pTheta,dTheta1,dTheta2;
   rho2=p.x()*p.x()+p.y()*p.y();
-  rad=std::sqrt(rho2+p.z()*p.z());
+  rds=std::sqrt(rho2+p.z()*p.z());
   rho=std::sqrt(rho2);
 
@@ -3027,6 +2748,6 @@
   if (fRmin)
   {
-    safeRMin=rad-fRmin;
-    safeRMax=fRmax-rad;
+    safeRMin=rds-fRmin;
+    safeRMax=fRmax-rds;
     if (safeRMin<safeRMax)
     {
@@ -3040,5 +2761,5 @@
   else
   {
-    safe=fRmax-rad;
+    safe=fRmax-rds;
   }
 
@@ -3046,19 +2767,15 @@
   // Distance to phi extent
   //
-  if (fDPhi<twopi && rho)
-  {
-    phiC=fSPhi+fDPhi*0.5;
-    cosPhiC=std::cos(phiC);
-    sinPhiC=std::sin(phiC);
-    if ((p.y()*cosPhiC-p.x()*sinPhiC)<=0)
-    {
-      safePhi=-(p.x()*std::sin(fSPhi)-p.y()*std::cos(fSPhi));
+  if (!fFullPhiSphere && rho)
+  {
+    if ((p.y()*cosCPhi-p.x()*sinCPhi)<=0)
+    {
+      safePhi=-(p.x()*sinSPhi-p.y()*cosSPhi);
     }
     else
     {
-      ePhi=fSPhi+fDPhi;
-      safePhi=(p.x()*std::sin(ePhi)-p.y()*std::cos(ePhi));
-    }
-    if (safePhi<safe) safe=safePhi;
+      safePhi=(p.x()*sinEPhi-p.y()*cosEPhi);
+    }
+    if (safePhi<safe)  { safe=safePhi; }
   }
 
@@ -3066,30 +2783,17 @@
   // Distance to Theta extent
   //    
-  if (rad)
-  {
-    pTheta=std::acos(p.z()/rad);
-    if (pTheta<0) pTheta+=pi;
+  if (rds)
+  {
+    pTheta=std::acos(p.z()/rds);
+    if (pTheta<0)  { pTheta+=pi; }
     dTheta1=pTheta-fSTheta;
-    dTheta2=(fSTheta+fDTheta)-pTheta;
-    if (dTheta1<dTheta2)
-    {
-      safeTheta=rad*std::sin(dTheta1);
-      if (safe>safeTheta)
-      {
-        safe=safeTheta;
-      }
-    }
-    else
-    {
-      safeTheta=rad*std::sin(dTheta2);
-      if (safe>safeTheta)
-      {
-        safe=safeTheta;
-      }
-    }
-  }
-
-  if (safe<0) safe=0;
-    return safe;
+    dTheta2=eTheta-pTheta;
+    if (dTheta1<dTheta2)  { safeTheta=rds*std::sin(dTheta1); }
+    else                  { safeTheta=rds*std::sin(dTheta2); }
+    if (safe>safeTheta)   { safe=safeTheta; }
+  }
+
+  if (safe<0)  { safe=0; }
+  return safe;
 }
 
@@ -3119,5 +2823,5 @@
   // Phi cross sections
     
-  noPhiCrossSections=G4int (fDPhi/kMeshAngleDefault)+1;
+  noPhiCrossSections = G4int(fDPhi/kMeshAngleDefault)+1;
     
   if (noPhiCrossSections<kMinMeshSections)
@@ -3134,5 +2838,5 @@
   // on the x axis. Will give better extent calculations when not rotated.
     
-  if (fDPhi==pi*2.0 && fSPhi==0)
+  if (fFullPhiSphere)
   {
     sAnglePhi = -meshAnglePhi*0.5;
@@ -3160,5 +2864,5 @@
   // on the z axis. Will give better extent calculations when not rotated.
     
-  if (fDTheta==pi && fSTheta==0)
+  if (fFullThetaSphere)
   {
     startTheta = -meshTheta*0.5;
@@ -3223,6 +2927,6 @@
   }
 
-  delete[] cosCrossTheta;
-  delete[] sinCrossTheta;
+  delete [] cosCrossTheta;
+  delete [] sinCrossTheta;
 
   return vertices;
@@ -3269,30 +2973,28 @@
   G4double height1, height2, slant1, slant2, costheta, sintheta,theta,rRand;
 
-  height1 = (fRmax-fRmin)*std::cos(fSTheta);
-  height2 = (fRmax-fRmin)*std::cos(fSTheta+fDTheta);
-  slant1  = std::sqrt(sqr((fRmax - fRmin)*std::sin(fSTheta))
-                      + height1*height1);
-  slant2  = std::sqrt(sqr((fRmax - fRmin)*std::sin(fSTheta+fDTheta))
-                      + height2*height2);
+  height1 = (fRmax-fRmin)*cosSTheta;
+  height2 = (fRmax-fRmin)*cosETheta;
+  slant1  = std::sqrt(sqr((fRmax - fRmin)*sinSTheta) + height1*height1);
+  slant2  = std::sqrt(sqr((fRmax - fRmin)*sinETheta) + height2*height2);
   rRand   = RandFlat::shoot(fRmin,fRmax);
   
-  aOne = fRmax*fRmax*fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta));
-  aTwo = fRmin*fRmin*fDPhi*(std::cos(fSTheta)-std::cos(fSTheta+fDTheta));
-  aThr = fDPhi*((fRmax + fRmin)*std::sin(fSTheta))*slant1;
-  aFou = fDPhi*((fRmax + fRmin)*std::sin(fSTheta+fDTheta))*slant2;
+  aOne = fRmax*fRmax*fDPhi*(cosSTheta-cosETheta);
+  aTwo = fRmin*fRmin*fDPhi*(cosSTheta-cosETheta);
+  aThr = fDPhi*((fRmax + fRmin)*sinSTheta)*slant1;
+  aFou = fDPhi*((fRmax + fRmin)*sinETheta)*slant2;
   aFiv = 0.5*fDTheta*(fRmax*fRmax-fRmin*fRmin);
   
-  phi = RandFlat::shoot(fSPhi, fSPhi + fDPhi); 
+  phi = RandFlat::shoot(fSPhi, ePhi); 
   cosphi = std::cos(phi); 
   sinphi = std::sin(phi);
-  theta = RandFlat::shoot(fSTheta,fSTheta+fDTheta);
+  theta = RandFlat::shoot(fSTheta,eTheta);
   costheta = std::cos(theta);
   sintheta = std::sqrt(1.-sqr(costheta));
 
-  if( ((fSPhi==0) && (fDPhi==2.*pi)) || (fDPhi==2.*pi) ) {aFiv = 0;}
-  if(fSTheta == 0)  {aThr=0;}
-  if(fDTheta + fSTheta == pi) {aFou = 0;}
-  if(fSTheta == 0.5*pi) {aThr = pi*(fRmax*fRmax-fRmin*fRmin);}
-  if(fSTheta + fDTheta == 0.5*pi) { aFou = pi*(fRmax*fRmax-fRmin*fRmin);}
+  if(fFullPhiSphere) { aFiv = 0; }
+  if(fSTheta == 0)   { aThr=0; }
+  if(eTheta == pi) { aFou = 0; }
+  if(fSTheta == halfpi) { aThr = pi*(fRmax*fRmax-fRmin*fRmin); }
+  if(eTheta == halfpi)  { aFou = pi*(fRmax*fRmax-fRmin*fRmin); }
 
   chose = RandFlat::shoot(0.,aOne+aTwo+aThr+aFou+2.*aFiv);
@@ -3309,9 +3011,9 @@
   else if( (chose>=aOne+aTwo) && (chose<aOne+aTwo+aThr) )
   {
-    if (fSTheta != 0.5*pi)
-    {
-      zRand = RandFlat::shoot(fRmin*std::cos(fSTheta),fRmax*std::cos(fSTheta));
-      return G4ThreeVector(std::tan(fSTheta)*zRand*cosphi,
-                           std::tan(fSTheta)*zRand*sinphi,zRand);
+    if (fSTheta != halfpi)
+    {
+      zRand = RandFlat::shoot(fRmin*cosSTheta,fRmax*cosSTheta);
+      return G4ThreeVector(tanSTheta*zRand*cosphi,
+                           tanSTheta*zRand*sinphi,zRand);
     }
     else
@@ -3322,10 +3024,9 @@
   else if( (chose>=aOne+aTwo+aThr) && (chose<aOne+aTwo+aThr+aFou) )
   {
-    if(fSTheta + fDTheta != 0.5*pi)
-    {
-      zRand = RandFlat::shoot(fRmin*std::cos(fSTheta+fDTheta),
-                              fRmax*std::cos(fSTheta+fDTheta));
-      return G4ThreeVector  (std::tan(fSTheta+fDTheta)*zRand*cosphi,
-                             std::tan(fSTheta+fDTheta)*zRand*sinphi,zRand);
+    if(eTheta != halfpi)
+    {
+      zRand = RandFlat::shoot(fRmin*cosETheta, fRmax*cosETheta);
+      return G4ThreeVector  (tanETheta*zRand*cosphi,
+                             tanETheta*zRand*sinphi,zRand);
     }
     else
@@ -3336,12 +3037,59 @@
   else if( (chose>=aOne+aTwo+aThr+aFou) && (chose<aOne+aTwo+aThr+aFou+aFiv) )
   {
-    return G4ThreeVector(rRand*sintheta*std::cos(fSPhi),
-                         rRand*sintheta*std::sin(fSPhi),rRand*costheta);
+    return G4ThreeVector(rRand*sintheta*cosSPhi,
+                         rRand*sintheta*sinSPhi,rRand*costheta);
   }
   else
   {
-    return G4ThreeVector(rRand*sintheta*std::cos(fSPhi+fDPhi),
-                         rRand*sintheta*std::sin(fSPhi+fDPhi),rRand*costheta);
-  }
+    return G4ThreeVector(rRand*sintheta*cosEPhi,
+                         rRand*sintheta*sinEPhi,rRand*costheta);
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// GetSurfaceArea
+
+G4double G4Sphere::GetSurfaceArea()
+{
+  if(fSurfaceArea != 0.) {;}
+  else
+  {   
+    G4double Rsq=fRmax*fRmax;
+    G4double rsq=fRmin*fRmin;
+         
+    fSurfaceArea = fDPhi*(rsq+Rsq)*(cosSTheta - cosETheta);
+    if(!fFullPhiSphere)
+    {
+      fSurfaceArea = fSurfaceArea + fDTheta*(Rsq-rsq);
+    }
+    if(fSTheta >0)
+    {
+      G4double acos1=std::acos( std::pow(sinSTheta,2) * std::cos(fDPhi)
+                              + std::pow(cosSTheta,2));
+      if(fDPhi>pi)
+      { 
+        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos1);
+      }
+      else
+      {
+        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos1;
+      }
+    }
+    if(eTheta < pi)
+    {
+      G4double acos2=std::acos( std::pow(sinETheta,2) * std::cos(fDPhi)
+                              + std::pow(cosETheta,2));
+      if(fDPhi>pi)
+      { 
+        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*(twopi-acos2);
+      }
+      else
+      {
+        fSurfaceArea = fSurfaceArea + 0.5*(Rsq-rsq)*acos2;
+      }
+    }
+  }
+  return fSurfaceArea;
 }
 
Index: trunk/source/geometry/solids/CSG/src/G4Torus.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Torus.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Torus.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Torus.cc,v 1.63 2007/10/02 09:34:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Torus.cc,v 1.65 2009/11/26 10:31:06 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -284,7 +284,16 @@
 
     G4double theta = std::atan2(ptmp.y(),ptmp.x());
-
-    if (theta < 0)  { theta += twopi; }
     
+    if ( fSPhi >= 0 )
+    {
+      if ( theta < - kAngTolerance*0.5 )  { theta += twopi; }
+      if ( (std::abs(theta) < kAngTolerance*0.5)
+        && (std::abs(fSPhi + fDPhi - twopi) < kAngTolerance*0.5) )
+      { 
+        theta += twopi ; // 0 <= theta < 2pi
+      }
+    }
+    if ((fSPhi <= -pi )&&(theta>kAngTolerance*0.5)) { theta = theta-twopi; }
+       
     // We have to verify if this root is inside the region between
     // fSPhi and fSPhi + fDPhi
Index: trunk/source/geometry/solids/CSG/src/G4Trap.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Trap.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Trap.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trap.cc,v 1.45 2008/04/23 09:49:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Trap
Index: trunk/source/geometry/solids/CSG/src/G4Trd.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Trd.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Trd.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trd.cc,v 1.34 2006/10/19 15:33:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/CSG/src/G4Tubs.cc
===================================================================
--- trunk/source/geometry/solids/CSG/src/G4Tubs.cc	(revision 1227)
+++ trunk/source/geometry/solids/CSG/src/G4Tubs.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Tubs.cc,v 1.74 2008/11/06 15:26:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Tubs.cc,v 1.79 2009/06/30 10:10:11 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -90,5 +90,5 @@
                       G4double pDz,
                       G4double pSPhi, G4double pDPhi )
-  : G4CSGSolid(pName)
+  : G4CSGSolid(pName), fSPhi(0), fDPhi(0)
 {
 
@@ -102,7 +102,7 @@
   else
   {
-    G4cerr << "ERROR - G4Tubs()::G4Tubs(): " << GetName() << G4endl
-           << "        Negative Z half-length ! - "
-           << pDz << G4endl;
+    G4cerr << "ERROR - G4Tubs()::G4Tubs()" << G4endl
+           << "        Negative Z half-length (" << pDz << ") in solid: "
+           << GetName() << G4endl;
     G4Exception("G4Tubs::G4Tubs()", "InvalidSetup", FatalException,
                 "Invalid Z half-length");
@@ -115,6 +115,7 @@
   else
   {
-    G4cerr << "ERROR - G4Tubs()::G4Tubs(): " << GetName() << G4endl
-           << "        Invalid values for radii !" << G4endl
+    G4cerr << "ERROR - G4Tubs()::G4Tubs()" << G4endl
+           << "        Invalid values for radii in solid " << GetName()
+           << G4endl
            << "        pRMin = " << pRMin << ", pRMax = " << pRMax << G4endl;
     G4Exception("G4Tubs::G4Tubs()", "InvalidSetup", FatalException,
@@ -122,42 +123,7 @@
   }
 
-  fPhiFullTube = true;
-  if ( pDPhi >= twopi-kAngTolerance*0.5 ) // Check angles
-  {
-    fDPhi=twopi;
-    fSPhi=0;
-  }
-  else
-  {
-    fPhiFullTube = false;
-    if ( pDPhi > 0 )
-    {
-      fDPhi = pDPhi;
-    }
-    else
-    {
-      G4cerr << "ERROR - G4Tubs()::G4Tubs(): " << GetName() << G4endl
-             << "        Negative delta-Phi ! - "
-             << pDPhi << G4endl;
-      G4Exception("G4Tubs::G4Tubs()", "InvalidSetup",
-                  FatalException, "Invalid dphi.");
-    }
-
-    // Ensure fSphi in 0-2PI or -2PI-0 range if shape crosses 0
-
-    if ( pSPhi < 0 )
-    {
-      fSPhi = twopi - std::fmod(std::fabs(pSPhi),twopi);
-    }
-    else
-    {
-      fSPhi = std::fmod(pSPhi,twopi) ;
-    }
-    if ( fSPhi+fDPhi > twopi )
-    {
-      fSPhi -= twopi ;
-    }
-  }
-  InitializeTrigonometry();
+  // Check angles
+
+  CheckPhiAngles(pSPhi, pDPhi);
 }
 
@@ -203,5 +169,5 @@
 {
 
-  if ( !pTransform.IsRotated() && fDPhi == twopi && fRMin == 0 )
+  if ( (!pTransform.IsRotated()) && (fDPhi == twopi) && (fRMin == 0) )
   {
     // Special case handling for unrotated solid tubes
@@ -210,14 +176,14 @@
     // and compute exact x and y limit for x/y case
       
-    G4double xoffset, xMin, xMax ;
-    G4double yoffset, yMin, yMax ;
-    G4double zoffset, zMin, zMax ;
-
-    G4double diff1, diff2, maxDiff, newMin, newMax ;
-    G4double xoff1, xoff2, yoff1, yoff2, delta ;
-
-    xoffset = pTransform.NetTranslation().x() ;
-    xMin = xoffset - fRMax ;
-    xMax = xoffset + fRMax ;
+    G4double xoffset, xMin, xMax;
+    G4double yoffset, yMin, yMax;
+    G4double zoffset, zMin, zMax;
+
+    G4double diff1, diff2, maxDiff, newMin, newMax;
+    G4double xoff1, xoff2, yoff1, yoff2, delta;
+
+    xoffset = pTransform.NetTranslation().x();
+    xMin = xoffset - fRMax;
+    xMax = xoffset + fRMax;
 
     if (pVoxelLimit.IsXLimited())
@@ -230,17 +196,17 @@
       else
       {
-        if ( xMin < pVoxelLimit.GetMinXExtent() )
-        {
-          xMin = pVoxelLimit.GetMinXExtent() ;
-        }
-        if (xMax > pVoxelLimit.GetMaxXExtent() )
-        {
-          xMax = pVoxelLimit.GetMaxXExtent() ;
-        }
-      }
-    }
-    yoffset = pTransform.NetTranslation().y() ;
-    yMin    = yoffset - fRMax ;
-    yMax    = yoffset + fRMax ;
+        if (xMin < pVoxelLimit.GetMinXExtent())
+        {
+          xMin = pVoxelLimit.GetMinXExtent();
+        }
+        if (xMax > pVoxelLimit.GetMaxXExtent())
+        {
+          xMax = pVoxelLimit.GetMaxXExtent();
+        }
+      }
+    }
+    yoffset = pTransform.NetTranslation().y();
+    yMin    = yoffset - fRMax;
+    yMax    = yoffset + fRMax;
 
     if ( pVoxelLimit.IsYLimited() )
@@ -249,13 +215,13 @@
         || (yMax < pVoxelLimit.GetMinYExtent()) )
       {
-        return false ;
+        return false;
       }
       else
       {
-        if ( yMin < pVoxelLimit.GetMinYExtent() )
-        {
-          yMin = pVoxelLimit.GetMinYExtent() ;
-        }
-        if ( yMax > pVoxelLimit.GetMaxYExtent() )
+        if (yMin < pVoxelLimit.GetMinYExtent())
+        {
+          yMin = pVoxelLimit.GetMinYExtent();
+        }
+        if (yMax > pVoxelLimit.GetMaxYExtent())
         {
           yMax=pVoxelLimit.GetMaxYExtent();
@@ -263,7 +229,7 @@
       }
     }
-    zoffset = pTransform.NetTranslation().z() ;
-    zMin    = zoffset - fDz ;
-    zMax    = zoffset + fDz ;
+    zoffset = pTransform.NetTranslation().z();
+    zMin    = zoffset - fDz;
+    zMax    = zoffset + fDz;
 
     if ( pVoxelLimit.IsZLimited() )
@@ -272,13 +238,13 @@
         || (zMax < pVoxelLimit.GetMinZExtent()) )
       {
-        return false ;
+        return false;
       }
       else
       {
-        if ( zMin < pVoxelLimit.GetMinZExtent() )
-        {
-          zMin = pVoxelLimit.GetMinZExtent() ;
-        }
-        if ( zMax > pVoxelLimit.GetMaxZExtent() )
+        if (zMin < pVoxelLimit.GetMinZExtent())
+        {
+          zMin = pVoxelLimit.GetMinZExtent();
+        }
+        if (zMax > pVoxelLimit.GetMaxZExtent())
         {
           zMax = pVoxelLimit.GetMaxZExtent();
@@ -290,11 +256,11 @@
       case kXAxis :
       {
-        yoff1 = yoffset - yMin ;
-        yoff2 = yMax    - yoffset ;
+        yoff1 = yoffset - yMin;
+        yoff2 = yMax    - yoffset;
 
         if ( (yoff1 >= 0) && (yoff2 >= 0) ) // Y limits cross max/min x
         {                                   // => no change
-          pMin = xMin ;
-          pMax = xMax ;
+          pMin = xMin;
+          pMax = xMax;
         }
         else
@@ -317,11 +283,11 @@
       case kYAxis :
       {
-        xoff1 = xoffset - xMin ;
-        xoff2 = xMax - xoffset ;
+        xoff1 = xoffset - xMin;
+        xoff2 = xMax - xoffset;
 
         if ( (xoff1 >= 0) && (xoff2 >= 0) ) // X limits cross max/min y
         {                                   // => no change
-          pMin = yMin ;
-          pMax = yMax ;
+          pMin = yMin;
+          pMax = yMax;
         }
         else
@@ -334,50 +300,50 @@
           delta   = fRMax*fRMax - xoff2*xoff2;
           diff2   = (delta>0.) ? std::sqrt(delta) : 0.;
-          maxDiff = (diff1 > diff2) ? diff1 : diff2 ;
-          newMin  = yoffset - maxDiff ;
-          newMax  = yoffset + maxDiff ;
-          pMin    = (newMin < yMin) ? yMin : newMin ;
-          pMax     =(newMax > yMax) ? yMax : newMax ;
-        }
-        break ;
+          maxDiff = (diff1 > diff2) ? diff1 : diff2;
+          newMin  = yoffset - maxDiff;
+          newMax  = yoffset + maxDiff;
+          pMin    = (newMin < yMin) ? yMin : newMin;
+          pMax    = (newMax > yMax) ? yMax : newMax;
+        }
+        break;
       }
       case kZAxis:
       {
-        pMin = zMin ;
-        pMax = zMax ;
-        break ;
+        pMin = zMin;
+        pMax = zMax;
+        break;
       }
       default:
         break;
     }
-    pMin -= kCarTolerance ;
-    pMax += kCarTolerance ;
-    return true;    
+    pMin -= kCarTolerance;
+    pMax += kCarTolerance;
+    return true;
   }
   else // Calculate rotated vertex coordinates
   {
-    G4int i, noEntries, noBetweenSections4 ;
-    G4bool existsAfterClip = false ;
-    G4ThreeVectorList* vertices = CreateRotatedVertices(pTransform) ;
+    G4int i, noEntries, noBetweenSections4;
+    G4bool existsAfterClip = false;
+    G4ThreeVectorList* vertices = CreateRotatedVertices(pTransform);
+
+    pMin =  kInfinity;
+    pMax = -kInfinity;
+
+    noEntries = vertices->size();
+    noBetweenSections4 = noEntries - 4;
     
-    pMin = +kInfinity ;
-    pMax = -kInfinity ;
-
-    noEntries = vertices->size() ;
-    noBetweenSections4 = noEntries - 4 ;
-    
-    for (i = 0 ; i < noEntries ; i += 4 )
-    {
-      ClipCrossSection(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
-    }
-    for (i = 0 ; i < noBetweenSections4 ; i += 4 )
-    {
-      ClipBetweenSections(vertices, i, pVoxelLimit, pAxis, pMin, pMax) ;
-    }
-    if ((pMin != kInfinity) || (pMax != -kInfinity) )
-    {
-      existsAfterClip = true ;
-      pMin -= kCarTolerance ; // Add 2*tolerance to avoid precision troubles
-      pMax += kCarTolerance ;
+    for ( i = 0 ; i < noEntries ; i += 4 )
+    {
+      ClipCrossSection(vertices, i, pVoxelLimit, pAxis, pMin, pMax);
+    }
+    for ( i = 0 ; i < noBetweenSections4 ; i += 4 )
+    {
+      ClipBetweenSections(vertices, i, pVoxelLimit, pAxis, pMin, pMax);
+    }
+    if ( (pMin != kInfinity) || (pMax != -kInfinity) )
+    {
+      existsAfterClip = true;
+      pMin -= kCarTolerance; // Add 2*tolerance to avoid precision troubles
+      pMax += kCarTolerance;
     }
     else
@@ -391,11 +357,11 @@
              (pVoxelLimit.GetMinXExtent()+pVoxelLimit.GetMaxXExtent())*0.5,
              (pVoxelLimit.GetMinYExtent()+pVoxelLimit.GetMaxYExtent())*0.5,
-             (pVoxelLimit.GetMinZExtent()+pVoxelLimit.GetMaxZExtent())*0.5 ) ;
+             (pVoxelLimit.GetMinZExtent()+pVoxelLimit.GetMaxZExtent())*0.5 );
         
       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);
       }
     }
@@ -808,4 +774,5 @@
   G4double tolORMin2, tolIRMax2 ;  // 'generous' radii squared
   G4double tolORMax2, tolIRMin2, tolODz, tolIDz ;
+  const G4double dRmax = 100.*fRMax;
 
   static const G4double halfCarTolerance = 0.5*kCarTolerance;
@@ -908,4 +875,9 @@
         if (s >= 0)  // If 'forwards'
         {
+          if ( s>dRmax ) // Avoid rounding errors due to precision issues on
+          {              // 64 bits systems. Split long distances and recompute
+            G4double fTerm = s-std::fmod(s,dRmax);
+            s = fTerm + DistanceToIn(p+fTerm*v,v);
+          } 
           // Check z intersection
           //
@@ -1022,4 +994,9 @@
           //
           if(s < 0.0)  { s = 0.0; }
+          if ( s>dRmax ) // Avoid rounding errors due to precision issues seen
+          {              // 64 bits systems. Split long distances and recompute
+            G4double fTerm = s-std::fmod(s,dRmax);
+            s = fTerm + DistanceToIn(p+fTerm*v,v);
+          } 
           zi = p.z() + s*v.z() ;
           if (std::fabs(zi) <= tolODz)
Index: trunk/source/geometry/solids/specific/History
===================================================================
--- trunk/source/geometry/solids/specific/History	(revision 1227)
+++ trunk/source/geometry/solids/specific/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.150 2008/11/21 09:26:53 gcosmo Exp $
+$Id: History,v 1.160 2009/11/11 12:25:46 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,54 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+11-Nov-2009  G.Cosmo (geom-specific-V09-02-08)
+- Avoid fake (and redundant) assignment of value to 3-vector in
+  G4PolyconeSide and G4TwistTubsSide.
+
+24-Sep-2009  T.Nikitina (geom-specific-V09-02-07)
+- G4Ellipsoid: refined fix in DistanceToIn(p,v) for points located on the
+  curved surface, and correct treatment of geometrical tolerance.
+
+09-Sep-2009  G.Cosmo (geom-specific-V09-02-06)
+- G4Ellipsoid: fixed usage of half-tolerances (radial and Cartesian) in
+  DistanceToIn(p,v), based on incorrect assumptions introduced in tag
+  "geom-specific-V09-02-04", responsible for zero steps on configurations
+  with cut in Z. Addresses problem report #1076.
+
+04-Aug-2009  T.Nikitina (geom-specific-V09-02-05)
+- G4Ellipsoid:
+  o Fixes in Inside(p) and in DistanceToIn(p,v) for points
+    located on the curved surface within tolerance. Final fix for issue
+    reported in problem report #1050 and concerning warnings reported by
+    grid_test.
+  o Adopt pre-computed half-tolerance values for optimisation.
+
+23-Jul-2009  T.Nikitina (geom-specific-V09-02-04)
+- G4Ellipsoid: fix to DistanceToIn(p,v) in the calculation of the roots of
+  the quadratic equation and in DistanceToOut(p,v) in the calculation of the
+  normal on cut surfaces. Final fix for problem report #1022 and #1050.
+- G4PolyconeSide: added protection in method Normal(), addressing problem
+  report #1073.
+
+30-Jun-2009  T.Nikitina (geom-specific-V09-02-03)
+- G4Ellipsoid: introduced to DistanceToIn(p,v) splitting of the distance for
+  point very far from intersection area and big difference between solid
+  dimensions and distance to it; resolves issue observed on 64 bits problem.
+  Also addressing problem report #1022.
+
+08-May-2009, G.Cosmo (geom-specific-V09-02-02)
+- Corrected typo in base implementation of G4VCSGfaceted::GetSurfaceArea(),
+  which was erroneously returning cubic volume estimation.
+  Addresses problem report #1062.
+
+27-Apr-2009, G.Cosmo (geom-specific-V09-02-01)
+- Relaxed error condition in G4TessellatedSolid::Inside(p) to warning, for
+  excess of max trials and anomalous conditions in distance calculation.
+  Added more printout information when error condition is detected.
+
+27-Feb-2009, T.Nikitina (geom-specific-V09-02-00)
+- Fix in G4Paraboloid::DistanceToOut(p,v,..) for the computation of normal
+  to surface; added missing normalisation to unit, following remark in the
+  Geometry Forum Hypernews posting #953.
 
 21-Nov-2008, G.Cosmo (geom-specific-V09-01-19)
Index: trunk/source/geometry/solids/specific/include/G4ClippablePolygon.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4ClippablePolygon.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4ClippablePolygon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ClippablePolygon.hh,v 1.11 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4ClippablePolygon.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4ClippablePolygon.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4ClippablePolygon.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ClippablePolygon.icc,v 1.4 2006/06/29 18:46:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4Ellipsoid.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Ellipsoid.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Ellipsoid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ellipsoid.hh,v 1.12 2007/05/18 07:39:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4Ellipsoid.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Ellipsoid.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Ellipsoid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ellipsoid.icc,v 1.7 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4EllipticalCone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EllipticalCone.hh,v 1.12 2008/11/21 09:26:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4EllipticalCone.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EllipticalCone.icc,v 1.7 2008/11/21 09:26:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4EllipticalTube.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4EllipticalTube.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4EllipticalTube.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EllipticalTube.hh,v 1.18 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4EllipticalTube.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4EllipticalTube.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4EllipticalTube.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EllipticalTube.icc,v 1.4 2006/06/29 18:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4EnclosingCylinder.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4EnclosingCylinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnclosingCylinder.hh,v 1.8 2006/06/29 18:46:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExtrudedSolid.hh,v 1.7 2008/02/27 12:32:48 ivana Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4ExtrudedSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExtrudedSolid.icc,v 1.2 2007/02/19 10:17:45 ivana Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4Hype.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Hype.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Hype.hh	(revision 1228)
@@ -27,5 +27,5 @@
 // $Id: G4Hype.hh,v 1.15 2006/10/20 13:45:20 gcosmo Exp $
 // $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Hype.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Hype.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Hype.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Hype.icc,v 1.7 2006/06/29 18:47:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4IntersectingCone.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4IntersectingCone.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4IntersectingCone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IntersectingCone.hh,v 1.11 2008/04/28 08:59:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Paraboloid.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Paraboloid.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Paraboloid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Paraboloid.hh,v 1.4 2008/01/22 17:42:09 tnikitin Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4Paraboloid.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Paraboloid.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Paraboloid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Paraboloid.icc,v 1.4 2007/08/21 12:58:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4PolyPhiFace.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4PolyPhiFace.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4PolyPhiFace.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyPhiFace.hh,v 1.12 2008/05/15 11:41:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4PolyPhiFace.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4PolyPhiFace.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4PolyPhiFace.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyPhiFace.icc,v 1.6 2006/06/29 18:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Polycone.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Polycone.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Polycone.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polycone.hh,v 1.22 2008/05/15 13:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Polycone.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Polycone.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Polycone.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polycone.icc,v 1.10 2006/06/29 18:47:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4PolyconeSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4PolyconeSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4PolyconeSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyconeSide.hh,v 1.12 2008/05/15 11:41:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Polyhedra.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Polyhedra.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Polyhedra.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyhedra.hh,v 1.20 2008/05/15 13:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4Polyhedra.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Polyhedra.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Polyhedra.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyhedra.icc,v 1.11 2007/01/22 12:58:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/include/G4PolyhedraSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4PolyhedraSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4PolyhedraSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyhedraSide.hh,v 1.11 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4QuadrangularFacet.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4QuadrangularFacet.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4QuadrangularFacet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuadrangularFacet.hh,v 1.6 2008/12/18 12:57:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4ReduciblePolygon.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4ReduciblePolygon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReduciblePolygon.hh,v 1.9 2006/06/29 18:47:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4SolidExtentList.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4SolidExtentList.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4SolidExtentList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SolidExtentList.hh,v 1.7 2006/06/29 18:47:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id:
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TessellatedGeometryAlgorithms.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id:
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4TessellatedSolid.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TessellatedSolid.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TessellatedSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TessellatedSolid.hh,v 1.10 2007/12/10 16:30:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4Tet.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4Tet.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4Tet.hh	(revision 1228)
@@ -30,5 +30,5 @@
 //
 // $Id: G4Tet.hh,v 1.9 2006/11/13 08:58:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/include/G4TriangularFacet.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TriangularFacet.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TriangularFacet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TriangularFacet.hh,v 1.8 2007/12/10 16:30:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistTrapFlatSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTrapFlatSide.hh,v 1.5 2006/06/29 18:47:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistTubsFlatSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTubsFlatSide.hh,v 1.5 2006/06/29 18:47:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistTubsHypeSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTubsHypeSide.hh,v 1.5 2006/06/29 18:47:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistTubsSide.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistTubsSide.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistTubsSide.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTubsSide.hh,v 1.5 2006/06/29 18:47:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistedBox.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistedBox.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistedBox.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedBox.hh,v 1.10 2006/06/29 18:48:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistedTrap.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistedTrap.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistedTrap.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTrap.hh,v 1.10 2006/06/29 18:48:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistedTrd.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistedTrd.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistedTrd.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTrd.hh,v 1.6 2006/06/29 18:48:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4TwistedTubs.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4TwistedTubs.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4TwistedTubs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTubs.hh,v 1.14 2007/05/23 09:32:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4VCSGface.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VCSGface.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VCSGface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCSGface.hh,v 1.9 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4VCSGfaceted.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VCSGfaceted.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VCSGfaceted.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCSGfaceted.hh,v 1.17 2008/05/15 13:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4VFacet.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VFacet.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VFacet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFacet.hh,v 1.7 2008/12/18 12:57:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4VFacet.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VFacet.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VFacet.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFacet.icc,v 1.6 2008/12/18 12:57:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/include/G4VTwistSurface.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VTwistSurface.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VTwistSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTwistSurface.hh,v 1.6 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4VTwistSurface.icc
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VTwistSurface.icc	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VTwistSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTwistSurface.icc,v 1.3 2006/06/29 18:48:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/include/G4VTwistedFaceted.hh
===================================================================
--- trunk/source/geometry/solids/specific/include/G4VTwistedFaceted.hh	(revision 1227)
+++ trunk/source/geometry/solids/specific/include/G4VTwistedFaceted.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTwistedFaceted.hh,v 1.10 2006/10/20 13:45:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------------
Index: trunk/source/geometry/solids/specific/src/G4ClippablePolygon.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4ClippablePolygon.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4ClippablePolygon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ClippablePolygon.cc,v 1.12 2007/05/11 13:54:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4Ellipsoid.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Ellipsoid.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Ellipsoid.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4Ellipsoid.cc,v 1.14 2007/05/18 07:39:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Ellipsoid.cc,v 1.24 2009/09/24 15:51:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Ellipsoid
@@ -385,21 +385,20 @@
   EInside in;
 
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
+
   // check this side of z cut first, because that's fast
   //
-  if (p.z() < zBottomCut-kRadTolerance/2.0)
-    { return in=kOutside; }
-  if (p.z() > zTopCut+kRadTolerance/2.0)
-    { return in=kOutside; }
-
-  rad2oo= sqr(p.x()/(xSemiAxis+kRadTolerance/2.))
-        + sqr(p.y()/(ySemiAxis+kRadTolerance/2.))
-        + sqr(p.z()/(zSemiAxis+kRadTolerance/2.));
-
-  if (rad2oo > 1.0)
-    { return in=kOutside; }
+  if (p.z() < zBottomCut-halfRadTolerance) { return in=kOutside; }
+  if (p.z() > zTopCut+halfRadTolerance)    { return in=kOutside; }
+
+  rad2oo= sqr(p.x()/(xSemiAxis+halfRadTolerance))
+        + sqr(p.y()/(ySemiAxis+halfRadTolerance))
+        + sqr(p.z()/(zSemiAxis+halfRadTolerance));
+
+  if (rad2oo > 1.0)  { return in=kOutside; }
     
-  rad2oi= sqr(p.x()*(1.0+kRadTolerance/2./xSemiAxis)/xSemiAxis)
-      + sqr(p.y()*(1.0+kRadTolerance/2./ySemiAxis)/ySemiAxis)
-      + sqr(p.z()*(1.0+kRadTolerance/2./zSemiAxis)/zSemiAxis);
+  rad2oi= sqr(p.x()*(1.0+halfRadTolerance/xSemiAxis)/xSemiAxis)
+      + sqr(p.y()*(1.0+halfRadTolerance/ySemiAxis)/ySemiAxis)
+      + sqr(p.z()*(1.0+halfRadTolerance/zSemiAxis)/zSemiAxis);
 
   // Check radial surfaces
@@ -408,6 +407,7 @@
   if (rad2oi < 1.0)
   {
-    in = ( (p.z() < zBottomCut+kRadTolerance/2.0)
-        || (p.z() > zTopCut-kRadTolerance/2.0) ) ? kSurface : kInside;
+    in = ( (p.z() < zBottomCut+halfRadTolerance)
+        || (p.z() > zTopCut-halfRadTolerance) ) ? kSurface : kInside;
+    if ( rad2oi > 1.0-halfRadTolerance )  { in=kSurface; }
   }
   else 
@@ -415,6 +415,6 @@
     in = kSurface;
   }
-
   return in;
+
 }
 
@@ -460,28 +460,34 @@
                                     const G4ThreeVector& v  ) const
 {
-  G4double distMin;
-  
+  static const G4double halfCarTolerance=kCarTolerance*0.5;
+  static const G4double halfRadTolerance=kRadTolerance*0.5;
+
+  G4double distMin = std::min(xSemiAxis,ySemiAxis);
+  const G4double dRmax = 100.*std::min(distMin,zSemiAxis);
   distMin= kInfinity;
 
   // check to see if Z plane is relevant
-  if (p.z() < zBottomCut) {
-    if (v.z() <= 0.0)
-      return distMin;
+  if (p.z() <= zBottomCut+halfCarTolerance)
+  {
+    if (v.z() <= 0.0) { return distMin; }
     G4double distZ = (zBottomCut - p.z()) / v.z();
-    if (distZ > kRadTolerance/2.0 && Inside(p+distZ*v) != kOutside )
-      {
-        // early exit since can't intercept curved surface if we reach here
-        return distMin= distZ;
-      }
-  }
-  if (p.z() > zTopCut) {
-    if (v.z() >= 0.0)
-      return distMin;
+
+    if ( (distZ > -halfRadTolerance) && (Inside(p+distZ*v) != kOutside) )
+    {
+      // early exit since can't intercept curved surface if we reach here
+      if ( std::abs(distZ) < halfRadTolerance ) { distZ=0.; }
+      return distMin= distZ;
+    }
+  }
+  if (p.z() >= zTopCut-halfCarTolerance)
+  {
+    if (v.z() >= 0.0) { return distMin;}
     G4double distZ = (zTopCut - p.z()) / v.z();
-    if (distZ > kRadTolerance/2.0 && Inside(p+distZ*v) != kOutside )
-      {
-        // early exit since can't intercept curved surface if we reach here
-        return distMin= distZ;
-      }
+    if ( (distZ > -halfRadTolerance) && (Inside(p+distZ*v) != kOutside) )
+    {
+      // early exit since can't intercept curved surface if we reach here
+      if ( std::abs(distZ) < halfRadTolerance ) { distZ=0.; }
+      return distMin= distZ;
+    }
   }
   // if fZCut1 <= p.z() <= fZCut2, then must hit curved surface
@@ -492,31 +498,51 @@
   A= sqr(v.x()/xSemiAxis) + sqr(v.y()/ySemiAxis) + sqr(v.z()/zSemiAxis);
   C= sqr(p.x()/xSemiAxis) + sqr(p.y()/ySemiAxis) + sqr(p.z()/zSemiAxis) - 1.0;
-  B= 2.0 * ( p.x()*v.x()/(xSemiAxis*xSemiAxis) + p.y()*v.y()/(ySemiAxis*ySemiAxis)
-             + p.z()*v.z()/(zSemiAxis*zSemiAxis) );
+  B= 2.0 * ( p.x()*v.x()/(xSemiAxis*xSemiAxis)
+           + p.y()*v.y()/(ySemiAxis*ySemiAxis)
+           + p.z()*v.z()/(zSemiAxis*zSemiAxis) );
 
   C= B*B - 4.0*A*C;
   if (C > 0.0)
-    {
-      G4double distR= (-B - std::sqrt(C) ) / (2.0*A);
-      G4double intZ= p.z()+distR*v.z();
-      if (distR > kRadTolerance/2.0
-          && intZ >= zBottomCut-kRadTolerance/2.0
-          && intZ <= zTopCut+kRadTolerance/2.0)
-        {
-          distMin = distR;
-        }
-      else
-        {
-          distR= (-B + std::sqrt(C) ) / (2.0*A);
-          intZ= p.z()+distR*v.z();
-          if (distR > kRadTolerance/2.0
-              && intZ >= zBottomCut-kRadTolerance/2.0
-              && intZ <= zTopCut+kRadTolerance/2.0)
-            {
-              distMin = distR;
-            }
-        }
-    }
-
+  {    
+    G4double distR= (-B - std::sqrt(C)) / (2.0*A);
+    G4double intZ = p.z()+distR*v.z();
+    if ( (distR > halfRadTolerance)
+      && (intZ >= zBottomCut-halfRadTolerance)
+      && (intZ <= zTopCut+halfRadTolerance) )
+    { 
+      distMin = distR;
+    }
+    else if( (distR >- halfRadTolerance)
+	    && (intZ >= zBottomCut-halfRadTolerance)
+	    && (intZ <= zTopCut+halfRadTolerance) )
+    {
+      // p is on the curved surface, DistanceToIn returns 0 or kInfinity:
+      // DistanceToIn returns 0, if second root is positive (means going inside)
+      // If second root is negative, DistanceToIn returns kInfinity (outside)
+      //
+      distR = (-B + std::sqrt(C) ) / (2.0*A);
+      if(distR>0.) { distMin=0.; }
+    }
+    else
+    {
+      distR= (-B + std::sqrt(C)) / (2.0*A);
+      intZ = p.z()+distR*v.z();
+      if ( (distR > halfRadTolerance)
+        && (intZ >= zBottomCut-halfRadTolerance)
+        && (intZ <= zTopCut+halfRadTolerance) )
+      {
+        G4ThreeVector norm=SurfaceNormal(p);
+        if (norm.dot(v)<0.) { distMin = distR; }
+      }
+    }
+    if ( (distMin!=kInfinity) && (distMin>dRmax) ) 
+    {                    // Avoid rounding errors due to precision issues on
+                         // 64 bits systems. Split long distances and recompute
+      G4double fTerm = distMin-std::fmod(distMin,dRmax);
+      distMin = fTerm + DistanceToIn(p+fTerm*v,v);
+    }
+  }
+  
+  if (std::abs(distMin)<halfRadTolerance) { distMin=0.; }
   return distMin;
 } 
@@ -651,5 +677,5 @@
       {
         case kPlaneSurf:
-          *n= G4ThreeVector(0.,0.,(v.z() > 1.0 ? 1. : -1.));
+          *n= G4ThreeVector(0.,0.,(v.z() > 0.0 ? 1. : -1.));
           break;
         case kCurvedSurf:
@@ -683,4 +709,5 @@
     }
   }
+   
   return distMin;
 }
@@ -905,9 +932,9 @@
   max1  = xSemiAxis > ySemiAxis ? xSemiAxis : ySemiAxis;
   max1  = max1 > zSemiAxis ? max1 : zSemiAxis;
-  if(max1 == xSemiAxis){max2 = ySemiAxis; max3 = zSemiAxis;}
-  else if(max1 == ySemiAxis){max2 = xSemiAxis; max3 = zSemiAxis;}
-  else {max2 = xSemiAxis; max3 = ySemiAxis; }
-
-  phi   = RandFlat::shoot(0.,2.*pi);
+  if (max1 == xSemiAxis)      { max2 = ySemiAxis; max3 = zSemiAxis; }
+  else if (max1 == ySemiAxis) { max2 = xSemiAxis; max3 = zSemiAxis; }
+  else                        { max2 = xSemiAxis; max3 = ySemiAxis; }
+
+  phi   = RandFlat::shoot(0.,twopi);
   theta = RandFlat::shoot(0.,pi);
   
Index: trunk/source/geometry/solids/specific/src/G4EllipticalCone.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4EllipticalCone.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4EllipticalCone.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EllipticalCone.cc,v 1.16 2008/04/25 08:45:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation of G4EllipticalCone class
Index: trunk/source/geometry/solids/specific/src/G4EllipticalTube.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4EllipticalTube.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4EllipticalTube.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EllipticalTube.cc,v 1.27 2006/10/20 13:45:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4EnclosingCylinder.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4EnclosingCylinder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnclosingCylinder.cc,v 1.10 2007/05/11 13:54:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4ExtrudedSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExtrudedSolid.cc,v 1.18 2008/10/30 11:47:45 ivana Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/geometry/solids/specific/src/G4Hype.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Hype.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Hype.cc	(revision 1228)
@@ -27,5 +27,5 @@
 // $Id: G4Hype.cc,v 1.27 2008/04/14 08:49:28 gcosmo Exp $
 // $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4IntersectingCone.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4IntersectingCone.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4IntersectingCone.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IntersectingCone.cc,v 1.12 2008/04/28 08:59:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4Paraboloid.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Paraboloid.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Paraboloid.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4Paraboloid.cc,v 1.8 2008/07/17 07:33:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4Paraboloid.cc,v 1.9 2009/02/27 15:10:46 tnikitin Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Paraboloid
@@ -866,4 +866,5 @@
       *n = G4ThreeVector(p.x() + intersection * v.x(), p.y()
          + intersection * v.y(), - k1 / 2);
+      *n = n->unit();
     }
     return intersection;
Index: trunk/source/geometry/solids/specific/src/G4PolyPhiFace.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4PolyPhiFace.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4PolyPhiFace.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyPhiFace.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4Polycone.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Polycone.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Polycone.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polycone.cc,v 1.43 2008/05/15 13:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4PolyconeSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4PolyconeSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4PolyconeSide.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PolyconeSide.cc,v 1.19 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PolyconeSide.cc,v 1.22 2009/11/11 12:23:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -462,6 +462,5 @@
   if (p == G4ThreeVector(0.,0.,0.))  { return p; }
 
-  G4ThreeVector dFrom;
-  G4double dOut2;
+  G4double dFrom, dOut2;
   
   dFrom = DistanceAway( p, false, dOut2 );
@@ -470,5 +469,6 @@
   
   G4double rad = p.perp();
-  return G4ThreeVector( rNorm*p.x()/rad, rNorm*p.y()/rad, zNorm );
+  if (rad!=0.) { return G4ThreeVector(rNorm*p.x()/rad,rNorm*p.y()/rad,zNorm); }
+  return G4ThreeVector( 0.,0., zNorm ).unit();
 }
 
Index: trunk/source/geometry/solids/specific/src/G4Polyhedra.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Polyhedra.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Polyhedra.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyhedra.cc,v 1.42 2008/05/15 13:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4PolyhedraSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolyhedraSide.cc,v 1.15 2008/05/15 11:41:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4QuadrangularFacet.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4QuadrangularFacet.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4QuadrangularFacet.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4QuadrangularFacet.cc,v 1.7 2008/12/18 12:57:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4ReduciblePolygon.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4ReduciblePolygon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReduciblePolygon.cc,v 1.11 2006/06/29 18:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4SolidExtentList.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4SolidExtentList.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4SolidExtentList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SolidExtentList.cc,v 1.5 2007/05/11 13:54:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TessellatedGeometryAlgorithms.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TessellatedGeometryAlgorithms.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TessellatedGeometryAlgorithms.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4TessellatedGeometryAlgorithms.cc,v 1.6 2008/12/18 12:57:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TessellatedSolid.cc	(revision 1228)
@@ -25,6 +25,6 @@
 // ********************************************************************
 //
-// $Id: G4TessellatedSolid.cc,v 1.18 2008/03/13 11:58:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TessellatedSolid.cc,v 1.19 2009/04/27 08:06:27 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -520,4 +520,5 @@
     } while (nearParallel && m!=maxTries);
 
+#ifdef G4VERBOSE
     if (m == maxTries)
     {
@@ -528,8 +529,18 @@
 // something wrong with geometry.
 //
+      G4cout.precision(16) ;
+      G4cout << G4endl ;
+      G4cout << "Solid name       = " << GetName()  << G4endl;
+      G4cout << "Geometry Type    = " << geometryType  << G4endl;
+      G4cout << "Number of facets = " << facets.size() << G4endl;
+      G4cout << "Position:"  << G4endl << G4endl ;
+      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("G4TessellatedSolid::Inside()",
-                "UnknownInsideOutside", FatalException,
+                "UnknownInsideOutside-MaxTries", JustWarning,
                 "Cannot determine whether point is inside or outside volume!");
     }
+#endif
 //
 //
@@ -550,5 +561,6 @@
       locationprime = kInside;
 
-    if (i == 0) location = locationprime;
+    if (i == 0)  { location = locationprime; }
+#ifdef G4VERBOSE
     else if (locationprime != location)
     {
@@ -558,8 +570,18 @@
 // geometry is not constructed correctly.
 //
+      G4cout.precision(16) ;
+      G4cout << G4endl ;
+      G4cout << "Solid name       = " << GetName()  << G4endl;
+      G4cout << "Geometry Type    = " << geometryType  << G4endl;
+      G4cout << "Number of facets = " << facets.size() << G4endl;
+      G4cout << "Position:"  << G4endl << G4endl ;
+      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("G4TessellatedSolid::Inside()",
-                "UnknownInsideOutside", FatalException,
+                "UnknownInsideOutside", JustWarning,
                 "Cannot determine whether point is inside or outside volume!");
     }
+#endif
   }
 
Index: trunk/source/geometry/solids/specific/src/G4Tet.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4Tet.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4Tet.cc	(revision 1228)
@@ -29,5 +29,5 @@
 //
 // $Id: G4Tet.cc,v 1.11 2006/11/13 08:58:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4Tet
Index: trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TriangularFacet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TriangularFacet.cc,v 1.12 2008/11/13 08:25:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/src/G4TwistBoxSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistBoxSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistBoxSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistBoxSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTrapAlphaSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTrapAlphaSide.cc,v 1.8 2007/05/23 13:26:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTrapFlatSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTrapFlatSide.cc,v 1.6 2007/05/23 09:31:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTrapParallelSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTrapParallelSide.cc,v 
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTubsFlatSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTubsFlatSide.cc,v 1.7 2007/05/23 09:31:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTubsHypeSide.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistTubsHypeSide.cc,v 1.6 2007/05/18 07:39:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistTubsSide.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistTubsSide.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistTubsSide.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4TwistTubsSide.cc,v 1.5 2006/06/29 18:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TwistTubsSide.cc,v 1.6 2009/11/11 12:23:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -411,5 +411,4 @@
            G4int l;
            G4double      lastdeltaY = deltaY; 
-           G4ThreeVector last = deltaY; 
            for (l=0; l<maxcount; l++) {
              G4ThreeVector surfacenormal = GetNormal(xxonsurface); 
Index: trunk/source/geometry/solids/specific/src/G4TwistedBox.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistedBox.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistedBox.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedBox.cc,v 1.12 2006/06/29 18:49:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistedTrap.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistedTrap.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistedTrap.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTrap.cc,v 1.14 2006/06/29 18:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistedTrd.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistedTrd.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistedTrd.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTrd.cc,v 1.7 2006/06/29 18:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4TwistedTubs.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4TwistedTubs.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4TwistedTubs.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwistedTubs.cc,v 1.24 2007/05/18 07:39:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4VCSGfaceted.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4VCSGfaceted.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4VCSGfaceted.cc	(revision 1228)
@@ -30,6 +30,6 @@
 // and all its terms.
 //
-// $Id: G4VCSGfaceted.cc,v 1.25 2008/05/22 10:22:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VCSGfaceted.cc,v 1.26 2009/05/08 14:29:56 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -550,5 +550,5 @@
 {
   if(fSurfaceArea != 0.) {;}
-  else   { fSurfaceArea = EstimateCubicVolume(fStatistics,fAreaAccuracy); }
+  else   { fSurfaceArea = EstimateSurfaceArea(fStatistics,fAreaAccuracy); }
   return fSurfaceArea;
 }
Index: trunk/source/geometry/solids/specific/src/G4VFacet.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4VFacet.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4VFacet.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4VFacet.cc,v 1.8 2008/12/18 12:57:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: trunk/source/geometry/solids/specific/src/G4VTwistSurface.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4VTwistSurface.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4VTwistSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTwistSurface.cc,v 1.9 2007/05/31 13:52:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/solids/specific/src/G4VTwistedFaceted.cc
===================================================================
--- trunk/source/geometry/solids/specific/src/G4VTwistedFaceted.cc	(revision 1227)
+++ trunk/source/geometry/solids/specific/src/G4VTwistedFaceted.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VTwistedFaceted.cc,v 1.18 2007/05/25 09:42:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/History
===================================================================
--- trunk/source/geometry/volumes/History	(revision 1227)
+++ trunk/source/geometry/volumes/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.155 2008/11/13 09:35:03 gcosmo Exp $
+$Id: History,v 1.163 2009/11/06 11:35:03 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,27 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Nov 6th, 2009       G.Cosmo - geomvol-V09-02-04
+- Moved inline constructors to source for G4TouchableHistory, to avoid problems
+  of memory alignment in allocation.
+
+Nov 3rd, 2009       G.Cosmo - geomvol-V09-02-03
+- Use G4Allocator for dynamic allocation of G4TouchableHistory objects.
+  Should reduce the number of direct calls to malloc and memory fragmentation.
+  Measured an average improvement of 3-5% in CPU speed, and same memory
+  footprint.
+
+Sep 22nd, 2009      G.Cosmo - geomvol-V09-02-02
+- Added missing implementation for composing G4AssemblyVolume constructor.
+
+Sep 21st, 2009      G.Cosmo - geomvol-V09-02-01
+- Fix in G4PVParameterised::CheckOverlaps() to not modify daughter volume
+  transformation matrix for application to points in the daughter's frame.
+  Adopt Inverse() instead of Invert() in call to G4AffineTransform.
+  Addresses problem report #1078.
+
+Aug 3rd, 2009       G.Cosmo - geomvol-V09-02-00
+- Get rid of unnecessary call to Reset() in G4NavigationHistory destructor.
+- Some code formatting...
 
 Nov 13th, 2008      G.Cosmo - geomvol-V09-01-03
Index: trunk/source/geometry/volumes/include/G4AssemblyTriplet.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4AssemblyTriplet.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4AssemblyTriplet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AssemblyTriplet.hh,v 1.3 2007/11/16 16:20:25 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4AssemblyTriplet.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4AssemblyTriplet.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4AssemblyTriplet.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AssemblyTriplet.icc,v 1.2 2006/06/29 18:56:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4AssemblyVolume.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4AssemblyVolume.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4AssemblyVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AssemblyVolume.hh,v 1.7 2006/06/29 18:56:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4AssemblyVolume.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4AssemblyVolume.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4AssemblyVolume.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AssemblyVolume.icc,v 1.3 2006/06/29 18:56:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4GRSSolid.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSSolid.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSSolid.hh,v 1.8 2006/06/29 18:56:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4GRSSolid.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSSolid.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSSolid.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSSolid.icc,v 1.9 2006/06/29 18:56:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4GRSSolidHandle.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSSolidHandle.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSSolidHandle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSSolidHandle.hh,v 1.6 2006/06/29 18:56:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Class G4GRSSolidHandle
Index: trunk/source/geometry/volumes/include/G4GRSVolume.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSVolume.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSVolume.hh,v 1.8 2006/06/29 18:57:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4GRSVolume.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSVolume.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSVolume.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSVolume.icc,v 1.10 2006/06/29 18:57:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4GRSVolumeHandle.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4GRSVolumeHandle.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4GRSVolumeHandle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSVolumeHandle.hh,v 1.6 2006/06/29 18:57:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Class G4GRSVolumeHandle
Index: trunk/source/geometry/volumes/include/G4LogicalBorderSurface.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4LogicalBorderSurface.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4LogicalBorderSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalBorderSurface.hh,v 1.17 2008/08/19 15:31:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4LogicalBorderSurface
Index: trunk/source/geometry/volumes/include/G4LogicalBorderSurface.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4LogicalBorderSurface.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4LogicalBorderSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalBorderSurface.icc,v 1.9 2006/06/29 18:57:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4LogicalSkinSurface.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4LogicalSkinSurface.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4LogicalSkinSurface.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalSkinSurface.hh,v 1.17 2008/08/19 15:31:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4LogicalSkinSurface
Index: trunk/source/geometry/volumes/include/G4LogicalSkinSurface.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4LogicalSkinSurface.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4LogicalSkinSurface.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalSkinSurface.icc,v 1.9 2006/06/29 18:57:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4NavigationHistory.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationHistory.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationHistory.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationHistory.hh,v 1.13 2006/06/29 18:57:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationHistory.hh,v 1.14 2009/11/03 09:15:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4NavigationHistory
@@ -47,4 +47,5 @@
 #include "geomdefs.hh"
 
+//#include "G4Allocator.hh"
 #include "G4AffineTransform.hh"
 #include "G4VPhysicalVolume.hh"
@@ -141,5 +142,6 @@
  private:
 
-  std::vector<G4NavigationLevel>  fNavHistory;
+  std::vector<G4NavigationLevel> fNavHistory;
+  //std::vector<G4NavigationLevel, G4Allocator<G4NavigationLevel> > fNavHistory;
 
   G4int fStackDepth;
Index: trunk/source/geometry/volumes/include/G4NavigationHistory.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationHistory.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationHistory.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationHistory.icc,v 1.12 2006/06/29 18:57:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationHistory.icc,v 1.14 2009/08/04 08:27:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -37,5 +37,5 @@
 G4NavigationHistory::operator=(const G4NavigationHistory &h)
 {
-  if (&h == this) return *this;
+  if (&h == this)  { return *this; }
 
   // fNavHistory=h.fNavHistory;   // This works, but is very slow.
Index: trunk/source/geometry/volumes/include/G4NavigationLevel.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationLevel.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationLevel.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationLevel.hh,v 1.16 2006/06/29 18:57:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationLevel.hh,v 1.18 2009/08/04 08:27:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4NavigationLevel
Index: trunk/source/geometry/volumes/include/G4NavigationLevel.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationLevel.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationLevel.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationLevel.icc,v 1.20 2006/06/29 18:57:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationLevel.icc,v 1.22 2009/08/04 08:27:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 30.09.97 J.Apostolakis Initial version. 
Index: trunk/source/geometry/volumes/include/G4NavigationLevelRep.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationLevelRep.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationLevelRep.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NavigationLevelRep.hh,v 1.9 2006/06/29 18:57:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4NavigationLevelRep
Index: trunk/source/geometry/volumes/include/G4NavigationLevelRep.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4NavigationLevelRep.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4NavigationLevelRep.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NavigationLevelRep.icc,v 1.14 2006/06/29 18:57:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  1 October 1997 J.Apostolakis Initial version. 
Index: trunk/source/geometry/volumes/include/G4PVParameterised.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4PVParameterised.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4PVParameterised.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVParameterised.hh,v 1.8 2007/04/11 07:56:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4PVPlacement.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4PVPlacement.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4PVPlacement.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVPlacement.hh,v 1.8 2007/04/11 07:56:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4PVReplica.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4PVReplica.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4PVReplica.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVReplica.hh,v 1.5 2006/06/29 18:57:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4ReflectionFactory.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4ReflectionFactory.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4ReflectionFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReflectionFactory.hh,v 1.4 2008/11/13 09:33:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/include/G4TouchableHistory.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4TouchableHistory.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4TouchableHistory.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4TouchableHistory.hh,v 1.8 2006/06/29 18:57:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TouchableHistory.hh,v 1.11 2009/11/06 11:10:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -34,5 +34,5 @@
 //
 // Object representing a touchable detector element, and its history in the
-// geomtrical hierarchy, including its net resultant local->global transform.
+// geometrical hierarchy, including its net resultant local->global transform.
 
 // History:
@@ -45,4 +45,5 @@
 
 #include "G4NavigationHistory.hh"
+#include "G4Allocator.hh"
 #include "G4LogicalVolume.hh"
 #include "G4ThreeVector.hh"
@@ -60,5 +61,5 @@
     // It is for initialisation only.  
 
-  virtual ~G4TouchableHistory();
+ ~G4TouchableHistory();
 
   inline G4VPhysicalVolume* GetVolume( G4int depth=0 ) const;
@@ -72,6 +73,6 @@
     // Access methods for touchables with history
 
-  virtual void  UpdateYourself( G4VPhysicalVolume*   pPhysVol,
-                          const G4NavigationHistory* history=0 ); 
+  void  UpdateYourself( G4VPhysicalVolume*   pPhysVol,
+                        const G4NavigationHistory* history=0 ); 
     // Update methods for touchables with history
 
@@ -81,4 +82,8 @@
     // Should this method be "deprecated" ?
     // it is used now in G4Navigator::LocateGlobalPointAndSetup
+
+  inline void *operator new(size_t);
+  inline void operator delete(void *aTH);
+    // Override "new" and "delete" to use "G4Allocator".
 
  private:
Index: trunk/source/geometry/volumes/include/G4TouchableHistory.icc
===================================================================
--- trunk/source/geometry/volumes/include/G4TouchableHistory.icc	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4TouchableHistory.icc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4TouchableHistory.icc,v 1.10 2006/12/07 14:26:28 japost Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TouchableHistory.icc,v 1.13 2009/11/06 11:10:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -32,22 +32,9 @@
 // ----------------------------------------------------------------------
 
-inline
-G4TouchableHistory::G4TouchableHistory()
-  : frot(G4RotationMatrix()),
-    ftlate(G4ThreeVector(0.,0.,0.)),
-    fhistory()
-{
-   G4VPhysicalVolume* pPhysVol=0;
-   fhistory.SetFirstEntry(pPhysVol);
-}
-
-inline
-G4TouchableHistory::G4TouchableHistory( const G4NavigationHistory &history )
-  : fhistory(history)
-{
-  G4AffineTransform tf(fhistory.GetTopTransform().Inverse());
-  ftlate = tf.NetTranslation();
-  frot = tf.NetRotation();
-}
+#if defined G4GEOM_ALLOC_EXPORT
+  extern G4DLLEXPORT G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
+#else
+  extern G4DLLIMPORT G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
+#endif
 
 inline
@@ -103,6 +90,5 @@
 G4int G4TouchableHistory::MoveUpHistory( G4int num_levels )
 {
-  G4NavigationHistory* nHistory= &fhistory;
-  G4int maxLevelsMove = nHistory->GetDepth();
+  G4int maxLevelsMove = fhistory.GetDepth();
   G4int minLevelsMove = 0;              // Cannot redescend today!
                                         // Soon it will be possible
@@ -117,5 +103,5 @@
     num_levels = minLevelsMove;
   }
-  nHistory->BackLevel( num_levels ); 
+  fhistory.BackLevel( num_levels ); 
 
   return num_levels;
@@ -127,2 +113,18 @@
   return &fhistory;
 }
+
+// There is no provision in case this class is subclassed.
+// If it is subclassed, this will fail and may not give errors!
+//
+inline
+void* G4TouchableHistory::operator new(size_t)
+{
+  return (void *) aTouchableHistoryAllocator.MallocSingle();
+}
+
+inline
+void G4TouchableHistory::operator delete(void *aTH)
+{
+  aTouchableHistoryAllocator.FreeSingle((G4TouchableHistory *) aTH);
+}
+
Index: trunk/source/geometry/volumes/include/G4TouchableHistoryHandle.hh
===================================================================
--- trunk/source/geometry/volumes/include/G4TouchableHistoryHandle.hh	(revision 1227)
+++ trunk/source/geometry/volumes/include/G4TouchableHistoryHandle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TouchableHistoryHandle.hh,v 1.6 2006/06/29 18:57:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Class G4TouchableHistoryHandle
Index: trunk/source/geometry/volumes/src/G4AssemblyVolume.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4AssemblyVolume.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4AssemblyVolume.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4AssemblyVolume.cc,v 1.11 2008/02/03 09:12:50 ivana Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4AssemblyVolume.cc,v 1.12 2009/09/22 13:58:48 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -48,9 +48,22 @@
 //
 G4AssemblyVolume::G4AssemblyVolume()
-: fAssemblyID( 0 )
+  : fAssemblyID( 0 )
 {
   InstanceCountPlus();
   SetAssemblyID( GetInstanceCount() );
   SetImprintsCount( 0 );
+}
+
+// Composing constructor
+//
+G4AssemblyVolume::G4AssemblyVolume( G4LogicalVolume* volume,
+                                    G4ThreeVector& translation,
+                                    G4RotationMatrix* rotation )
+  : fAssemblyID( 0 )
+{
+  InstanceCountPlus();
+  SetAssemblyID( GetInstanceCount() );
+  SetImprintsCount( 0 );
+  AddPlacedVolume(volume, translation, rotation);
 }
 
Index: trunk/source/geometry/volumes/src/G4GRSSolid.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4GRSSolid.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4GRSSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSSolid.cc,v 1.8 2006/06/29 18:57:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/src/G4GRSVolume.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4GRSVolume.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4GRSVolume.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GRSVolume.cc,v 1.8 2006/06/29 18:57:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/src/G4LogicalBorderSurface.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4LogicalBorderSurface.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4LogicalBorderSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalBorderSurface.cc,v 1.17 2008/08/19 15:31:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/volumes/src/G4LogicalSkinSurface.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4LogicalSkinSurface.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4LogicalSkinSurface.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogicalSkinSurface.cc,v 1.16 2008/08/19 15:31:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/geometry/volumes/src/G4NavigationHistory.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4NavigationHistory.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4NavigationHistory.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationHistory.cc,v 1.10 2006/06/29 18:58:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationHistory.cc,v 1.11 2009/08/03 16:27:37 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -51,5 +51,4 @@
 G4NavigationHistory::~G4NavigationHistory()
 {
-  Reset();  // To delete all but one current entries!
 }
 
Index: trunk/source/geometry/volumes/src/G4NavigationLevel.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4NavigationLevel.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4NavigationLevel.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NavigationLevel.cc,v 1.4 2006/06/29 18:58:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NavigationLevel.cc,v 1.5 2009/08/03 16:13:19 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 30.09.97 J.Apostolakis Initial version. 
@@ -70,6 +70,5 @@
 G4NavigationLevel::~G4NavigationLevel()
 {
-  if( fLevelRep->RemoveAReference() )
-    delete fLevelRep; 
+  if( fLevelRep->RemoveAReference() )  { delete fLevelRep; }
 }
 
@@ -79,6 +78,5 @@
   {
     right.fLevelRep->AddAReference(); 
-    if( fLevelRep->RemoveAReference() )
-      delete fLevelRep; 
+    if( fLevelRep->RemoveAReference() )  { delete fLevelRep; }
     fLevelRep = right.fLevelRep;
   }
Index: trunk/source/geometry/volumes/src/G4NavigationLevelRep.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4NavigationLevelRep.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4NavigationLevelRep.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NavigationLevelRep.cc,v 1.2 2006/06/29 18:58:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  1 October 1997 J.Apostolakis Initial version. 
Index: trunk/source/geometry/volumes/src/G4PVParameterised.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4PVParameterised.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4PVParameterised.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PVParameterised.cc,v 1.10 2007/04/11 07:56:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4PVParameterised.cc,v 1.11 2009/09/21 10:27:05 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -226,5 +226,5 @@
         // Transform each point according to daughter's frame
         //
-        G4ThreeVector md = Td.Invert().TransformPoint(*pos);
+        G4ThreeVector md = Td.Inverse().TransformPoint(*pos);
 
         if (solidB->Inside(md)==kInside)
Index: trunk/source/geometry/volumes/src/G4PVPlacement.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4PVPlacement.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4PVPlacement.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVPlacement.cc,v 1.16 2007/04/11 07:56:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/src/G4PVReplica.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4PVReplica.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4PVReplica.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PVReplica.cc,v 1.7 2006/06/29 18:58:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/src/G4ReflectionFactory.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4ReflectionFactory.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4ReflectionFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReflectionFactory.cc,v 1.9 2008/11/13 09:33:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/geometry/volumes/src/G4TouchableHistory.cc
===================================================================
--- trunk/source/geometry/volumes/src/G4TouchableHistory.cc	(revision 1227)
+++ trunk/source/geometry/volumes/src/G4TouchableHistory.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4TouchableHistory.cc,v 1.12 2006/06/29 18:58:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4TouchableHistory.cc,v 1.15 2009/11/06 11:10:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -34,4 +34,23 @@
 
 #include "G4TouchableHistory.hh"
+
+G4Allocator<G4TouchableHistory> aTouchableHistoryAllocator;
+
+G4TouchableHistory::G4TouchableHistory()
+  : frot(G4RotationMatrix()),
+    ftlate(G4ThreeVector(0.,0.,0.)),
+    fhistory()
+{
+   G4VPhysicalVolume* pPhysVol=0;
+   fhistory.SetFirstEntry(pPhysVol);
+}
+
+G4TouchableHistory::G4TouchableHistory( const G4NavigationHistory &history )
+  : fhistory(history)
+{
+  G4AffineTransform tf(fhistory.GetTopTransform().Inverse());
+  ftlate = tf.NetTranslation();
+  frot = tf.NetRotation();
+}
 
 G4TouchableHistory::~G4TouchableHistory()
Index: trunk/source/global/HEPGeometry/include/G4LorentzRotation.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4LorentzRotation.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4LorentzRotation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LorentzRotation.hh,v 1.5 2006/06/29 18:59:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4LorentzRotation_hh
Index: trunk/source/global/HEPGeometry/include/G4LorentzVector.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4LorentzVector.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4LorentzVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LorentzVector.hh,v 1.5 2006/06/29 18:59:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4LorentzVector_hh
Index: trunk/source/global/HEPGeometry/include/G4Normal3D.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4Normal3D.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4Normal3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Normal3D.hh,v 1.5 2006/06/29 18:59:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NORMAL3D_HH
Index: trunk/source/global/HEPGeometry/include/G4Plane3D.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4Plane3D.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4Plane3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Plane3D.hh,v 1.5 2006/06/29 18:59:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4PLANE3D_HH
Index: trunk/source/global/HEPGeometry/include/G4Point3D.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4Point3D.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4Point3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Point3D.hh,v 1.5 2006/06/29 18:59:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4POINT3D_HH
Index: trunk/source/global/HEPGeometry/include/G4Transform3D.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4Transform3D.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4Transform3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Transform3D.hh,v 1.5 2006/06/29 18:59:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4TRANSFORM3D_HH
Index: trunk/source/global/HEPGeometry/include/G4Vector3D.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/G4Vector3D.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/G4Vector3D.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Vector3D.hh,v 1.5 2006/06/29 18:59:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VECTOR3D_HH
Index: trunk/source/global/HEPGeometry/include/geomdefs.hh
===================================================================
--- trunk/source/global/HEPGeometry/include/geomdefs.hh	(revision 1227)
+++ trunk/source/global/HEPGeometry/include/geomdefs.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: geomdefs.hh,v 1.8 2007/05/18 07:21:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AnalyticalPolSolver.hh,v 1.5 2006/06/29 18:59:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChebyshevApproximation.hh,v 1.6 2006/06/29 18:59:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4DataInterpolation.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4DataInterpolation.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4DataInterpolation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DataInterpolation.hh,v 1.5 2006/06/29 18:59:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussChebyshevQ.hh,v 1.5 2006/06/29 18:59:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4GaussHermiteQ.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4GaussHermiteQ.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussHermiteQ.hh,v 1.6 2006/06/29 18:59:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4GaussJacobiQ.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4GaussJacobiQ.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussJacobiQ.hh,v 1.5 2006/06/29 18:59:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussLaguerreQ.hh,v 1.6 2006/06/29 18:59:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4GaussLegendreQ.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4GaussLegendreQ.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussLegendreQ.hh,v 1.6 2006/06/29 18:59:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4Integrator.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4Integrator.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4Integrator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Integrator.hh,v 1.7 2006/06/29 18:59:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4JTPolynomialSolver.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4JTPolynomialSolver.hh,v 1.6 2006/06/29 18:59:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4PolynomialSolver.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4PolynomialSolver.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4PolynomialSolver.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolynomialSolver.hh,v 1.4 2006/06/29 18:59:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // class G4PolynomialSolver
Index: trunk/source/global/HEPNumerics/include/G4SimpleIntegration.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4SimpleIntegration.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4SimpleIntegration.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleIntegration.hh,v 1.6 2006/06/29 18:59:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4SimplexDownhill.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4SimplexDownhill.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4SimplexDownhill.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimplexDownhill.hh,v 1.3 2007/06/21 15:04:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
===================================================================
--- trunk/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh	(revision 1227)
+++ trunk/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGaussianQuadrature.hh,v 1.7 2006/06/29 18:59:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class description:
Index: trunk/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AnalyticalPolSolver.cc,v 1.7 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChebyshevApproximation.cc,v 1.7 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/global/HEPNumerics/src/G4DataInterpolation.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4DataInterpolation.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4DataInterpolation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DataInterpolation.cc,v 1.10 2008/03/13 09:35:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4DataInterpolation.hh"
Index: trunk/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussChebyshevQ.cc,v 1.6 2006/06/29 19:00:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4GaussChebyshevQ.hh"
Index: trunk/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4GaussHermiteQ.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4GaussHermiteQ.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussHermiteQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4GaussHermiteQ.hh"
Index: trunk/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4GaussJacobiQ.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4GaussJacobiQ.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussJacobiQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4GaussJacobiQ.hh"
Index: trunk/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussLaguerreQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4GaussLaguerreQ.hh"
Index: trunk/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4GaussLegendreQ.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4GaussLegendreQ.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GaussLegendreQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4GaussLegendreQ.hh"
Index: trunk/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4JTPolynomialSolver.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4JTPolynomialSolver.cc,v 1.7 2008/03/13 09:35:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------------
Index: trunk/source/global/HEPNumerics/src/G4SimpleIntegration.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4SimpleIntegration.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4SimpleIntegration.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SimpleIntegration.cc,v 1.7 2006/06/29 19:00:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation file for simple integration methods
Index: trunk/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
===================================================================
--- trunk/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc	(revision 1227)
+++ trunk/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGaussianQuadrature.cc,v 1.7 2006/06/29 19:00:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Implementation file for G4VGaussianQuadrature virtual base class
Index: trunk/source/global/HEPRandom/include/G4Poisson.hh
===================================================================
--- trunk/source/global/HEPRandom/include/G4Poisson.hh	(revision 1227)
+++ trunk/source/global/HEPRandom/include/G4Poisson.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Poisson.hh,v 1.9 2006/06/29 19:00:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/HEPRandom/include/G4RandomDirection.hh
===================================================================
--- trunk/source/global/HEPRandom/include/G4RandomDirection.hh	(revision 1227)
+++ trunk/source/global/HEPRandom/include/G4RandomDirection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RandomDirection.hh,v 1.5 2008/03/19 17:00:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/HEPRandom/include/G4RandomTools.hh
===================================================================
--- trunk/source/global/HEPRandom/include/G4RandomTools.hh	(revision 1227)
+++ trunk/source/global/HEPRandom/include/G4RandomTools.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RandomTools.hh,v 1.2 2008/11/07 17:54:21 gum Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/HEPRandom/include/Randomize.hh
===================================================================
--- trunk/source/global/HEPRandom/include/Randomize.hh	(revision 1227)
+++ trunk/source/global/HEPRandom/include/Randomize.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: Randomize.hh,v 1.7 2006/06/29 19:00:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef randomize_h
Index: trunk/source/global/History
===================================================================
--- trunk/source/global/History	(revision 1227)
+++ trunk/source/global/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.232 2009/11/18 11:42:03 vnivanch Exp $
+$Id: History,v 1.234 2009/12/07 09:24:27 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -18,22 +18,29 @@
      ----------------------------------------------------------
 
-November 17, 2009  V.Ivanchenko (global-V09-02-10)
-- G4PhysicsVector - fixed Value method for the case when energy is 
-                    around edgeMax adding extra protection
-
-November 4, 2009  V.Ivanchenko (global-V09-02-09)
+Dec 7, 2009  V.Ivanchenko (global-V09-02-12)
+- G4PhysicsVector: (L.Pandola) fixed initialisation of lastEnergy to -DBL_MAX
+                   allowing to have negative scale of energy  
+
+Nov 24, 2009  G.Cosmo (global-V09-02-11)
+- Changed date for release 9.3.
+
+Nov 17, 2009  V.Ivanchenko (global-V09-02-10)
+- G4PhysicsVector: fixed Value() method for the case when energy is 
+  around 'edgeMax'; adding extra protection.
+
+Nov 04, 2009  V.Ivanchenko (global-V09-02-09)
 - G4PhysicsVector: cleaned up initialisation of cached values;
   simplified Value() method, now not looking into previous bin;
   added method ScaleVector() needed for ICRU'73 data. 
 
-October 29, 2009  G.Cosmo (global-V09-02-08)
+Oct 29, 2009  G.Cosmo (global-V09-02-08)
 - Cleared warning for unused argument in G4Allocator internal method.
 
-August 7, 2009  G.Cosmo (global-V09-02-07)
+Aug 07, 2009  G.Cosmo (global-V09-02-07)
 - Some improvements to G4String and G4SubString implementation of operators
   and comparison stub functions, to reduce generation of temporaries.
 - Removed obsolete static hash(s) method.
 
-July 3, 2009  V.Ivanchenko (global-V09-02-06)
+Jul 03, 2009  V.Ivanchenko (global-V09-02-06)
 - New class G4Pow, a singleton for fast computation of log() and pow() for 
   integer and double arguments in the interval [1-256].
Index: trunk/source/global/management/include/G4Allocator.hh
===================================================================
--- trunk/source/global/management/include/G4Allocator.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Allocator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Allocator.hh,v 1.19 2009/10/29 16:01:28 gcosmo Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4AllocatorPool.hh
===================================================================
--- trunk/source/global/management/include/G4AllocatorPool.hh	(revision 1227)
+++ trunk/source/global/management/include/G4AllocatorPool.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AllocatorPool.hh,v 1.5 2006/06/29 19:01:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4ApplicationState.hh
===================================================================
--- trunk/source/global/management/include/G4ApplicationState.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ApplicationState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ApplicationState.hh,v 1.4 2006/06/29 19:01:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/global/management/include/G4DataVector.hh
===================================================================
--- trunk/source/global/management/include/G4DataVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4DataVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DataVector.hh,v 1.15 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4ErrorPropagatorData.hh
===================================================================
--- trunk/source/global/management/include/G4ErrorPropagatorData.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ErrorPropagatorData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagatorData.hh,v 1.5 2009/05/19 13:31:47 gcosmo Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/global/management/include/G4ExceptionSeverity.hh
===================================================================
--- trunk/source/global/management/include/G4ExceptionSeverity.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ExceptionSeverity.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExceptionSeverity.hh,v 1.3 2006/06/29 19:01:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/global/management/include/G4FPEDetection.hh
===================================================================
--- trunk/source/global/management/include/G4FPEDetection.hh	(revision 1227)
+++ trunk/source/global/management/include/G4FPEDetection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FPEDetection.hh,v 1.2 2006/11/15 16:00:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4FastVector.hh
===================================================================
--- trunk/source/global/management/include/G4FastVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4FastVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastVector.hh,v 1.5 2006/06/29 19:01:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4GeometryTolerance.hh
===================================================================
--- trunk/source/global/management/include/G4GeometryTolerance.hh	(revision 1227)
+++ trunk/source/global/management/include/G4GeometryTolerance.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryTolerance.hh,v 1.2 2007/06/18 13:26:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/global/management/include/G4LPhysicsFreeVector.hh
===================================================================
--- trunk/source/global/management/include/G4LPhysicsFreeVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4LPhysicsFreeVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LPhysicsFreeVector.hh,v 1.11 2008/09/22 08:26:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4OrderedTable.hh
===================================================================
--- trunk/source/global/management/include/G4OrderedTable.hh	(revision 1227)
+++ trunk/source/global/management/include/G4OrderedTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OrderedTable.hh,v 1.14 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsFreeVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsFreeVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsFreeVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsFreeVector.hh,v 1.13 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsLinearVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsLinearVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsLinearVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLinearVector.hh,v 1.11 2008/09/22 11:37:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsLnVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsLnVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsLnVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLnVector.hh,v 1.13 2008/09/22 11:37:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsLogVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsLogVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsLogVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLogVector.hh,v 1.13 2008/09/22 08:26:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsOrderedFreeVector.hh,v 1.12 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/global/management/include/G4PhysicsTable.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsTable.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsTable.hh,v 1.18 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsVector.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsVector.hh,v 1.25 2009/11/04 11:32:43 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4PhysicsVectorType.hh
===================================================================
--- trunk/source/global/management/include/G4PhysicsVectorType.hh	(revision 1227)
+++ trunk/source/global/management/include/G4PhysicsVectorType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsVectorType.hh,v 1.4 2006/06/29 19:02:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/global/management/include/G4Pow.hh
===================================================================
--- trunk/source/global/management/include/G4Pow.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Pow.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4Pow.hh,v 1.2 2009/07/03 11:35:07 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/global/management/include/G4ReferenceCountedHandle.hh
===================================================================
--- trunk/source/global/management/include/G4ReferenceCountedHandle.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ReferenceCountedHandle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ReferenceCountedHandle.hh,v 1.15 2006/06/29 19:02:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4RotationMatrix.hh
===================================================================
--- trunk/source/global/management/include/G4RotationMatrix.hh	(revision 1227)
+++ trunk/source/global/management/include/G4RotationMatrix.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RotationMatrix.hh,v 1.5 2006/06/29 19:02:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4SIunits.hh
===================================================================
--- trunk/source/global/management/include/G4SIunits.hh	(revision 1227)
+++ trunk/source/global/management/include/G4SIunits.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SIunits.hh,v 1.5 2006/09/15 08:16:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // ----------------------------------------------------------------------
Index: trunk/source/global/management/include/G4SliceTimer.hh
===================================================================
--- trunk/source/global/management/include/G4SliceTimer.hh	(revision 1227)
+++ trunk/source/global/management/include/G4SliceTimer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SliceTimer.hh,v 1.1 2006/10/23 07:43:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4StateManager.hh
===================================================================
--- trunk/source/global/management/include/G4StateManager.hh	(revision 1227)
+++ trunk/source/global/management/include/G4StateManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StateManager.hh,v 1.10 2006/06/29 19:02:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4String.hh
===================================================================
--- trunk/source/global/management/include/G4String.hh	(revision 1227)
+++ trunk/source/global/management/include/G4String.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4String.hh,v 1.15 2009/08/10 10:18:09 gcosmo Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4ThreeVector.hh
===================================================================
--- trunk/source/global/management/include/G4ThreeVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ThreeVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ThreeVector.hh,v 1.5 2006/06/29 19:03:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4Timer.hh
===================================================================
--- trunk/source/global/management/include/G4Timer.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Timer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Timer.hh,v 1.14 2006/06/29 19:03:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4Tokenizer.hh
===================================================================
--- trunk/source/global/management/include/G4Tokenizer.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Tokenizer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Tokenizer.hh,v 1.2 2006/06/29 19:03:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4TwoVector.hh
===================================================================
--- trunk/source/global/management/include/G4TwoVector.hh	(revision 1227)
+++ trunk/source/global/management/include/G4TwoVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TwoVector.hh,v 1.1 2007/02/09 12:10:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4Types.hh
===================================================================
--- trunk/source/global/management/include/G4Types.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Types.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Types.hh,v 1.14 2006/06/29 19:03:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/global/management/include/G4UnitsTable.hh
===================================================================
--- trunk/source/global/management/include/G4UnitsTable.hh	(revision 1227)
+++ trunk/source/global/management/include/G4UnitsTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnitsTable.hh,v 1.18 2006/11/30 10:37:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4UserLimits.hh
===================================================================
--- trunk/source/global/management/include/G4UserLimits.hh	(revision 1227)
+++ trunk/source/global/management/include/G4UserLimits.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserLimits.hh,v 1.9 2006/06/29 19:03:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 //
Index: trunk/source/global/management/include/G4VExceptionHandler.hh
===================================================================
--- trunk/source/global/management/include/G4VExceptionHandler.hh	(revision 1227)
+++ trunk/source/global/management/include/G4VExceptionHandler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VExceptionHandler.hh,v 1.2 2006/06/29 19:03:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4VNotifier.hh
===================================================================
--- trunk/source/global/management/include/G4VNotifier.hh	(revision 1227)
+++ trunk/source/global/management/include/G4VNotifier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNotifier.hh,v 1.2 2006/06/29 19:03:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4VNotifier
Index: trunk/source/global/management/include/G4VStateDependent.hh
===================================================================
--- trunk/source/global/management/include/G4VStateDependent.hh	(revision 1227)
+++ trunk/source/global/management/include/G4VStateDependent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStateDependent.hh,v 1.5 2006/06/29 19:03:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4Version.hh
===================================================================
--- trunk/source/global/management/include/G4Version.hh	(revision 1227)
+++ trunk/source/global/management/include/G4Version.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Version.hh,v 1.24 2009/06/19 14:29:09 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// $Id: G4Version.hh,v 1.25 2009/11/24 13:51:02 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Version information
@@ -51,5 +51,5 @@
 
 #ifndef G4VERSION_TAG
-#define G4VERSION_TAG "$Name: global-V09-02-10 $"
+#define G4VERSION_TAG "$Name: geant4-09-03 $"
 #endif
 
@@ -58,6 +58,6 @@
 #include "G4String.hh"
 
-static const G4String G4Version = "$Name: global-V09-02-10 $";
-static const G4String G4Date    = "(5-June-2009)";
+static const G4String G4Version = "$Name: geant4-09-03 $";
+static const G4String G4Date    = "(18-December-2009)";
 
 #endif
Index: trunk/source/global/management/include/G4coutDestination.hh
===================================================================
--- trunk/source/global/management/include/G4coutDestination.hh	(revision 1227)
+++ trunk/source/global/management/include/G4coutDestination.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4coutDestination.hh,v 1.6 2006/06/29 19:03:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4ios.hh
===================================================================
--- trunk/source/global/management/include/G4ios.hh	(revision 1227)
+++ trunk/source/global/management/include/G4ios.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ios.hh,v 1.10 2006/06/29 19:03:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/include/G4strstreambuf.hh
===================================================================
--- trunk/source/global/management/include/G4strstreambuf.hh	(revision 1227)
+++ trunk/source/global/management/include/G4strstreambuf.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4strstreambuf.hh,v 1.16 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // ====================================================================
 //
Index: trunk/source/global/management/include/globals.hh
===================================================================
--- trunk/source/global/management/include/globals.hh	(revision 1227)
+++ trunk/source/global/management/include/globals.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: globals.hh,v 1.27 2006/06/29 19:03:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/global/management/include/templates.hh
===================================================================
--- trunk/source/global/management/include/templates.hh	(revision 1227)
+++ trunk/source/global/management/include/templates.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: templates.hh,v 1.13 2008/08/15 12:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4AllocatorPool.cc
===================================================================
--- trunk/source/global/management/src/G4AllocatorPool.cc	(revision 1227)
+++ trunk/source/global/management/src/G4AllocatorPool.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AllocatorPool.cc,v 1.4 2006/06/29 19:03:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4DataVector.cc
===================================================================
--- trunk/source/global/management/src/G4DataVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4DataVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DataVector.cc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4ErrorPropagatorData.cc
===================================================================
--- trunk/source/global/management/src/G4ErrorPropagatorData.cc	(revision 1227)
+++ trunk/source/global/management/src/G4ErrorPropagatorData.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ErrorPropagatorData.cc,v 1.5 2009/05/19 13:31:47 gcosmo Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/global/management/src/G4Exception.cc
===================================================================
--- trunk/source/global/management/src/G4Exception.cc	(revision 1227)
+++ trunk/source/global/management/src/G4Exception.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Exception.cc,v 1.21 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4GeometryTolerance.cc
===================================================================
--- trunk/source/global/management/src/G4GeometryTolerance.cc	(revision 1227)
+++ trunk/source/global/management/src/G4GeometryTolerance.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometryTolerance.cc,v 1.3 2008/02/15 07:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GeometryTolerance
Index: trunk/source/global/management/src/G4LPhysicsFreeVector.cc
===================================================================
--- trunk/source/global/management/src/G4LPhysicsFreeVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4LPhysicsFreeVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LPhysicsFreeVector.cc,v 1.23 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4OrderedTable.cc
===================================================================
--- trunk/source/global/management/src/G4OrderedTable.cc	(revision 1227)
+++ trunk/source/global/management/src/G4OrderedTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OrderedTable.cc,v 1.6 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsFreeVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsFreeVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsFreeVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsFreeVector.cc,v 1.13 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsLinearVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsLinearVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsLinearVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLinearVector.cc,v 1.15 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsLnVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsLnVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsLnVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLnVector.cc,v 1.18 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsLogVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsLogVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsLogVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsLogVector.cc,v 1.22 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsOrderedFreeVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsOrderedFreeVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsOrderedFreeVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsOrderedFreeVector.cc,v 1.13 2009/06/25 10:05:26 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/global/management/src/G4PhysicsTable.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsTable.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsTable.cc,v 1.15 2007/11/13 17:35:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4PhysicsVector.cc
===================================================================
--- trunk/source/global/management/src/G4PhysicsVector.cc	(revision 1227)
+++ trunk/source/global/management/src/G4PhysicsVector.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PhysicsVector.cc,v 1.40 2009/11/04 11:45:54 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// $Id: G4PhysicsVector.cc,v 1.41 2009/12/07 09:21:27 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -59,5 +59,5 @@
  : type(T_G4PhysicsVector),
    edgeMin(0.), edgeMax(0.), numberOfNodes(0),
-   lastEnergy(-1.0), lastValue(0.), lastBin(0), useSpline(spline)
+   lastEnergy(-DBL_MAX), lastValue(0.), lastBin(0), useSpline(spline)
 {}
 
@@ -171,5 +171,5 @@
 {
   // clear properties;
-  lastEnergy=-1.0;
+  lastEnergy=-DBL_MAX;
   lastValue =0.;
   lastBin   =0;
Index: trunk/source/global/management/src/G4Pow.cc
===================================================================
--- trunk/source/global/management/src/G4Pow.cc	(revision 1227)
+++ trunk/source/global/management/src/G4Pow.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4Pow.cc,v 1.2 2009/07/03 11:35:06 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/global/management/src/G4SliceTimer.cc
===================================================================
--- trunk/source/global/management/src/G4SliceTimer.cc	(revision 1227)
+++ trunk/source/global/management/src/G4SliceTimer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SliceTimer.cc,v 1.2 2006/11/02 15:39:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4StateManager.cc
===================================================================
--- trunk/source/global/management/src/G4StateManager.cc	(revision 1227)
+++ trunk/source/global/management/src/G4StateManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StateManager.cc,v 1.13 2006/11/23 00:41:56 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -132,5 +132,4 @@
 G4StateManager::RegisterDependent(G4VStateDependent* aDependent, G4bool bottom)
 {
-  printf("G4StateManager::RegisterDependent()\n");
     G4bool ack=true;
     if(!bottom)
@@ -152,5 +151,4 @@
 G4StateManager::DeregisterDependent(G4VStateDependent* aDependent)
 {
-  printf("G4StateManager::DeregisterDependent()\n");
   G4VStateDependent* tmp = 0;
   for (std::vector<G4VStateDependent*>::iterator i=theDependentsList.begin();
@@ -169,5 +167,4 @@
 G4StateManager::GetCurrentState() const
 {
-  printf("G4StateManager::GetCurrentState() = %s\n",GetStateString(theCurrentState).c_str());
    return theCurrentState;
 }
@@ -176,5 +173,4 @@
 G4StateManager::GetPreviousState() const
 {
-  printf("G4StateManager::GetPreviousState() = %s\n",GetStateString(thePreviousState).c_str());
    return thePreviousState;
 }
@@ -182,11 +178,9 @@
 G4bool
 G4StateManager::SetNewState(G4ApplicationState requestedState)
-{  printf("G4StateManager::SetNewState(%s)\n",GetStateString(requestedState).c_str());
- return SetNewState(requestedState,0); }
+{ return SetNewState(requestedState,0); }
 
 G4bool
 G4StateManager::SetNewState(G4ApplicationState requestedState, const char* msg)
 {
-  printf("G4StateManager::SetNewState(%s , ...) vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n",GetStateString(requestedState).c_str());
    if(requestedState==G4State_Abort && suppressAbortion>0)
    {
@@ -199,8 +193,6 @@
    G4ApplicationState savedState = thePreviousState;
    thePreviousState = theCurrentState;
-   printf("G4StateManager::SetNewState(.. , ...) middle\n");
    while ((ack) && (i<theDependentsList.size()))
    {
-     printf("G4StateManager::SetNewState(.. , ...) while...\n");
      ack = theDependentsList[i]->Notify(requestedState);
      i++;
@@ -216,5 +208,4 @@
    { theCurrentState = requestedState; }
    msgptr = 0;
-   printf("G4StateManager::SetNewState(%s , ...) END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",GetStateString(requestedState).c_str());
    return ack;
 }
Index: trunk/source/global/management/src/G4Timer.cc
===================================================================
--- trunk/source/global/management/src/G4Timer.cc	(revision 1227)
+++ trunk/source/global/management/src/G4Timer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Timer.cc,v 1.15 2006/06/29 19:04:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4UnitsTable.cc
===================================================================
--- trunk/source/global/management/src/G4UnitsTable.cc	(revision 1227)
+++ trunk/source/global/management/src/G4UnitsTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnitsTable.cc,v 1.37 2008/05/06 17:17:08 maire Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/global/management/src/G4VExceptionHandler.cc
===================================================================
--- trunk/source/global/management/src/G4VExceptionHandler.cc	(revision 1227)
+++ trunk/source/global/management/src/G4VExceptionHandler.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VExceptionHandler.cc,v 1.3 2006/06/29 19:04:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4VNotifier.cc
===================================================================
--- trunk/source/global/management/src/G4VNotifier.cc	(revision 1227)
+++ trunk/source/global/management/src/G4VNotifier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNotifier.cc,v 1.2 2006/06/29 19:04:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VNotifier
Index: trunk/source/global/management/src/G4VStateDependent.cc
===================================================================
--- trunk/source/global/management/src/G4VStateDependent.cc	(revision 1227)
+++ trunk/source/global/management/src/G4VStateDependent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStateDependent.cc,v 1.5 2006/06/29 19:04:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4coutDestination.cc
===================================================================
--- trunk/source/global/management/src/G4coutDestination.cc	(revision 1227)
+++ trunk/source/global/management/src/G4coutDestination.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4coutDestination.cc,v 1.2 2006/06/29 19:04:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/global/management/src/G4ios.cc
===================================================================
--- trunk/source/global/management/src/G4ios.cc	(revision 1227)
+++ trunk/source/global/management/src/G4ios.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ios.cc,v 1.9 2006/06/29 19:04:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4AttCheck.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttCheck.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttCheck.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttCheck.hh,v 1.8 2006/10/17 16:14:08 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ATTCHECK_HH
Index: trunk/source/graphics_reps/include/G4AttDef.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttDef.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttDef.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttDef.hh,v 1.7 2006/10/17 16:14:08 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ATTDEF_HH
Index: trunk/source/graphics_reps/include/G4AttDefStore.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttDefStore.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttDefStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttDefStore.hh,v 1.11 2007/04/03 13:58:07 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ATTDEFSTORE_HH
Index: trunk/source/graphics_reps/include/G4AttDefT.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttDefT.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttDefT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AttDefT.hh,v 1.2 2006/12/13 15:43:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Templated G4AttDef. Generates type key for given template parameter.
Index: trunk/source/graphics_reps/include/G4AttHolder.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttHolder.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttHolder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AttHolder.hh,v 1.6 2007/06/08 14:24:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ATTHOLDER_HH
Index: trunk/source/graphics_reps/include/G4AttUtils.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttUtils.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttUtils.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AttUtils.hh,v 1.1 2006/09/11 18:04:58 tinslay Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Jane Tinslay September 2006
Index: trunk/source/graphics_reps/include/G4AttValue.hh
===================================================================
--- trunk/source/graphics_reps/include/G4AttValue.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4AttValue.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttValue.hh,v 1.5 2006/06/29 19:05:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ATTVALUE_HH
Index: trunk/source/graphics_reps/include/G4Circle.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Circle.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Circle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Circle.hh,v 1.9 2006/06/29 19:05:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Color.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Color.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Color.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Color.hh,v 1.5 2006/06/29 19:05:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Colour.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Colour.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Colour.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Colour.hh,v 1.14 2007/01/05 14:06:28 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4ConversionFatalError.hh
===================================================================
--- trunk/source/graphics_reps/include/G4ConversionFatalError.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4ConversionFatalError.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ConversionFatalError.hh,v 1.2 2006/12/13 15:44:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Fatal G4Exception error
Index: trunk/source/graphics_reps/include/G4ConversionUtils.hh
===================================================================
--- trunk/source/graphics_reps/include/G4ConversionUtils.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4ConversionUtils.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ConversionUtils.hh,v 1.2 2006/09/12 18:29:31 tinslay Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Jane Tinslay September 2006
Index: trunk/source/graphics_reps/include/G4CreatorFactoryT.hh
===================================================================
--- trunk/source/graphics_reps/include/G4CreatorFactoryT.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4CreatorFactoryT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CreatorFactoryT.hh,v 1.2 2006/12/13 15:44:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Generic identifier-creator based factory. Based on 
Index: trunk/source/graphics_reps/include/G4DimensionedDouble.hh
===================================================================
--- trunk/source/graphics_reps/include/G4DimensionedDouble.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4DimensionedDouble.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DimensionedDouble.hh,v 1.2 2006/12/13 15:44:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Dimensioned G4double.
Index: trunk/source/graphics_reps/include/G4DimensionedThreeVector.hh
===================================================================
--- trunk/source/graphics_reps/include/G4DimensionedThreeVector.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4DimensionedThreeVector.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DimensionedThreeVector.hh,v 1.2 2006/12/13 15:44:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Dimensioned G4Threevector.
Index: trunk/source/graphics_reps/include/G4DimensionedType.hh
===================================================================
--- trunk/source/graphics_reps/include/G4DimensionedType.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4DimensionedType.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DimensionedType.hh,v 1.3 2006/12/13 15:44:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Generic dimensioned type.
Index: trunk/source/graphics_reps/include/G4NURBS.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBS.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBS.hh,v 1.10 2006/06/29 19:05:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Olivier Crumeyrolle  12 September 1996
Index: trunk/source/graphics_reps/include/G4NURBSbox.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBSbox.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBSbox.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBSbox.hh,v 1.9 2006/06/29 19:05:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4NURBScylinder.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBScylinder.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBScylinder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBScylinder.hh,v 1.9 2006/06/29 19:05:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4NURBShexahedron.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBShexahedron.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBShexahedron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBShexahedron.hh,v 1.9 2006/06/29 19:05:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hexa hedron builder prototype
Index: trunk/source/graphics_reps/include/G4NURBStube.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBStube.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBStube.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBStube.hh,v 1.9 2006/06/29 19:05:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4NURBStubesector.hh
===================================================================
--- trunk/source/graphics_reps/include/G4NURBStubesector.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4NURBStubesector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBStubesector.hh,v 1.8 2006/06/29 19:05:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4PlacedPolyhedron.hh
===================================================================
--- trunk/source/graphics_reps/include/G4PlacedPolyhedron.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4PlacedPolyhedron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacedPolyhedron.hh,v 1.11 2006/06/29 19:05:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 
Index: trunk/source/graphics_reps/include/G4Point3DList.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Point3DList.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Point3DList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Point3DList.hh,v 1.12 2006/06/29 19:05:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Polyhedron.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Polyhedron.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Polyhedron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyhedron.hh,v 1.21 2008/04/14 08:50:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4POLYHEDRON_HH
Index: trunk/source/graphics_reps/include/G4Polyline.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Polyline.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Polyline.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyline.hh,v 1.13 2006/06/29 19:05:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Polymarker.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Polymarker.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Polymarker.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polymarker.hh,v 1.11 2006/06/29 19:05:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Polymarker.icc
===================================================================
--- trunk/source/graphics_reps/include/G4Polymarker.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Polymarker.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polymarker.icc,v 1.4 2006/06/29 19:05:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Scale.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Scale.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Scale.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Scale.hh,v 1.7 2006/06/29 19:05:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Scale.icc
===================================================================
--- trunk/source/graphics_reps/include/G4Scale.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Scale.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Scale.icc,v 1.3 2006/06/29 19:05:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4SmartFilter.hh
===================================================================
--- trunk/source/graphics_reps/include/G4SmartFilter.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4SmartFilter.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4SmartFilter.hh,v 1.3 2006/08/25 19:39:39 tinslay Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Filter with additional funcionality such as active and inverted states, 
Index: trunk/source/graphics_reps/include/G4Square.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Square.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Square.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Square.hh,v 1.8 2006/06/29 19:06:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Square.icc
===================================================================
--- trunk/source/graphics_reps/include/G4Square.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Square.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Square.icc,v 1.4 2006/06/29 19:06:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Text.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Text.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Text.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Text.hh,v 1.10 2006/06/29 19:06:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Text.icc
===================================================================
--- trunk/source/graphics_reps/include/G4Text.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Text.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Text.icc,v 1.4 2006/06/29 19:06:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4TypeKey.hh
===================================================================
--- trunk/source/graphics_reps/include/G4TypeKey.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4TypeKey.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4TypeKey.hh,v 1.2 2006/12/13 15:44:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Base type key class
Index: trunk/source/graphics_reps/include/G4TypeKeyT.hh
===================================================================
--- trunk/source/graphics_reps/include/G4TypeKeyT.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4TypeKeyT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4TypeKeyT.hh,v 1.2 2006/12/13 15:44:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Type key class
Index: trunk/source/graphics_reps/include/G4VFilter.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VFilter.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VFilter.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VFilter.hh,v 1.4 2006/08/25 19:39:39 tinslay Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Abstract filter class.
Index: trunk/source/graphics_reps/include/G4VGraphicsScene.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VGraphicsScene.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VGraphicsScene.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGraphicsScene.hh,v 1.12 2009/10/21 15:36:22 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 // John Allison  19th July 1996
 //
Index: trunk/source/graphics_reps/include/G4VMarker.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VMarker.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VMarker.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VMarker.hh,v 1.13 2009/02/24 10:58:04 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4VMarker.icc
===================================================================
--- trunk/source/graphics_reps/include/G4VMarker.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VMarker.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VMarker.icc,v 1.8 2009/02/24 10:58:04 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4VVisManager.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VVisManager.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VVisManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VVisManager.hh,v 1.15 2009/02/25 14:13:43 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 // John Allison 19/Oct/1996.
 // 
Index: trunk/source/graphics_reps/include/G4VisAttributes.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VisAttributes.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VisAttributes.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VisAttributes.hh,v 1.19 2007/01/05 14:12:13 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4VisAttributes.icc
===================================================================
--- trunk/source/graphics_reps/include/G4VisAttributes.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VisAttributes.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VisAttributes.icc,v 1.14 2007/01/05 14:12:13 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4VisExtent.hh
===================================================================
--- trunk/source/graphics_reps/include/G4VisExtent.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4VisExtent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VisExtent.hh,v 1.10 2006/06/29 19:06:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Visible.hh
===================================================================
--- trunk/source/graphics_reps/include/G4Visible.hh	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Visible.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Visible.hh,v 1.13 2006/11/07 11:53:16 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/G4Visible.icc
===================================================================
--- trunk/source/graphics_reps/include/G4Visible.icc	(revision 1227)
+++ trunk/source/graphics_reps/include/G4Visible.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Visible.icc,v 1.8 2006/11/07 11:53:16 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/include/HepPolyhedron.h
===================================================================
--- trunk/source/graphics_reps/include/HepPolyhedron.h	(revision 1227)
+++ trunk/source/graphics_reps/include/HepPolyhedron.h	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: HepPolyhedron.h,v 1.25 2009/10/28 13:38:54 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/graphics_reps/src/G4AttCheck.cc
===================================================================
--- trunk/source/graphics_reps/src/G4AttCheck.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4AttCheck.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttCheck.cc,v 1.15 2006/11/07 11:50:22 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4AttCheck.hh"
Index: trunk/source/graphics_reps/src/G4AttDef.cc
===================================================================
--- trunk/source/graphics_reps/src/G4AttDef.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4AttDef.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttDef.cc,v 1.2 2006/11/01 10:15:05 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4AttDef.hh"
Index: trunk/source/graphics_reps/src/G4AttDefStore.cc
===================================================================
--- trunk/source/graphics_reps/src/G4AttDefStore.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4AttDefStore.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AttDefStore.cc,v 1.11 2007/04/03 13:58:08 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4AttDefStore.hh"
Index: trunk/source/graphics_reps/src/G4AttHolder.cc
===================================================================
--- trunk/source/graphics_reps/src/G4AttHolder.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4AttHolder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AttHolder.cc,v 1.3 2006/11/01 10:11:44 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4AttHolder.hh"
Index: trunk/source/graphics_reps/src/G4AttUtils.cc
===================================================================
--- trunk/source/graphics_reps/src/G4AttUtils.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4AttUtils.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AttUtils.cc,v 1.1 2006/09/11 18:04:59 tinslay Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Jane Tinslay September 2006
Index: trunk/source/graphics_reps/src/G4Circle.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Circle.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Circle.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Circle.cc,v 1.7 2006/06/29 19:06:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Colour.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Colour.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Colour.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Colour.cc,v 1.11 2007/01/05 14:06:28 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4NURBS.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBS.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBS.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBS.cc,v 1.9 2006/06/29 19:06:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4NURBSbox.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBSbox.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBSbox.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBSbox.cc,v 1.7 2006/06/29 19:06:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4NURBScylinder.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBScylinder.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBScylinder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBScylinder.cc,v 1.8 2006/06/29 19:06:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4NURBShexahedron.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBShexahedron.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBShexahedron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBShexahedron.cc,v 1.7 2006/06/29 19:06:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // hexahedron implementation
Index: trunk/source/graphics_reps/src/G4NURBStube.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBStube.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBStube.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBStube.cc,v 1.8 2006/06/29 19:06:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4NURBStubesector.cc
===================================================================
--- trunk/source/graphics_reps/src/G4NURBStubesector.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4NURBStubesector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NURBStubesector.cc,v 1.12 2006/06/29 19:06:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4PlacedPolyhedron.cc
===================================================================
--- trunk/source/graphics_reps/src/G4PlacedPolyhedron.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4PlacedPolyhedron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlacedPolyhedron.cc,v 1.4 2006/06/29 19:06:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4PlacedPolyhedron.hh"
Index: trunk/source/graphics_reps/src/G4Point3DList.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Point3DList.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Point3DList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Point3DList.cc,v 1.7 2006/06/29 19:07:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Polyhedron.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Polyhedron.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Polyhedron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyhedron.cc,v 1.23 2008/04/14 08:50:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4Polyhedron.hh"
Index: trunk/source/graphics_reps/src/G4Polyline.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Polyline.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Polyline.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polyline.cc,v 1.11 2006/06/29 19:07:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Polymarker.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Polymarker.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Polymarker.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Polymarker.cc,v 1.11 2006/06/29 19:07:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Scale.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Scale.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Scale.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Scale.cc,v 1.9 2006/06/29 19:07:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Square.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Square.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Square.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Square.cc,v 1.6 2006/06/29 19:07:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Text.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Text.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Text.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Text.cc,v 1.9 2006/06/29 19:07:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4VGraphicsScene.cc
===================================================================
--- trunk/source/graphics_reps/src/G4VGraphicsScene.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4VGraphicsScene.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGraphicsScene.cc,v 1.1 2007/07/17 17:52:20 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 // John Allison  19th July 1996
 
Index: trunk/source/graphics_reps/src/G4VMarker.cc
===================================================================
--- trunk/source/graphics_reps/src/G4VMarker.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4VMarker.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VMarker.cc,v 1.12 2009/02/24 10:58:04 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4VVisManager.cc
===================================================================
--- trunk/source/graphics_reps/src/G4VVisManager.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4VVisManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VVisManager.cc,v 1.4 2006/06/29 19:07:24 gunter Exp $
-// GEANT4 tag $Name: greps-V09-02-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4VisAttributes.cc
===================================================================
--- trunk/source/graphics_reps/src/G4VisAttributes.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4VisAttributes.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VisAttributes.cc,v 1.16 2007/01/05 14:12:13 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4VisExtent.cc
===================================================================
--- trunk/source/graphics_reps/src/G4VisExtent.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4VisExtent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VisExtent.cc,v 1.10 2006/06/29 19:07:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/G4Visible.cc
===================================================================
--- trunk/source/graphics_reps/src/G4Visible.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/G4Visible.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Visible.cc,v 1.17 2006/11/07 11:53:16 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/graphics_reps/src/HepPolyhedron.cc
===================================================================
--- trunk/source/graphics_reps/src/HepPolyhedron.cc	(revision 1227)
+++ trunk/source/graphics_reps/src/HepPolyhedron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: HepPolyhedron.cc,v 1.34 2009/10/28 13:36:32 allison Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/include/G4UIaliasList.hh
===================================================================
--- trunk/source/intercoms/include/G4UIaliasList.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIaliasList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIaliasList.hh,v 1.6 2006/06/29 19:07:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/include/G4UIbatch.hh
===================================================================
--- trunk/source/intercoms/include/G4UIbatch.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIbatch.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UIbatch.hh,v 1.11 2009/11/06 08:58:53 kmura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ====================================================================
Index: trunk/source/intercoms/include/G4UIcmdWith3Vector.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWith3Vector.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWith3Vector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWith3Vector.hh,v 1.7 2006/06/29 19:07:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.8 2006/06/29 19:07:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithABool.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithABool.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithABool.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithABool.hh,v 1.7 2006/06/29 19:07:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithADouble.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithADouble.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithADouble.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithADouble.hh,v 1.7 2006/06/29 19:07:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.8 2006/06/29 19:07:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithAString.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithAString.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithAString.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithAString.hh,v 1.5 2006/06/29 19:07:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithAnInteger.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithAnInteger.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithAnInteger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithAnInteger.hh,v 1.7 2006/06/29 19:08:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcmdWithoutParameter.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcmdWithoutParameter.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcmdWithoutParameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithoutParameter.hh,v 1.5 2006/06/29 19:08:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UIcommand.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcommand.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcommand.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcommand.hh,v 1.15 2006/06/29 19:08:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/include/G4UIcommandStatus.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcommandStatus.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcommandStatus.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcommandStatus.hh,v 1.5 2006/06/29 19:08:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/include/G4UIcommandTree.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcommandTree.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcommandTree.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcommandTree.hh,v 1.17 2009/05/07 09:33:51 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/include/G4UIcontrolMessenger.hh
===================================================================
--- trunk/source/intercoms/include/G4UIcontrolMessenger.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIcontrolMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcontrolMessenger.hh,v 1.12 2007/06/06 15:14:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/include/G4UIdirectory.hh
===================================================================
--- trunk/source/intercoms/include/G4UIdirectory.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIdirectory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIdirectory.hh,v 1.5 2006/06/29 19:08:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/include/G4UImanager.hh
===================================================================
--- trunk/source/intercoms/include/G4UImanager.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UImanager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UImanager.hh,v 1.21 2006/06/29 19:08:17 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
@@ -199,6 +199,6 @@
       { return session; }
   public: // with description
-  void SetSession(G4UIsession *const value);
-
+      inline void SetSession(G4UIsession *const value)
+      { session = value; }
       //  This method defines the active (G)UI session.
      void SetCoutDestination(G4UIsession *const value);
Index: trunk/source/intercoms/include/G4UImessenger.hh
===================================================================
--- trunk/source/intercoms/include/G4UImessenger.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UImessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UImessenger.hh,v 1.9 2006/06/29 19:08:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/include/G4UIparameter.hh
===================================================================
--- trunk/source/intercoms/include/G4UIparameter.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIparameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIparameter.hh,v 1.9 2006/06/29 19:08:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/include/G4UIsession.hh
===================================================================
--- trunk/source/intercoms/include/G4UIsession.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UIsession.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIsession.hh,v 1.5 2006/06/29 19:08:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $id$
Index: trunk/source/intercoms/include/G4UItokenNum.hh
===================================================================
--- trunk/source/intercoms/include/G4UItokenNum.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UItokenNum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UItokenNum.hh,v 1.8 2006/06/29 19:08:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4UItokenNum.hh
Index: trunk/source/intercoms/include/G4UnitsMessenger.hh
===================================================================
--- trunk/source/intercoms/include/G4UnitsMessenger.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4UnitsMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnitsMessenger.hh,v 1.5 2006/06/29 19:08:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class description
Index: trunk/source/intercoms/include/G4VFlavoredParallelWorld.hh
===================================================================
--- trunk/source/intercoms/include/G4VFlavoredParallelWorld.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4VFlavoredParallelWorld.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFlavoredParallelWorld.hh,v 1.5 2006/11/03 17:44:40 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/include/G4VGlobalFastSimulationManager.hh
===================================================================
--- trunk/source/intercoms/include/G4VGlobalFastSimulationManager.hh	(revision 1227)
+++ trunk/source/intercoms/include/G4VGlobalFastSimulationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGlobalFastSimulationManager.hh,v 1.5 2006/06/29 19:08:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/src/G4UIaliasList.cc
===================================================================
--- trunk/source/intercoms/src/G4UIaliasList.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIaliasList.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIaliasList.cc,v 1.6 2006/06/29 19:08:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/src/G4UIbatch.cc
===================================================================
--- trunk/source/intercoms/src/G4UIbatch.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIbatch.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UIbatch.cc,v 1.17 2008/11/21 10:54:16 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ====================================================================
Index: trunk/source/intercoms/src/G4UIcmdWith3Vector.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWith3Vector.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWith3Vector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWith3Vector.cc,v 1.8 2006/06/29 19:08:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.9 2006/06/29 19:08:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithABool.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithABool.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithABool.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithABool.cc,v 1.8 2006/06/29 19:08:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithADouble.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithADouble.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithADouble.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithADouble.cc,v 1.8 2006/06/29 19:08:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.9 2006/06/29 19:08:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithAString.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithAString.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithAString.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithAString.cc,v 1.6 2006/06/29 19:08:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithAnInteger.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithAnInteger.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithAnInteger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithAnInteger.cc,v 1.8 2006/06/29 19:08:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcmdWithoutParameter.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcmdWithoutParameter.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcmdWithoutParameter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcmdWithoutParameter.cc,v 1.4 2006/06/29 19:08:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UIcommand.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcommand.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcommand.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcommand.cc,v 1.25 2006/06/29 19:08:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/src/G4UIcommandTree.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcommandTree.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcommandTree.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcommandTree.cc,v 1.16 2009/11/06 06:16:07 kmura Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/src/G4UIcontrolMessenger.cc
===================================================================
--- trunk/source/intercoms/src/G4UIcontrolMessenger.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIcontrolMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIcontrolMessenger.cc,v 1.11 2007/06/06 15:14:51 asaim Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/src/G4UIdirectory.cc
===================================================================
--- trunk/source/intercoms/src/G4UIdirectory.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIdirectory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIdirectory.cc,v 1.4 2006/06/29 19:09:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/intercoms/src/G4UImanager.cc
===================================================================
--- trunk/source/intercoms/src/G4UImanager.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UImanager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UImanager.cc,v 1.33 2007/07/16 10:14:36 kmura Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -58,5 +58,4 @@
       fUImanager = new G4UImanager;
       fUImanager->CreateMessenger();
-      printf("G4UImanager::G4UImanager() :: Creation ================ %d\n",fUImanager);
     }
   }
@@ -89,5 +88,4 @@
 G4UImanager::~G4UImanager()
 {
-  printf("G4UImanager::~G4UImanager \n");
   SetCoutDestination(NULL);
   histVec.clear();
@@ -99,5 +97,4 @@
   fUImanagerHasBeenKilled = true;
   fUImanager = NULL;
-  printf("G4UImanager::~G4UImanager END\n");
 }
 
@@ -504,8 +501,4 @@
 //}
 
-void G4UImanager::SetSession(G4UIsession *const value)
-{
-  session = value;
-}
 
 
Index: trunk/source/intercoms/src/G4UImessenger.cc
===================================================================
--- trunk/source/intercoms/src/G4UImessenger.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UImessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UImessenger.cc,v 1.7 2006/06/29 19:09:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/src/G4UIparameter.cc
===================================================================
--- trunk/source/intercoms/src/G4UIparameter.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIparameter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIparameter.cc,v 1.14 2006/06/29 19:09:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/intercoms/src/G4UIsession.cc
===================================================================
--- trunk/source/intercoms/src/G4UIsession.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UIsession.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UIsession.cc,v 1.7 2006/06/29 19:09:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/src/G4UnitsMessenger.cc
===================================================================
--- trunk/source/intercoms/src/G4UnitsMessenger.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4UnitsMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnitsMessenger.cc,v 1.7 2006/06/29 19:09:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/intercoms/src/G4VGlobalFastSimulationManager.cc
===================================================================
--- trunk/source/intercoms/src/G4VGlobalFastSimulationManager.cc	(revision 1227)
+++ trunk/source/intercoms/src/G4VGlobalFastSimulationManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGlobalFastSimulationManager.cc,v 1.5 2006/06/29 19:09:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/interfaces/History
===================================================================
--- trunk/source/interfaces/History	(revision 1227)
+++ trunk/source/interfaces/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.116 2009/11/05 14:34:18 lgarnier Exp $
+$Id: History,v 1.125 2010/01/06 14:13:08 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18,5 +18,27 @@
      ----------------------------------------------------------
 
-=======
+6 January, 2010 L. Garnier
+ - G4VBasicShell : improvments for command completion
+ - G4Qt : Add a link to G4UIQt
+ - G4UIQt : Add tab widgets in order to put Vis in
+
+20 November, 2009 K. Murakami (interfaces-V09-02-07)
+ - G4UIExecutive.hh:  no default arguments of the constructor
+ - G4UIExecutive.icc: more cleaver way for suppressing compiler warnings
+
+20 November, 2009 J. Allison (interfaces-V09-02-06)
+ - G4UIExecutive.icc: Fixed complier warnings for some cases when more
+  than one flag is set.
+
+19 November, 2009 J. Allison (interfaces-V09-02-05)
+ - Tagged for the release.
+
+18 November, 2009 L. Garnier
+ - G4UIQt: Add CTRL+A and CTRL+E to move to begin/end of command line
+
+17 November, 2009 L. Garnier
+ - G4VBasicShell: Fix commands strings that match some shorter 
+   commands are trimmed and executed as those shorter commands.
+
 5 November, 2009 L. Garnier
  - G4UIQt Fix a problem introduce the 6th October 2009 and cause
Index: trunk/source/interfaces/basic/include/G4UIQt.hh
===================================================================
--- trunk/source/interfaces/basic/include/G4UIQt.hh	(revision 1227)
+++ trunk/source/interfaces/basic/include/G4UIQt.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.16 2009/02/16 11:40:26 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4UIQt.hh,v 1.17 2010/01/06 14:13:08 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 #ifndef G4UIQt_h
Index: trunk/source/interfaces/basic/src/G4UIQt.cc
===================================================================
--- trunk/source/interfaces/basic/src/G4UIQt.cc	(revision 1227)
+++ trunk/source/interfaces/basic/src/G4UIQt.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.28 2009/11/05 14:34:18 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4UIQt.cc,v 1.30 2010/01/06 14:13:08 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 // L. Garnier
@@ -358,22 +358,22 @@
 {
 
+  
+#if QT_VERSION < 0x040000
   QWidget *helpWidget = new QWidget(fHelpTBWidget);
-  
-  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
-#if QT_VERSION < 0x040000
   QHBoxLayout *helpLayout = new QHBoxLayout(helpWidget);
   QVBoxLayout *vLayout = new QVBoxLayout(fHelpTBWidget);
-  helpLayout->add(new QLabel("Search :",helpWidget));
-#else
+  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
+#else
+  QWidget *helpWidget = new QWidget();
   QHBoxLayout *helpLayout = new QHBoxLayout();
   QVBoxLayout *vLayout = new QVBoxLayout();
+  QSplitter *splitter = new QSplitter(Qt::Horizontal);
+#endif
+  helpLine = new QLineEdit(fHelpTBWidget);
   helpLayout->addWidget(new QLabel("Search :",helpWidget));
-#endif
-  helpLine = new QLineEdit(fHelpTBWidget);
-#if QT_VERSION < 0x040000
-  helpLayout->add(helpLine);
+  helpLayout->addWidget(helpLine);
+#if QT_VERSION < 0x040000
   connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );
 #else
-  helpLayout->addWidget(helpLine);
   connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );
 #endif
@@ -402,9 +402,8 @@
   vLayout->addWidget(helpWidget);
   vLayout->addWidget(splitter,1);
-#else
-  vLayout->addWidget(helpWidget);
-  vLayout->addWidget(splitter,1);
-#endif
-  
+#endif
+  
+  fHelpTBWidget->setMinimumSize(50,50);
+  fHelpTBWidget->setSizePolicy (QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
   // set the splitter size
 #if QT_VERSION >= 0x040000
@@ -413,8 +412,8 @@
   QValueList<int> list;
 #endif
-  list.append( 400 );
-  list.append( 400 );
+  list.append( 50 );
+  list.append( 50 );
   splitter->setSizes(list);
-
+  
 #if QT_VERSION >= 0x040000
   helpWidget->setLayout(helpLayout);
Index: trunk/source/interfaces/common/GNUmakefile
===================================================================
--- trunk/source/interfaces/common/GNUmakefile	(revision 1227)
+++ trunk/source/interfaces/common/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.4 2009/10/19 07:37:48 lgarnier Exp $
+# $Id: GNUmakefile,v 1.5 2010/01/06 14:08:20 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/common library.  John Allison, 6/7/98.
Index: trunk/source/interfaces/common/include/G4Qt.hh
===================================================================
--- trunk/source/interfaces/common/include/G4Qt.hh	(revision 1227)
+++ trunk/source/interfaces/common/include/G4Qt.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4Qt.hh,v 1.4 2008/11/06 10:06:33 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4Qt.hh,v 1.5 2010/01/06 14:07:34 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 //  To unify Qt event treatment between 
Index: trunk/source/interfaces/common/src/G4Qt.cc
===================================================================
--- trunk/source/interfaces/common/src/G4Qt.cc	(revision 1227)
+++ trunk/source/interfaces/common/src/G4Qt.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4Qt.cc,v 1.14 2009/10/07 09:12:35 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.15 2010/01/06 14:07:34 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -131,7 +131,10 @@
 #else
 #ifdef G4DEBUG_INTERFACES_COMMON
-    printf("G4Qt::G4Qt QAppl \n");
+      printf("G4Qt::G4Qt QAppl \n");
 #endif
       new QApplication (*p_argn, args);
+#ifdef G4DEBUG_INTERFACES_COMMON
+        printf("G4Qt::G4Qt 0\n");
+#endif
 #endif
       if(!qApp) {
@@ -139,4 +142,7 @@
         G4cout        << "G4Qt : Unable to init Qt." << G4endl;
       } else {
+#ifdef G4DEBUG_INTERFACES_COMMON
+        printf("G4Qt::G4Qt 1\n");
+#endif
         QtInited  = TRUE;
         if (a_argn != 0) {
@@ -242,3 +248,2 @@
 
 
-
Index: trunk/source/materials/History
===================================================================
--- trunk/source/materials/History	(revision 1227)
+++ trunk/source/materials/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.164 2009/11/20 00:59:40 gum Exp $
+$Id: History,v 1.168 2009/12/03 11:09:47 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+03-12-09 V.Ivanchenko (materials-V09-02-24)
+- G4NIstMessenger - fixed minor memory leak at destruction
+
+01-12-09 G.Cosmo (materials-V09-02-23)
+- Use G4double in place of G4float in G4DensityEffectData.
+
+30-11-09 V.Ivanchenko (materials-V09-02-22)
+- G4IonisParamMat - fixed liquid Argon problem
+
+24-11-09 V.Ivanchenko (materials-V09-02-21)
+- G4NistMaterialBuilder - allow to use old names of G4 materials
+  G4_NYLON-6/6 and G4_NYLON-6/10 for backward compatibility
 
 19-11-09 P.Gumplinger (materials-V09-02-20)
Index: trunk/source/materials/include/G4DensityEffectData.hh
===================================================================
--- trunk/source/materials/include/G4DensityEffectData.hh	(revision 1227)
+++ trunk/source/materials/include/G4DensityEffectData.hh	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4DensityEffectData.hh,v 1.6 2009/11/05 10:42:14 bagoulia Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4DensityEffectData.hh,v 1.7 2009/12/01 08:24:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //---------------------------------------------------------------------------
@@ -80,13 +80,13 @@
 
   // Access to the data via index
-  inline G4float GetPlasmaEnergy(G4int idx); 
-  inline G4float GetAdjustmentFactor(G4int idx); 
-  inline G4float GetCdensity(G4int idx); 
-  inline G4float GetX0density(G4int idx); 
-  inline G4float GetX1density(G4int idx); 
-  inline G4float GetAdensity(G4int idx); 
-  inline G4float GetMdensity(G4int idx); 
-  inline G4float GetDelta0density(G4int idx); 
-  inline G4float GetErrorDensity(G4int idx); 
+  inline G4double GetPlasmaEnergy(G4int idx); 
+  inline G4double GetAdjustmentFactor(G4int idx); 
+  inline G4double GetCdensity(G4int idx); 
+  inline G4double GetX0density(G4int idx); 
+  inline G4double GetX1density(G4int idx); 
+  inline G4double GetAdensity(G4int idx); 
+  inline G4double GetMdensity(G4int idx); 
+  inline G4double GetDelta0density(G4int idx); 
+  inline G4double GetErrorDensity(G4int idx); 
 
 private:
@@ -94,5 +94,5 @@
   void Initialize();
 
-  void AddMaterial(G4float* val, const G4String& matName);
+  void AddMaterial(G4double* val, const G4String& matName);
 
   // Assignment operator and copy constructor
@@ -100,5 +100,5 @@
   G4DensityEffectData(const G4DensityEffectData&);
 
-  G4float data[NDENSDATA][NDENSARRAY];
+  G4double data[NDENSDATA][NDENSARRAY];
   std::vector<G4String> names;
   G4int indexZ[NDENSELEM];
@@ -108,63 +108,63 @@
 };
 
-inline G4float G4DensityEffectData::GetPlasmaEnergy(G4int idx)
+inline G4double G4DensityEffectData::GetPlasmaEnergy(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][0]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetAdjustmentFactor(G4int idx)
+inline G4double G4DensityEffectData::GetAdjustmentFactor(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][1]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetCdensity(G4int idx)
+inline G4double G4DensityEffectData::GetCdensity(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][2]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetX0density(G4int idx)
+inline G4double G4DensityEffectData::GetX0density(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][3]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetX1density(G4int idx)
+inline G4double G4DensityEffectData::GetX1density(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][4]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetAdensity(G4int idx)
+inline G4double G4DensityEffectData::GetAdensity(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][5]; }
   return x;
 }
  
-inline G4float G4DensityEffectData::GetMdensity(G4int idx)
+inline G4double G4DensityEffectData::GetMdensity(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][6]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetDelta0density(G4int idx)
+inline G4double G4DensityEffectData::GetDelta0density(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][7]; }
   return x;
 } 
 
-inline G4float G4DensityEffectData::GetErrorDensity(G4int idx)
+inline G4double G4DensityEffectData::GetErrorDensity(G4int idx)
 {
-  G4float x = DBL_MAX;
+  G4double x = DBL_MAX;
   if(idx >= 0 && idx < NDENSDATA) { x = data[idx][8]; }
   return x;
Index: trunk/source/materials/src/G4DensityEffectData.cc
===================================================================
--- trunk/source/materials/src/G4DensityEffectData.cc	(revision 1227)
+++ trunk/source/materials/src/G4DensityEffectData.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4DensityEffectData.cc,v 1.8 2009/11/05 11:17:27 bagoulia Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4DensityEffectData.cc,v 1.9 2009/12/01 08:24:21 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //---------------------------------------------------------------------------
@@ -77,1207 +77,1207 @@
 
 //G4_H  index=0
-  G4float M0[NDENSARRAY]={0.263,1.412,9.5835,1.8639,3.2718,0.14092,5.7273,0.0,0.024};
+  G4double M0[NDENSARRAY]={0.263,1.412,9.5835,1.8639,3.2718,0.14092,5.7273,0.0,0.024};
   AddMaterial(M0,"G4_H");
   indexZ[0]=0;
 
 //G4_lH2  index=1
-  G4float M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021};
+  G4double M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021};
   AddMaterial(M1,"G4_lH2");
 
 //G4_He  index=2
-  G4float M2[NDENSARRAY]={0.263,1.7,11.1393,2.2017,3.6122,0.13443,5.8347,0,0.024};
+  G4double M2[NDENSARRAY]={0.263,1.7,11.1393,2.2017,3.6122,0.13443,5.8347,0,0.024};
   AddMaterial(M2,"G4_He");
   indexZ[2]=2;
 
 //G4_Li  index=3
-  G4float M3[NDENSARRAY]={13.844,1.535,3.1221,0.1304,1.6397,0.95136,2.4993,0.14,0.062};
+  G4double M3[NDENSARRAY]={13.844,1.535,3.1221,0.1304,1.6397,0.95136,2.4993,0.14,0.062};
   AddMaterial(M3,"G4_Li");
   indexZ[3]=3;
 
 //G4_Be  index=4
-  G4float M4[NDENSARRAY]={26.096,1.908,2.7847,0.0392,1.6922,0.80392,2.4339,0.14,0.029};
+  G4double M4[NDENSARRAY]={26.096,1.908,2.7847,0.0392,1.6922,0.80392,2.4339,0.14,0.029};
   AddMaterial(M4,"G4_Be");
   indexZ[4]=4;
 
 //G4_B  index=5
-  G4float M5[NDENSARRAY]={30.17,2.32,2.8477,0.0305,1.9688,0.56224,2.4512,0.14,0.024};
+  G4double M5[NDENSARRAY]={30.17,2.32,2.8477,0.0305,1.9688,0.56224,2.4512,0.14,0.024};
   AddMaterial(M5,"G4_B");
   indexZ[5]=5;
 
 //G4_C  index=6
-  G4float M6[NDENSARRAY]={28.803,2.376,2.9925,-0.0351,2.486,0.2024,3.0036,0.1,0.038};
+  G4double M6[NDENSARRAY]={28.803,2.376,2.9925,-0.0351,2.486,0.2024,3.0036,0.1,0.038};
   AddMaterial(M6,"G4_C");
   indexZ[6]=6;
 
 //G4_N  index=7
-  G4float M7[NDENSARRAY]={0.695,1.984,10.5400,1.7378,4.1323,0.15349,3.2125,0.0,0.086};
+  G4double M7[NDENSARRAY]={0.695,1.984,10.5400,1.7378,4.1323,0.15349,3.2125,0.0,0.086};
   AddMaterial(M7,"G4_N");
   indexZ[7]=7;
 
 //G4_O  index=8
-  G4float M8[NDENSARRAY]={0.744,2.314,10.7004,1.7541,4.3213,0.11778,3.2913,0.0,0.101};
+  G4double M8[NDENSARRAY]={0.744,2.314,10.7004,1.7541,4.3213,0.11778,3.2913,0.0,0.101};
   AddMaterial(M8,"G4_O");
   indexZ[8]=8;
 
 //G4_F  index=9
-  G4float M9[NDENSARRAY]={0.788,2.450,10.9653,1.8433,4.4096,0.11083,3.2962,0.0,0.121};
+  G4double M9[NDENSARRAY]={0.788,2.450,10.9653,1.8433,4.4096,0.11083,3.2962,0.0,0.121};
   AddMaterial(M9,"G4_F");
   indexZ[9]=9;
 
 //G4_Ne  index=10
-  G4float M10[NDENSARRAY]={0.587,2.577,11.9041,2.0735,4.6421,0.08064,3.5771,0.0,0.110};
+  G4double M10[NDENSARRAY]={0.587,2.577,11.9041,2.0735,4.6421,0.08064,3.5771,0.0,0.110};
   AddMaterial(M10,"G4_Ne");
   indexZ[10]=10;
 
 //G4_Na  index=11
-  G4float M11[NDENSARRAY]={19.641,2.648,5.0526,0.2880,3.1962,0.07772,3.6452,0.08,0.098};
+  G4double M11[NDENSARRAY]={19.641,2.648,5.0526,0.2880,3.1962,0.07772,3.6452,0.08,0.098};
   AddMaterial(M11,"G4_Na");
   indexZ[11]=11;
 
 //G4_Mg  index=12
-  G4float M12[NDENSARRAY]={26.708,2.331,4.5297,0.1499,3.0668,0.081163,3.6166,0.08,0.073};
+  G4double M12[NDENSARRAY]={26.708,2.331,4.5297,0.1499,3.0668,0.081163,3.6166,0.08,0.073};
   AddMaterial(M12,"G4_Mg");
   indexZ[12]=12;
 
 //G4_Al  index=13
-  G4float M13[NDENSARRAY]={32.86,2.18,4.2395,0.1708,3.0127,0.08024,3.6345,0.12,0.061};
+  G4double M13[NDENSARRAY]={32.86,2.18,4.2395,0.1708,3.0127,0.08024,3.6345,0.12,0.061};
   AddMaterial(M13,"G4_Al");
   indexZ[13]=13;
 
 //G4_Si  index=14
-  G4float M14[NDENSARRAY]={31.055,2.103,4.4351,0.2014,2.8715,0.14921,3.2546,0.14,0.059};
+  G4double M14[NDENSARRAY]={31.055,2.103,4.4351,0.2014,2.8715,0.14921,3.2546,0.14,0.059};
   AddMaterial(M14,"G4_Si");
   indexZ[14]=14;
 
 //G4_P  index=15
-  G4float M15[NDENSARRAY]={29.743,2.056,4.5214,0.1696,2.7815,0.2361,2.9158,0.14,0.057};
+  G4double M15[NDENSARRAY]={29.743,2.056,4.5214,0.1696,2.7815,0.2361,2.9158,0.14,0.057};
   AddMaterial(M15,"G4_P");
   indexZ[15]=15;
 
 //G4_S  index=16
-  G4float M16[NDENSARRAY]={28.789,2.131,4.6659,0.158,2.7159,0.33992,2.6456,0.14,0.059};
+  G4double M16[NDENSARRAY]={28.789,2.131,4.6659,0.158,2.7159,0.33992,2.6456,0.14,0.059};
   AddMaterial(M16,"G4_S");
   indexZ[16]=16;
 
 //G4_Cl  index=17
-  G4float M17[NDENSARRAY]={1.092,1.734,11.1421,1.5555,4.2994,0.19849,2.9702,0.0,0.041};
+  G4double M17[NDENSARRAY]={1.092,1.734,11.1421,1.5555,4.2994,0.19849,2.9702,0.0,0.041};
   AddMaterial(M17,"G4_Cl");
   indexZ[17]=17;
 
 //G4_Ar  index=18
-  G4float M18[NDENSARRAY]={0.789,1.753,11.9480,1.7635,4.4855,0.19714,2.9618,0.0,0.037};
+  G4double M18[NDENSARRAY]={0.789,1.753,11.9480,1.7635,4.4855,0.19714,2.9618,0.0,0.037};
   AddMaterial(M18,"G4_Ar");
   indexZ[18]=18;
 
 //G4_K  index=19
-  G4float M19[NDENSARRAY]={18.65,1.830,5.6423,0.3851,3.1724,0.19827,2.9233,0.10,0.035};
+  G4double M19[NDENSARRAY]={18.65,1.830,5.6423,0.3851,3.1724,0.19827,2.9233,0.10,0.035};
   AddMaterial(M19,"G4_K");
   indexZ[19]=19;
 
 //G4_Ca  index=20
-  G4float M20[NDENSARRAY]={25.342,1.666,5.0396,0.3228,3.1191,0.15643,3.0745,0.14,0.031};
+  G4double M20[NDENSARRAY]={25.342,1.666,5.0396,0.3228,3.1191,0.15643,3.0745,0.14,0.031};
   AddMaterial(M20,"G4_Ca");
   indexZ[20]=20;
 
 //G4_Sc  index=21
-  G4float M21[NDENSARRAY]={34.050,1.826,4.6949,0.1640,3.0593,0.15754,3.0517,0.10,0.027};
+  G4double M21[NDENSARRAY]={34.050,1.826,4.6949,0.1640,3.0593,0.15754,3.0517,0.10,0.027};
   AddMaterial(M21,"G4_Sc");
   indexZ[21]=21;
 
 //G4_Ti  index=22
-  G4float M22[NDENSARRAY]={41.619,1.969,4.4450,0.0957,3.0386,0.15662,3.0302,0.12,0.025};
+  G4double M22[NDENSARRAY]={41.619,1.969,4.4450,0.0957,3.0386,0.15662,3.0302,0.12,0.025};
   AddMaterial(M22,"G4_Ti");
   indexZ[22]=22;
 
 //G4_V  index=23
-  G4float M23[NDENSARRAY]={47.861,2.070,4.2659,0.0691,3.0322,0.15436,3.0163,0.14,0.024};
+  G4double M23[NDENSARRAY]={47.861,2.070,4.2659,0.0691,3.0322,0.15436,3.0163,0.14,0.024};
   AddMaterial(M23,"G4_V");
   indexZ[23]=23;
 
 //G4_Cr  index=24
-  G4float M24[NDENSARRAY]={52.458,2.181,4.1781,0.0340,3.0451,0.15419,2.9896,0.14,0.023};
+  G4double M24[NDENSARRAY]={52.458,2.181,4.1781,0.0340,3.0451,0.15419,2.9896,0.14,0.023};
   AddMaterial(M24,"G4_Cr");
   indexZ[24]=24;
 
 //G4_Mn  index=25
-  G4float M25[NDENSARRAY]={53.022,2.347,4.2702,0.0447,3.1074,0.14973,2.9796,0.14,0.021};
+  G4double M25[NDENSARRAY]={53.022,2.347,4.2702,0.0447,3.1074,0.14973,2.9796,0.14,0.021};
   AddMaterial(M25,"G4_Mn");
   indexZ[25]=25;
 
 //G4_Fe  index=26
-  G4float M26[NDENSARRAY]={55.172,2.504,4.2911,-0.0012,3.1531,0.146,2.9632,0.12,0.021};
+  G4double M26[NDENSARRAY]={55.172,2.504,4.2911,-0.0012,3.1531,0.146,2.9632,0.12,0.021};
   AddMaterial(M26,"G4_Fe");
   indexZ[26]=26;
 
 //G4_Co  index=27
-  G4float M27[NDENSARRAY]={58.188,2.626,4.2601,-0.0187,3.1790,0.14474,2.9502,0.12,0.019};
+  G4double M27[NDENSARRAY]={58.188,2.626,4.2601,-0.0187,3.1790,0.14474,2.9502,0.12,0.019};
   AddMaterial(M27,"G4_Co");
   indexZ[27]=27;
 
 //G4_Ni  index=28
-  G4float M28[NDENSARRAY]={59.385,2.889,4.3115,-0.0566,3.1851,0.16496,2.843,0.10,0.020};
+  G4double M28[NDENSARRAY]={59.385,2.889,4.3115,-0.0566,3.1851,0.16496,2.843,0.10,0.020};
   AddMaterial(M28,"G4_Ni");
   indexZ[28]=28;
 
 //G4_Cu  index=29
-  G4float M29[NDENSARRAY]={58.270,2.956,4.4190,-0.0254,3.2792,0.14339,2.9044,0.08,0.019};
+  G4double M29[NDENSARRAY]={58.270,2.956,4.4190,-0.0254,3.2792,0.14339,2.9044,0.08,0.019};
   AddMaterial(M29,"G4_Cu");
   indexZ[29]=29;
 
 //G4_Zn  index=30
-  G4float M30[NDENSARRAY]={52.132,3.142,4.6906,0.0049,3.3668,0.14714,2.8652,0.08,0.019};
+  G4double M30[NDENSARRAY]={52.132,3.142,4.6906,0.0049,3.3668,0.14714,2.8652,0.08,0.019};
   AddMaterial(M30,"G4_Zn");
   indexZ[30]=30;
 
 //G4_Ga  index=31
-  G4float M31[NDENSARRAY]={46.688,2.747,4.9353,0.2267,3.5434,0.09440,3.1314,0.14,0.019};
+  G4double M31[NDENSARRAY]={46.688,2.747,4.9353,0.2267,3.5434,0.09440,3.1314,0.14,0.019};
   AddMaterial(M31,"G4_Ga");
   indexZ[31]=31;
 
 //G4_Ge  index=32
-  G4float M32[NDENSARRAY]={44.141,2.461,5.1411,0.3376,3.6096,0.07188,3.3306,0.14,0.025};
+  G4double M32[NDENSARRAY]={44.141,2.461,5.1411,0.3376,3.6096,0.07188,3.3306,0.14,0.025};
   AddMaterial(M32,"G4_Ge");
   indexZ[32]=32;
 
 //G4_As  index=33
-  G4float M33[NDENSARRAY]={45.779,2.219,5.0510,0.1767,3.5702,0.06633,3.4176,0.00,0.030};
+  G4double M33[NDENSARRAY]={45.779,2.219,5.0510,0.1767,3.5702,0.06633,3.4176,0.00,0.030};
   AddMaterial(M33,"G4_As");
    indexZ[33]=33;
 
 //G4_Se  index=34
-  G4float M34[NDENSARRAY]={40.112,2.104,5.3210,0.2258,3.6264,0.06568,3.4317,0.10,0.024};
+  G4double M34[NDENSARRAY]={40.112,2.104,5.3210,0.2258,3.6264,0.06568,3.4317,0.10,0.024};
   AddMaterial(M34,"G4_Se");
   indexZ[34]=34;
 
 //G4_Br  index=35
-  G4float M35[NDENSARRAY]={1.604,1.845,11.7307,1.5262,4.9899,0.06335,3.467,0,0.022};
+  G4double M35[NDENSARRAY]={1.604,1.845,11.7307,1.5262,4.9899,0.06335,3.467,0,0.022};
   AddMaterial(M35,"G4_Br");
   indexZ[35]=35;
 
 //G4_Kr  index=36
-  G4float M36[NDENSARRAY]={1.114,1.77,12.5115,1.7158,5.0748,0.07446,3.4051,0,0.025};
+  G4double M36[NDENSARRAY]={1.114,1.77,12.5115,1.7158,5.0748,0.07446,3.4051,0,0.025};
   AddMaterial(M36,"G4_Kr");
   indexZ[36]=36;
 
 //G4_Ru  index=37
-  G4float M37[NDENSARRAY]={23.467,1.823,6.4776,0.5737,3.7995,0.07261,3.4177,0.14,0.026};
+  G4double M37[NDENSARRAY]={23.467,1.823,6.4776,0.5737,3.7995,0.07261,3.4177,0.14,0.026};
   AddMaterial(M37,"G4_Ru");
   indexZ[37]=37;
 
 //G4_Sr  index=38
-  G4float M38[NDENSARRAY]={30.244,1.707,5.9867,0.4585,3.6778,0.07165,3.4435,0.14,0.026};
+  G4double M38[NDENSARRAY]={30.244,1.707,5.9867,0.4585,3.6778,0.07165,3.4435,0.14,0.026};
   AddMaterial(M38,"G4_Sr");
   indexZ[38]=38;
 
 //G4_Y  index=39
-  G4float M39[NDENSARRAY]={40.346,1.649,5.4801,0.3608,3.5542,0.07138,3.4565,0.14,0.027};
+  G4double M39[NDENSARRAY]={40.346,1.649,5.4801,0.3608,3.5542,0.07138,3.4565,0.14,0.027};
   AddMaterial(M39,"G4_Y");
   indexZ[39]=39;
 
 //G4_Zr  index=40
-  G4float M40[NDENSARRAY]={48.671,1.638,5.1774,0.2957,3.489,0.07177,3.4533,0.14,0.028};
+  G4double M40[NDENSARRAY]={48.671,1.638,5.1774,0.2957,3.489,0.07177,3.4533,0.14,0.028};
   AddMaterial(M40,"G4_Zr");
   indexZ[40]=40;
 
 //G4_Nb  index=41
-  G4float M41[NDENSARRAY]={56.039,1.734,5.0141,0.1785,3.2201,0.13883,3.093,0.14,0.036};
+  G4double M41[NDENSARRAY]={56.039,1.734,5.0141,0.1785,3.2201,0.13883,3.093,0.14,0.036};
   AddMaterial(M41,"G4_Nb");
   indexZ[41]=41;
 
 //G4_Mo  index=42
-  G4float M42[NDENSARRAY]={60.951,1.658,4.8793,0.2267,3.2784,0.10525,3.2549,0.14,0.03};
+  G4double M42[NDENSARRAY]={60.951,1.658,4.8793,0.2267,3.2784,0.10525,3.2549,0.14,0.03};
   AddMaterial(M42,"G4_Mo");
   indexZ[42]=42;
 
 //G4_Tc  index=43
-  G4float M43[NDENSARRAY]={64.760,1.727,4.7769,0.0949,3.1253,0.16572,2.9738,0.14,0.040};
+  G4double M43[NDENSARRAY]={64.760,1.727,4.7769,0.0949,3.1253,0.16572,2.9738,0.14,0.040};
   AddMaterial(M43,"G4_Tc");
   indexZ[43]=43;
 
 //G4_Ru  index=44
-  G4float M44[NDENSARRAY]={66.978,1.780,4.7694,0.0599,3.0834,0.19342,2.8707,0.14,0.046};
+  G4double M44[NDENSARRAY]={66.978,1.780,4.7694,0.0599,3.0834,0.19342,2.8707,0.14,0.046};
   AddMaterial(M44,"G4_Ru");
   indexZ[44]=44;
 
 //G4_Rh  index=45
-  G4float M45[NDENSARRAY]={67.128,1.804,4.8008,0.0576,3.1069,0.19205,2.8633,0.14,0.046};
+  G4double M45[NDENSARRAY]={67.128,1.804,4.8008,0.0576,3.1069,0.19205,2.8633,0.14,0.046};
   AddMaterial(M45,"G4_Rh");
   indexZ[45]=45;
 
 //G4_Pd  index=46
-  G4float M46[NDENSARRAY]={65.683,1.911,4.9358,0.0563,3.0555,0.24178,2.7239,0.14,0.047};
+  G4double M46[NDENSARRAY]={65.683,1.911,4.9358,0.0563,3.0555,0.24178,2.7239,0.14,0.047};
   AddMaterial(M46,"G4_Pd");
   indexZ[46]=46;
 
 //G4_Ag  index=47
-  G4float M47[NDENSARRAY]={61.635,1.933,5.0630,0.0657,3.1074,0.24585,2.6899,0.14,0.052};
+  G4double M47[NDENSARRAY]={61.635,1.933,5.0630,0.0657,3.1074,0.24585,2.6899,0.14,0.052};
   AddMaterial(M47,"G4_Ag");
   indexZ[47]=47;
 
 //G4_Cd  index=48
-  G4float M48[NDENSARRAY]={55.381,1.895,5.2727,0.1281,3.1667,0.24609,2.6772,0.14,0.051};
+  G4double M48[NDENSARRAY]={55.381,1.895,5.2727,0.1281,3.1667,0.24609,2.6772,0.14,0.051};
   AddMaterial(M48,"G4_Cd");
   indexZ[48]=48;
 
 //G4_In  index=49
-  G4float M49[NDENSARRAY]={50.896,1.851,5.5211,0.2406,3.2032,0.23879,2.7144,0.14,0.044};
+  G4double M49[NDENSARRAY]={50.896,1.851,5.5211,0.2406,3.2032,0.23879,2.7144,0.14,0.044};
   AddMaterial(M49,"G4_In");
   indexZ[49]=49;
 
 //G4_Sn  index=50
-  G4float M50[NDENSARRAY]={50.567,1.732,5.5340,0.2879,3.2959,0.18689,2.8576,0.14,0.037};
+  G4double M50[NDENSARRAY]={50.567,1.732,5.5340,0.2879,3.2959,0.18689,2.8576,0.14,0.037};
   AddMaterial(M50,"G4_Sn");
   indexZ[50]=50;
 
 //G4_Sb  index=51
-  G4float M51[NDENSARRAY]={48.242,1.645,5.6241,0.3189,3.3489,0.16652,2.9319,0.14,0.034};
+  G4double M51[NDENSARRAY]={48.242,1.645,5.6241,0.3189,3.3489,0.16652,2.9319,0.14,0.034};
   AddMaterial(M51,"G4_Sb");
   indexZ[51]=51;
 
 //G4_Te  index=52
-  G4float M52[NDENSARRAY]={45.952,1.577,5.7131,0.3296,3.4418,0.13815,3.0354,0.14,0.033};
+  G4double M52[NDENSARRAY]={45.952,1.577,5.7131,0.3296,3.4418,0.13815,3.0354,0.14,0.033};
   AddMaterial(M52,"G4_Te");
   indexZ[52]=52;
 
 //G4_I  index=53
-  G4float M53[NDENSARRAY]={41.348,1.498,5.9488,0.0549,3.2596,0.23766,2.7276,0.0,0.045};
+  G4double M53[NDENSARRAY]={41.348,1.498,5.9488,0.0549,3.2596,0.23766,2.7276,0.0,0.045};
   AddMaterial(M53,"G4_I");
   indexZ[53]=53;
 
 //G4_Xe  index=54
-  G4float M54[NDENSARRAY]={1.369,1.435,12.7281,1.563,4.7371,0.23314,2.7414,0,0.043};
+  G4double M54[NDENSARRAY]={1.369,1.435,12.7281,1.563,4.7371,0.23314,2.7414,0,0.043};
   AddMaterial(M54,"G4_Xe");
   indexZ[54]=54;
 
 //G4_Cs  index=55
-  G4float M55[NDENSARRAY]={25.37,1.462,6.9135,0.5473,3.5914,0.18233,2.8866,0.14,0.035};
+  G4double M55[NDENSARRAY]={25.37,1.462,6.9135,0.5473,3.5914,0.18233,2.8866,0.14,0.035};
   AddMaterial(M55,"G4_Cs");
   indexZ[55]=55;
 
 //G4_Ba  index=56
-  G4float M56[NDENSARRAY]={34.425,1.410,6.3153,0.4190,3.4547,0.18268,2.8906,0.14,0.035};
+  G4double M56[NDENSARRAY]={34.425,1.410,6.3153,0.4190,3.4547,0.18268,2.8906,0.14,0.035};
   AddMaterial(M56,"G4_Ba");
   indexZ[56]=56;
 
 //G4_La  index=57
-  G4float M57[NDENSARRAY]={45.792,1.392,5.7850,0.3161,3.3293,0.18591,2.8828,0.14,0.036};
+  G4double M57[NDENSARRAY]={45.792,1.392,5.7850,0.3161,3.3293,0.18591,2.8828,0.14,0.036};
   AddMaterial(M57,"G4_La");
   indexZ[57]=57;
 
 //G4_Ce  index=58
-  G4float M58[NDENSARRAY]={47.834,1.461,5.7837,0.2713,3.3432,0.18885,2.8592,0.14,0.040};
+  G4double M58[NDENSARRAY]={47.834,1.461,5.7837,0.2713,3.3432,0.18885,2.8592,0.14,0.040};
   AddMaterial(M58,"G4_Ce");
   indexZ[58]=58;
 
 //G4_Pr  index=59
-  G4float M59[NDENSARRAY]={48.301,1.520,5.8096,0.2333,3.2773,0.23265,2.7331,0.14,0.041};
+  G4double M59[NDENSARRAY]={48.301,1.520,5.8096,0.2333,3.2773,0.23265,2.7331,0.14,0.041};
   AddMaterial(M59,"G4_Pr");
   indexZ[59]=59;
 
 //G4_Ne  index=60
-  G4float M60[NDENSARRAY]={48.819,1.588,5.8290,0.1984,3.3063,0.23530,2.7050,0.14,0.044};
+  G4double M60[NDENSARRAY]={48.819,1.588,5.8290,0.1984,3.3063,0.23530,2.7050,0.14,0.044};
   AddMaterial(M60,"G4_Ne");
   indexZ[60]=60;
 
 //G4_Pr  index=61
-  G4float M61[NDENSARRAY]={50.236,1.672,5.8224,0.1627,3.3199,0.24280,2.6674,0.14,0.048};
+  G4double M61[NDENSARRAY]={50.236,1.672,5.8224,0.1627,3.3199,0.24280,2.6674,0.14,0.048};
   AddMaterial(M61,"G4_Pr");
   indexZ[61]=61;
 
 //G4_Sa  index=62
-  G4float M62[NDENSARRAY]={50.540,1.749,5.8597,0.1520,3.3460,0.24698,2.6403,0.14,0.053};
+  G4double M62[NDENSARRAY]={50.540,1.749,5.8597,0.1520,3.3460,0.24698,2.6403,0.14,0.053};
   AddMaterial(M62,"G4_Sa");
   indexZ[62]=62;
 
 //G4_Eu  index=63
-  G4float M63[NDENSARRAY]={42.484,1.838,6.2278,0.1888,3.4633,0.24448,2.6245,0.14,0.06};
+  G4double M63[NDENSARRAY]={42.484,1.838,6.2278,0.1888,3.4633,0.24448,2.6245,0.14,0.06};
   AddMaterial(M63,"G4_Eu");
   indexZ[63]=63;
 
 //G4_Gd  index=64
-  G4float M64[NDENSARRAY]={51.672,1.882,5.8738,0.1058,3.3932,0.25109,2.5977,0.14,0.061};
+  G4double M64[NDENSARRAY]={51.672,1.882,5.8738,0.1058,3.3932,0.25109,2.5977,0.14,0.061};
   AddMaterial(M64,"G4_Gd");
   indexZ[64]=64;
 
 //G4_Tb  index=65
-  G4float M65[NDENSARRAY]={52.865,1.993,5.9045,0.0947,3.4224,0.24453,2.6056,0.14,0.063};
+  G4double M65[NDENSARRAY]={52.865,1.993,5.9045,0.0947,3.4224,0.24453,2.6056,0.14,0.063};
   AddMaterial(M65,"G4_Tb");
   indexZ[65]=65;
 
 //G4_Dy  index=66
-  G4float M66[NDENSARRAY]={53.698,2.081,5.9183,0.0822,3.4474,0.24665,2.5849,0.14,0.061};
+  G4double M66[NDENSARRAY]={53.698,2.081,5.9183,0.0822,3.4474,0.24665,2.5849,0.14,0.061};
   AddMaterial(M66,"G4_Dy");
   indexZ[66]=66;
 
 //G4_Ho  index=67
-  G4float M67[NDENSARRAY]={54.467,2.197,5.9587,0.0761,3.4782,0.24638,2.5726,0.14,0.062};
+  G4double M67[NDENSARRAY]={54.467,2.197,5.9587,0.0761,3.4782,0.24638,2.5726,0.14,0.062};
   AddMaterial(M67,"G4_Ho");
   indexZ[67]=67;
 
 //G4_Er  index=68
-  G4float M68[NDENSARRAY]={55.322,2.26,5.9521,0.0648,3.4922,0.24823,2.5573,0.14,0.061};
+  G4double M68[NDENSARRAY]={55.322,2.26,5.9521,0.0648,3.4922,0.24823,2.5573,0.14,0.061};
   AddMaterial(M68,"G4_Er");
   indexZ[68]=68;
 
 //G4_Tm  index=69
-  G4float M69[NDENSARRAY]={56.225,2.333,5.9677,0.0812,3.5085,0.24189,2.5469,0.14,0.062};
+  G4double M69[NDENSARRAY]={56.225,2.333,5.9677,0.0812,3.5085,0.24189,2.5469,0.14,0.062};
   AddMaterial(M69,"G4_Tm");
   indexZ[69]=69;
 
 //G4_Yb  index=70
-  G4float M70[NDENSARRAY]={47.546,2.505,6.3325,0.1199,3.6246,0.25295,2.5141,0.14,0.071};
+  G4double M70[NDENSARRAY]={47.546,2.505,6.3325,0.1199,3.6246,0.25295,2.5141,0.14,0.071};
   AddMaterial(M70,"G4_Yb");
   indexZ[70]=70;
 
 //G4_Lu  index=71
-  G4float M71[NDENSARRAY]={57.581,2.348,5.9785,0.1560,3.5218,0.24033,2.5643,0.14,0.054};
+  G4double M71[NDENSARRAY]={57.581,2.348,5.9785,0.1560,3.5218,0.24033,2.5643,0.14,0.054};
   AddMaterial(M71,"G4_Lu");
   indexZ[71]=71;
 
 //G4_Hf  index=72
-  G4float M72[NDENSARRAY]={66.770,2.174,5.7139,0.1965,3.4337,0.22918,2.6155,0.14,0.035};
+  G4double M72[NDENSARRAY]={66.770,2.174,5.7139,0.1965,3.4337,0.22918,2.6155,0.14,0.035};
   AddMaterial(M72,"G4_Hf");
   indexZ[72]=72;
 
 //G4_Ta  index=73
-  G4float M73[NDENSARRAY]={74.692,2.07,5.5262,0.2117,3.4805,0.17798,2.7623,0.14,0.03};
+  G4double M73[NDENSARRAY]={74.692,2.07,5.5262,0.2117,3.4805,0.17798,2.7623,0.14,0.03};
   AddMaterial(M73,"G4_Ta");
   indexZ[73]=73;
 //G4_W  index=74
-  G4float M74[NDENSARRAY]={80.315,1.997,5.4059,0.2167,3.496,0.15509,2.8447,0.14,0.027};
+  G4double M74[NDENSARRAY]={80.315,1.997,5.4059,0.2167,3.496,0.15509,2.8447,0.14,0.027};
   AddMaterial(M74,"G4_W");
   indexZ[74]=74;
 
 //G4_Re  index=75
-  G4float M75[NDENSARRAY]={83.846,1.976,5.3445,0.0559,3.4845,0.15184,2.8627,0.08,0.026};
+  G4double M75[NDENSARRAY]={83.846,1.976,5.3445,0.0559,3.4845,0.15184,2.8627,0.08,0.026};
   AddMaterial(M75,"G4_Re");
   indexZ[75]=75;
 
 //G4_Os  index=76
-  G4float M76[NDENSARRAY]={86.537,1.947,5.3083,0.0891,3.5414,0.12751,2.9608,0.10,0.023};
+  G4double M76[NDENSARRAY]={86.537,1.947,5.3083,0.0891,3.5414,0.12751,2.9608,0.10,0.023};
   AddMaterial(M76,"G4_Os");
   indexZ[76]=76;
 
 //G4_Ir  index=77
-  G4float M77[NDENSARRAY]={86.357,1.927,5.3418,0.0819,3.5480,0.12690,2.9658,0.10,0.023};
+  G4double M77[NDENSARRAY]={86.357,1.927,5.3418,0.0819,3.5480,0.12690,2.9658,0.10,0.023};
   AddMaterial(M77,"G4_Ir");
   indexZ[77]=77;
 
 //G4_Pt  index=78
-  G4float M78[NDENSARRAY]={84.389,1.965,5.4732,0.1484,3.6212,0.11128,3.0417,0.12,0.021};
+  G4double M78[NDENSARRAY]={84.389,1.965,5.4732,0.1484,3.6212,0.11128,3.0417,0.12,0.021};
   AddMaterial(M78,"G4_Pt");
   indexZ[78]=78;
 
 //G4_Au  index=79
-  G4float M79[NDENSARRAY]={80.215,1.926,5.5747,0.2021,3.6979,0.09756,3.1101,0.14,0.020};
+  G4double M79[NDENSARRAY]={80.215,1.926,5.5747,0.2021,3.6979,0.09756,3.1101,0.14,0.020};
   AddMaterial(M79,"G4_Au");
   indexZ[79]=79;
 
 //G4_Hg  index=80
-  G4float M80[NDENSARRAY]={66.977,1.904,5.9605,0.2756,3.7275,0.11014,3.0519,0.14,0.021};
+  G4double M80[NDENSARRAY]={66.977,1.904,5.9605,0.2756,3.7275,0.11014,3.0519,0.14,0.021};
   AddMaterial(M80,"G4_Hg");
   indexZ[80]=80;
 
 //G4_Tl  index=81
-  G4float M81[NDENSARRAY]={62.104,1.814,6.1365,0.3491,3.8044,0.09455,3.1450,0.14,0.019};
+  G4double M81[NDENSARRAY]={62.104,1.814,6.1365,0.3491,3.8044,0.09455,3.1450,0.14,0.019};
   AddMaterial(M81,"G4_Tl");
   indexZ[81]=81;
 
 //G4_Pb  index=82
-  G4float M82[NDENSARRAY]={61.072,1.755,6.2018,0.3776,3.8073,0.09359,3.1608,0.14,0.019};
+  G4double M82[NDENSARRAY]={61.072,1.755,6.2018,0.3776,3.8073,0.09359,3.1608,0.14,0.019};
   AddMaterial(M82,"G4_Pb");
   indexZ[82]=82;
 
 //G4_Bi  index=83
-  G4float M83[NDENSARRAY]={56.696,1.684,6.3505,0.4152,3.8248,0.0941,3.1671,0.14,0.02};
+  G4double M83[NDENSARRAY]={56.696,1.684,6.3505,0.4152,3.8248,0.0941,3.1671,0.14,0.02};
   AddMaterial(M83,"G4_Bi");
   indexZ[83]=83;
 
 //G4_Po  index=84
-  G4float M84[NDENSARRAY]={55.773,1.637,6.4003,0.4267,3.8293,0.09282,3.183,0.14,0.02};
+  G4double M84[NDENSARRAY]={55.773,1.637,6.4003,0.4267,3.8293,0.09282,3.183,0.14,0.02};
   AddMaterial(M84,"G4_Po");
   indexZ[84]=84;
 
 //G4_Rn  index=85
-  G4float M85[NDENSARRAY]={1.708,1.458,13.2839,1.5368,4.9889,0.20798,2.7409,0,0.057};
+  G4double M85[NDENSARRAY]={1.708,1.458,13.2839,1.5368,4.9889,0.20798,2.7409,0,0.057};
   AddMaterial(M85,"G4_Rn");
   indexZ[86]=85;
 
 //G4_Ra  index=86
-  G4float M86[NDENSARRAY]={40.205,1.403,7.0452,0.5991,3.9428,0.08804,3.2454,0.14,0.022};
+  G4double M86[NDENSARRAY]={40.205,1.403,7.0452,0.5991,3.9428,0.08804,3.2454,0.14,0.022};
   AddMaterial(M86,"G4_Ra");
   indexZ[88]=86;
 
 //G4_Ac  index=87
-  G4float M87[NDENSARRAY]={57.254,1.380,6.3742,0.4559,3.7966,0.08567,3.2683,0.14,0.023};
+  G4double M87[NDENSARRAY]={57.254,1.380,6.3742,0.4559,3.7966,0.08567,3.2683,0.14,0.023};
   AddMaterial(M87,"G4_Ac");
   indexZ[89]=87;
 
 //G4_Th  index=88
-  G4float M88[NDENSARRAY]={61.438,1.363,6.2473,0.4202,3.7681,0.08655,3.2610,0.14,0.025};
+  G4double M88[NDENSARRAY]={61.438,1.363,6.2473,0.4202,3.7681,0.08655,3.2610,0.14,0.025};
   AddMaterial(M88,"G4_Th");
   indexZ[90]=88;
 
 //G4_Pa  index=89
-  G4float M89[NDENSARRAY]={70.901,1.42,6.0327,0.3144,3.5079,.14770,2.9845,0.14,0.036};
+  G4double M89[NDENSARRAY]={70.901,1.42,6.0327,0.3144,3.5079,.14770,2.9845,0.14,0.036};
   AddMaterial(M89,"G4_Pa");
   indexZ[91]=89;
 
 //G4_U  index=90
-  G4float M90[NDENSARRAY]={77.986,1.447,5.8694,0.2260,3.3721,.19677,2.8171,0.14,0.043};
+  G4double M90[NDENSARRAY]={77.986,1.447,5.8694,0.2260,3.3721,.19677,2.8171,0.14,0.043};
   AddMaterial(M90,"G4_U");
   indexZ[92]=90;
 
 //G4_Np  index=91
-  G4float M91[NDENSARRAY]={81.221,1.468,5.8149,0.1869,3.369,0.19741,2.8082,0.14,0.043};
+  G4double M91[NDENSARRAY]={81.221,1.468,5.8149,0.1869,3.369,0.19741,2.8082,0.14,0.043};
   AddMaterial(M91,"G4_Np");
   indexZ[93]=91;
 
 //G4_Pu  index=92
-  G4float M92[NDENSARRAY]={80.486,1.519,5.8748,0.1557,3.3981,0.20419,2.7679,0.14,0.057};
+  G4double M92[NDENSARRAY]={80.486,1.519,5.8748,0.1557,3.3981,0.20419,2.7679,0.14,0.057};
   AddMaterial(M92,"G4_Pu");
   indexZ[94]=92;
 
 //G4_Am  index=93
-  G4float M93[NDENSARRAY]={66.607,1.552,6.2813,0.2274,3.5021,0.20308,2.7615,0.14,0.056};
+  G4double M93[NDENSARRAY]={66.607,1.552,6.2813,0.2274,3.5021,0.20308,2.7615,0.14,0.056};
   AddMaterial(M93,"G4_Am");
   indexZ[95]=93;
 
 //G4_Cm  index=94
-  G4float M94[NDENSARRAY]={66.022,1.559,6.3097,0.2484,3.516,.20257,2.7579,0.14,0.056};
+  G4double M94[NDENSARRAY]={66.022,1.559,6.3097,0.2484,3.516,.20257,2.7579,0.14,0.056};
   AddMaterial(M94,"G4_Cm");
   indexZ[96]=94;
 
 //G4_Bk  index=95
-  G4float M95[NDENSARRAY]={67.557,1.574,6.2912,0.2378,3.5186,.20192,2.7560,0.14,0.062};
+  G4double M95[NDENSARRAY]={67.557,1.574,6.2912,0.2378,3.5186,.20192,2.7560,0.14,0.062};
   AddMaterial(M95,"G4_Bk");
   indexZ[97]=95;
 
 //G4_A-150_TISSUE  index=96
-  G4float M96[NDENSARRAY]={22.667,1.950,3.1100,0.1329,2.6234,0.10783,3.4442,0,0.048};
+  G4double M96[NDENSARRAY]={22.667,1.950,3.1100,0.1329,2.6234,0.10783,3.4442,0,0.048};
   AddMaterial(M96,"G4_A-150_TISSUE");
 
 //G4_ACETONE  index=97
-  G4float M97[NDENSARRAY]={19.010,1.976,3.4341,0.2197,2.6928,0.11100,3.4047,0,0.069};
+  G4double M97[NDENSARRAY]={19.010,1.976,3.4341,0.2197,2.6928,0.11100,3.4047,0,0.069};
   AddMaterial(M97,"G4_ACETONE");
 
 //G4_ACETYLENE  index=98
-  G4float M98[NDENSARRAY]={0.700,1.784,9.8419,1.6017,4.0074,0.12167,3.4277,0,0.080};
+  G4double M98[NDENSARRAY]={0.700,1.784,9.8419,1.6017,4.0074,0.12167,3.4277,0,0.080};
   AddMaterial(M98,"G4_ACETYLENE");
 
 //G4_ADENINE  index=99
-  G4float M99[NDENSARRAY]={24.098,1.892,3.1724,0.1295,2.4219,0.20908,3.0271,0,0.052};
+  G4double M99[NDENSARRAY]={24.098,1.892,3.1724,0.1295,2.4219,0.20908,3.0271,0,0.052};
   AddMaterial(M99,"G4_ADENINE");
 
 //G4_ADIPOSE_TISSUE_ICRP  index=100
-  G4float M100[NDENSARRAY]={20.655,1.987,3.2367,0.1827,2.6530,0.10278,3.4817,0,0.060};
+  G4double M100[NDENSARRAY]={20.655,1.987,3.2367,0.1827,2.6530,0.10278,3.4817,0,0.060};
   AddMaterial(M100,"G4_ADIPOSE_TISSUE_ICRP");
 
 //G4_AIR  index=101
-  G4float M101[NDENSARRAY]={0.707,2.054,10.5961,1.7418,4.2759,0.10914,3.3994,0,0.090};
+  G4double M101[NDENSARRAY]={0.707,2.054,10.5961,1.7418,4.2759,0.10914,3.3994,0,0.090};
   AddMaterial(M101,"G4_AIR");
 
 //G4_ALANINE  index=102
-  G4float M102[NDENSARRAY]={25.204,2.074,3.0965,0.1354,2.6336,0.11484,3.3526,0,0.056};
+  G4double M102[NDENSARRAY]={25.204,2.074,3.0965,0.1354,2.6336,0.11484,3.3526,0,0.056};
   AddMaterial(M102,"G4_ALANINE");
 
 //G4_ALUMINIM_OXIDE  index=103
-  G4float M103[NDENSARRAY]={40.206,2.394,3.5682,0.0402,2.8665,0.08500,3.5458,0,0.031};
+  G4double M103[NDENSARRAY]={40.206,2.394,3.5682,0.0402,2.8665,0.08500,3.5458,0,0.031};
   AddMaterial(M103,"G4_ALUMINIM_OXIDE");
 
 //G4_AMBER  index=104
-  G4float M104[NDENSARRAY]={22.450,1.946,3.0701,0.1335,2.5610,0.11934,3.4098,0,0.053};
+  G4double M104[NDENSARRAY]={22.450,1.946,3.0701,0.1335,2.5610,0.11934,3.4098,0,0.053};
   AddMaterial(M104,"G4_AMBER");
 
 //G4_AMMONIA  index=105
-  G4float M105[NDENSARRAY]={0.635,1.814,9.8763,1.6822,4.1158,0.08315,3.6464,0,0.102};
+  G4double M105[NDENSARRAY]={0.635,1.814,9.8763,1.6822,4.1158,0.08315,3.6464,0,0.102};
   AddMaterial(M105,"G4_AMMONIA");
 
 //G4_ANILINE  index=106
-  G4float M106[NDENSARRAY]={21.361,1.938,3.2622,0.1618,2.5805,0.13134,3.3434,0,0.052};
+  G4double M106[NDENSARRAY]={21.361,1.938,3.2622,0.1618,2.5805,0.13134,3.3434,0,0.052};
   AddMaterial(M106,"G4_ANILINE");
 
 //G4_ANTHRACENE  index=107
-  G4float M107[NDENSARRAY]={23.704,1.954,3.1514,0.1146,2.5213,0.14677,3.2831,0,0.042};
+  G4double M107[NDENSARRAY]={23.704,1.954,3.1514,0.1146,2.5213,0.14677,3.2831,0,0.042};
   AddMaterial(M107,"G4_ANTHRACENE");
 
 //G4_B-100_BONE  index=108
-  G4float M108[NDENSARRAY]={25.199,2.013,3.4528,0.1252,3.042,0.05268,3.7365,0,0.043};
+  G4double M108[NDENSARRAY]={25.199,2.013,3.4528,0.1252,3.042,0.05268,3.7365,0,0.043};
   AddMaterial(M108,"G4_B-100_BONE");
 
 //G4_BAKELITE  index=109
-  G4float M109[NDENSARRAY]={23.408,2.046,3.2582,0.1471,2.6055,0.12713,3.347,0,0.052};
+  G4double M109[NDENSARRAY]={23.408,2.046,3.2582,0.1471,2.6055,0.12713,3.347,0,0.052};
   AddMaterial(M109,"G4_BAKELITE");
 
 //G4_BARIUM_FLUORIDE  index=110
-  G4float M110[NDENSARRAY]={41.398,1.727,5.4122,-0.0098,3.3871,0.15991,2.8867,0,0.034};
+  G4double M110[NDENSARRAY]={41.398,1.727,5.4122,-0.0098,3.3871,0.15991,2.8867,0,0.034};
   AddMaterial(M110,"G4_BARIUM_FLUORIDE");
 
 //G4_BARIUM_SULFATE  index=111
-  G4float M111[NDENSARRAY]={40.805,1.893,4.8923,-0.0128,3.4069,0.11747,3.0427,0,0.03};
+  G4double M111[NDENSARRAY]={40.805,1.893,4.8923,-0.0128,3.4069,0.11747,3.0427,0,0.03};
   AddMaterial(M111,"G4_BARIUM_SULFATE");
 
 //G4_BENZENE  index=112
-  G4float M112[NDENSARRAY]={19.806,1.873,3.3269,0.171,2.5091,0.16519,3.2174,0,0.052};
+  G4double M112[NDENSARRAY]={19.806,1.873,3.3269,0.171,2.5091,0.16519,3.2174,0,0.052};
   AddMaterial(M112,"G4_BENZENE");
 
 //G4_BERYLLIUM_OXIDE  index=113
-  G4float M113[NDENSARRAY]={34.629,2.296,2.9801,0.0241,2.5846,0.10755,3.4927,0,0.031};
+  G4double M113[NDENSARRAY]={34.629,2.296,2.9801,0.0241,2.5846,0.10755,3.4927,0,0.031};
   AddMaterial(M113,"G4_BERYLLIUM_OXIDE");
 
 //G4_BGO  index=114
-  G4float M114[NDENSARRAY]={49.904,2.121,5.7409,0.0456,3.7816,0.09569,3.0781,0,0.023};
+  G4double M114[NDENSARRAY]={49.904,2.121,5.7409,0.0456,3.7816,0.09569,3.0781,0,0.023};
   AddMaterial(M114,"G4_BGO");
 
 //G4_BLOOD_ICRP  index=115
-  G4float M115[NDENSARRAY]={22.001,2.184,3.4581,0.2239,2.8017,0.08492,3.5406,0,0.088};
+  G4double M115[NDENSARRAY]={22.001,2.184,3.4581,0.2239,2.8017,0.08492,3.5406,0,0.088};
   AddMaterial(M115,"G4_BLOOD_ICRP");
 
 //G4_BONE_COMPACT_ICRU  index=116
-  G4float M116[NDENSARRAY]={28.536,2.091,3.3390,0.0944,3.0201,0.05822,3.6419,0,0.042};
+  G4double M116[NDENSARRAY]={28.536,2.091,3.3390,0.0944,3.0201,0.05822,3.6419,0,0.042};
   AddMaterial(M116,"G4_BONE_COMPACT_ICRU");
 
 //G4_BONE_CORTICAL_ICRP  index=117
-  G4float M117[NDENSARRAY]={28.298,2.118,3.6488,0.1161,3.0919,0.06198,3.5919,0,0.04};
+  G4double M117[NDENSARRAY]={28.298,2.118,3.6488,0.1161,3.0919,0.06198,3.5919,0,0.04};
   AddMaterial(M117,"G4_BONE_CORTICAL_ICRP");
 
 //G4_BORON_CARBIDE  index=118
-  G4float M118[NDENSARRAY]={31.38,2.14,2.9859,0.0093,2.1006,0.37087,2.8076,0,0.022};
+  G4double M118[NDENSARRAY]={31.38,2.14,2.9859,0.0093,2.1006,0.37087,2.8076,0,0.022};
   AddMaterial(M118,"G4_BORON_CARBIDE");
 
 //G4_BORON_OXIDE  index=119
-  G4float M119[NDENSARRAY]={27.107,2.446,3.6027,0.1843,2.7379,0.11548,3.3832,0,0.053};
+  G4double M119[NDENSARRAY]={27.107,2.446,3.6027,0.1843,2.7379,0.11548,3.3832,0,0.053};
   AddMaterial(M119,"G4_BORON_OXIDE");
 
 //G4_BRAIN_ICRP  index=120
-  G4float M120[NDENSARRAY]={21.772,2.162,3.4279,0.2206,2.8021,0.08255,3.5585,0,0.086};
+  G4double M120[NDENSARRAY]={21.772,2.162,3.4279,0.2206,2.8021,0.08255,3.5585,0,0.086};
   AddMaterial(M120,"G4_BRAIN_ICRP");
 
 //G4_BUTANE  index=121
-  G4float M121[NDENSARRAY]={1.101,1.727,8.5633,1.3788,3.7524,0.10852,3.4184,0,0.1};
+  G4double M121[NDENSARRAY]={1.101,1.727,8.5633,1.3788,3.7524,0.10852,3.4184,0,0.1};
   AddMaterial(M121,"G4_BUTANE");
 
 //G4_N-BUTYL_ALCOHOL  index=122
-  G4float M122[NDENSARRAY]={19.52,1.942,3.2425,0.1937,2.6439,0.10081,3.5139,0,0.065};
+  G4double M122[NDENSARRAY]={19.52,1.942,3.2425,0.1937,2.6439,0.10081,3.5139,0,0.065};
   AddMaterial(M122,"G4_N-BUTYL_ALCOHOL");
 
 //G4_C-552  index=123
-  G4float M123[NDENSARRAY]={27.023,2.128,3.3338,0.151,2.7083,0.10492,3.4344,0,0.053};
+  G4double M123[NDENSARRAY]={27.023,2.128,3.3338,0.151,2.7083,0.10492,3.4344,0,0.053};
   AddMaterial(M123,"G4_C-552");
 
 //G4_CADMIUM_TELLURIDE  index=124
-  G4float M124[NDENSARRAY]={46.314,1.935,5.9096,0.0438,3.2836,0.2484,2.6665,0,0.057};
+  G4double M124[NDENSARRAY]={46.314,1.935,5.9096,0.0438,3.2836,0.2484,2.6665,0,0.057};
   AddMaterial(M124,"G4_CADMIUM_TELLURIDE");
 
 //G4_CADMIUM_TUNGSTATE  index=125
-  G4float M125[NDENSARRAY]={52.954,2.289,5.3594,0.0123,3.5941,0.12861,2.915,0,0.027};
+  G4double M125[NDENSARRAY]={52.954,2.289,5.3594,0.0123,3.5941,0.12861,2.915,0,0.027};
   AddMaterial(M125,"G4_CADMIUM_TUNGSTATE");
 
 //G4_CALCIUM_CARBONATE  index=126
-  G4float M126[NDENSARRAY]={34.08,2.141,3.7738,0.0492,3.0549,0.08301,3.412,0,0.037};
+  G4double M126[NDENSARRAY]={34.08,2.141,3.7738,0.0492,3.0549,0.08301,3.412,0,0.037};
   AddMaterial(M126,"G4_CALCIUM_CARBONATE");
 
 //G4_CALCIUM_FLUORIDE  index=127
-  G4float M127[NDENSARRAY]={35.849,2.127,4.0653,0.0676,3.1683,0.06942,3.5263,0,0.044};
+  G4double M127[NDENSARRAY]={35.849,2.127,4.0653,0.0676,3.1683,0.06942,3.5263,0,0.044};
   AddMaterial(M127,"G4_CALCIUM_FLUORIDE");
 
 //G4_CALCIUM_OXIDE  index=128
-  G4float M128[NDENSARRAY]={36.988,1.973,4.1209,-0.0172,3.0171,0.12128,3.1936,0,0.024};
+  G4double M128[NDENSARRAY]={36.988,1.973,4.1209,-0.0172,3.0171,0.12128,3.1936,0,0.024};
   AddMaterial(M128,"G4_CALCIUM_OXIDE");
 
 //G4_CALCIUM_SULFATE  index=129
-  G4float M129[NDENSARRAY]={35.038,2.179,3.9388,0.0587,3.1229,0.07708,3.4495,0,0.021};
+  G4double M129[NDENSARRAY]={35.038,2.179,3.9388,0.0587,3.1229,0.07708,3.4495,0,0.021};
   AddMaterial(M129,"G4_CALCIUM_SULFATE");
 
 //G4_CALCIUM_TUNGSTATE  index=130
-  G4float M130[NDENSARRAY]={46.934,2.262,5.2603,0.0323,3.8932,0.0621,3.2649,0,0.021};
+  G4double M130[NDENSARRAY]={46.934,2.262,5.2603,0.0323,3.8932,0.0621,3.2649,0,0.021};
   AddMaterial(M130,"G4_CALCIUM_TUNGSTATE");
 
 //G4_CARBON_DIOXIDE  index=131
-  G4float M131[NDENSARRAY]={0.874,2.118,10.1537,1.6294,4.1825,0.11768,3.3227,0,0.091};
+  G4double M131[NDENSARRAY]={0.874,2.118,10.1537,1.6294,4.1825,0.11768,3.3227,0,0.091};
   AddMaterial(M131,"G4_CARBON_DIOXIDE");
 
 //G4_CARBON_TETRACHLORIDE  index=132
-  G4float M132[NDENSARRAY]={25.234,1.742,4.7712,0.1773,2.9165,0.19018,3.0116,0,0.041};
+  G4double M132[NDENSARRAY]={25.234,1.742,4.7712,0.1773,2.9165,0.19018,3.0116,0,0.041};
   AddMaterial(M132,"G4_CARBON_TETRACHLORIDE");
 
 //G4_CELLULOSE_CELLOPHANE  index=133
-  G4float M133[NDENSARRAY]={25.008,2.17,3.2647,0.158,2.6778,0.11151,3.381,0,0.06};
+  G4double M133[NDENSARRAY]={25.008,2.17,3.2647,0.158,2.6778,0.11151,3.381,0,0.06};
   AddMaterial(M133,"G4_CELLULOSE_CELLOPHANE");
 
 //G4_CELLULOSE_BUTYRATE  index=134
-  G4float M134[NDENSARRAY]={23.041,2.128,3.3497,0.1794,2.6809,0.11444,3.3738,0,0.056};
+  G4double M134[NDENSARRAY]={23.041,2.128,3.3497,0.1794,2.6809,0.11444,3.3738,0,0.056};
   AddMaterial(M134,"G4_CELLULOSE_BUTYRATE");
 
 //G4_CELLULOSE_NITRATE  index=135
-  G4float M135[NDENSARRAY]={25.224,2.252,3.4762,0.1897,2.7253,0.11813,3.3237,0,0.063};
+  G4double M135[NDENSARRAY]={25.224,2.252,3.4762,0.1897,2.7253,0.11813,3.3237,0,0.063};
   AddMaterial(M135,"G4_CELLULOSE_NITRATE");
 
 //G4_CERIC_SULFATE  index=136
-  G4float M136[NDENSARRAY]={21.743,2.205,3.5212,0.2363,2.8769,0.07666,3.5607,0,0.095};
+  G4double M136[NDENSARRAY]={21.743,2.205,3.5212,0.2363,2.8769,0.07666,3.5607,0,0.095};
   AddMaterial(M136,"G4_CERIC_SULFATE");
 
 //G4_CESIUM_FLUORIDE  index=137
-  G4float M137[NDENSARRAY]={37.942,1.714,5.9046,0.0084,3.3374,0.22052,2.728,0,0.044};
+  G4double M137[NDENSARRAY]={37.942,1.714,5.9046,0.0084,3.3374,0.22052,2.728,0,0.044};
   AddMaterial(M137,"G4_CESIUM_FLUORIDE");
 
 //G4_CESIUM_IODIDE  index=138
-  G4float M138[NDENSARRAY]={39.455,1.672,6.2807,0.0395,3.3353,0.25381,2.6657,0,0.067};
+  G4double M138[NDENSARRAY]={39.455,1.672,6.2807,0.0395,3.3353,0.25381,2.6657,0,0.067};
   AddMaterial(M138,"G4_CESIUM_IODIDE");
 
 //G4_CHLOROBENZENE  index=139
-  G4float M139[NDENSARRAY]={21.752,1.889,3.8201,0.1714,2.9272,0.09856,3.3797,0,0.031};
+  G4double M139[NDENSARRAY]={21.752,1.889,3.8201,0.1714,2.9272,0.09856,3.3797,0,0.031};
   AddMaterial(M139,"G4_CHLOROBENZENE");
 
 //G4_CHLOROFORM  index=140
-  G4float M140[NDENSARRAY]={24.462,1.734,4.7055,0.1786,2.9581,0.16959,3.0627,0,0.038};
+  G4double M140[NDENSARRAY]={24.462,1.734,4.7055,0.1786,2.9581,0.16959,3.0627,0,0.038};
   AddMaterial(M140,"G4_CHLOROFORM");
 
 //G4_CONCRETE  index=141
-  G4float M141[NDENSARRAY]={30.986,2.322,3.9464,0.1301,3.0466,0.07515,3.5467,0,0.024};
+  G4double M141[NDENSARRAY]={30.986,2.322,3.9464,0.1301,3.0466,0.07515,3.5467,0,0.024};
   AddMaterial(M141,"G4_CONCRETE");
 
 //G4_CYCLOHEXANE  index=142
-  G4float M142[NDENSARRAY]={19.207,1.861,3.1544,0.1728,2.5549,0.12035,3.4278,0,0.057};
+  G4double M142[NDENSARRAY]={19.207,1.861,3.1544,0.1728,2.5549,0.12035,3.4278,0,0.057};
   AddMaterial(M142,"G4_CYCLOHEXANE");
 
 //G4_1,2-DICHLOROBENZENE  index=143
-  G4float M143[NDENSARRAY]={23.354,1.862,4.0348,0.1587,2.8276,0.1601,3.0836,0,0.029};
+  G4double M143[NDENSARRAY]={23.354,1.862,4.0348,0.1587,2.8276,0.1601,3.0836,0,0.029};
   AddMaterial(M143,"G4_1,2-DICHLOROBENZENE");
 
 //G4_DICHLORODIETHYL_ETHER  index=144
-  G4float M144[NDENSARRAY]={22.894,1.903,4.0135,0.1773,3.1586,0.06799,3.525,0,0.026};
+  G4double M144[NDENSARRAY]={22.894,1.903,4.0135,0.1773,3.1586,0.06799,3.525,0,0.026};
   AddMaterial(M144,"G4_DICHLORODIETHYL_ETHER");
 
 //G4_1,2-DICHLOROETHANE  index=145
-  G4float M145[NDENSARRAY]={22.764,1.618,4.1849,0.1375,2.9529,0.13383,3.1675,0,0.03};
+  G4double M145[NDENSARRAY]={22.764,1.618,4.1849,0.1375,2.9529,0.13383,3.1675,0,0.03};
   AddMaterial(M145,"G4_1,2-DICHLOROETHANE");
 
 //G4_DIETHYL_ETHER  index=146
-  G4float M146[NDENSARRAY]={18.326,1.951,3.3721,0.2231,2.6745,0.1055,3.4586,0,0.07};
+  G4double M146[NDENSARRAY]={18.326,1.951,3.3721,0.2231,2.6745,0.1055,3.4586,0,0.07};
   AddMaterial(M146,"G4_DIETHYL_ETHER");
 
 //G4_N,N-DIMETHYL_FORMAMIDE  index=147
-  G4float M147[NDENSARRAY]={20.763,2.005,3.3311,0.1977,2.6686,0.1147,3.371,0,0.065};
+  G4double M147[NDENSARRAY]={20.763,2.005,3.3311,0.1977,2.6686,0.1147,3.371,0,0.065};
   AddMaterial(M147,"G4_N,N-DIMETHYL_FORMAMIDE");
 
 //G4_DIMETHYL_SULFOXIDE  index=148
-  G4float M148[NDENSARRAY]={22.173,2.075,3.9844,0.2021,3.1263,0.06619,3.5708,0,0.03};
+  G4double M148[NDENSARRAY]={22.173,2.075,3.9844,0.2021,3.1263,0.06619,3.5708,0,0.03};
   AddMaterial(M148,"G4_DIMETHYL_SULFOXIDE");
 
 //G4_ETHANE  index=149
-  G4float M149[NDENSARRAY]={0.789,1.69,9.1043,1.5107,3.8743,0.09627,3.6095,0,0.097};
+  G4double M149[NDENSARRAY]={0.789,1.69,9.1043,1.5107,3.8743,0.09627,3.6095,0,0.097};
   AddMaterial(M149,"G4_ETHANE");
 
 //G4_ETHYL_ALCOHOL  index=150
-  G4float M150[NDENSARRAY]={19.232,2.013,3.3699,0.2218,2.7052,0.09878,3.4834,0,0.071};
+  G4double M150[NDENSARRAY]={19.232,2.013,3.3699,0.2218,2.7052,0.09878,3.4834,0,0.071};
   AddMaterial(M150,"G4_ETHYL_ALCOHOL");
 
 //G4_ETHYL_CELLULOSE  index=151
-  G4float M151[NDENSARRAY]={22.594,2.065,3.2415,0.1683,2.6527,0.11077,3.4098,0,0.057};
+  G4double M151[NDENSARRAY]={22.594,2.065,3.2415,0.1683,2.6527,0.11077,3.4098,0,0.057};
   AddMaterial(M151,"G4_ETHYL_CELLULOSE");
 
 //G4_ETHYLENE  index=152
-  G4float M152[NDENSARRAY]={0.746,1.733,9.438,1.5528,3.9327,0.10636,3.5387,0,0.085};
+  G4double M152[NDENSARRAY]={0.746,1.733,9.438,1.5528,3.9327,0.10636,3.5387,0,0.085};
   AddMaterial(M152,"G4_ETHYLENE");
 
 //G4_EYE_LENS_ICRP  index=153
-  G4float M153[NDENSARRAY]={22.388,2.154,3.372,0.207,2.7446,0.0969,3.455,0,0.077};
+  G4double M153[NDENSARRAY]={22.388,2.154,3.372,0.207,2.7446,0.0969,3.455,0,0.077};
   AddMaterial(M153,"G4_EYE_LENS_ICRP");
 
 //G4_FERRIC_OXIDE  index=154
-  G4float M154[NDENSARRAY]={45.331,2.747,4.2245,-0.0074,3.2573,0.10478,3.1313,0,0.026};
+  G4double M154[NDENSARRAY]={45.331,2.747,4.2245,-0.0074,3.2573,0.10478,3.1313,0,0.026};
   AddMaterial(M154,"G4_FERRIC_OXIDE");
 
 //G4_FERROBORIDE  index=155
-  G4float M155[NDENSARRAY]={52.546,2.726,4.2057,-0.0988,3.1749,0.12911,3.024,0,0.022};
+  G4double M155[NDENSARRAY]={52.546,2.726,4.2057,-0.0988,3.1749,0.12911,3.024,0,0.022};
   AddMaterial(M155,"G4_FERROBORIDE");
 
 //G4_FERROUS_OXIDE  index=156
-  G4float M156[NDENSARRAY]={47.327,2.769,4.3175,-0.0279,3.2002,0.12959,3.0168,0,0.022};
+  G4double M156[NDENSARRAY]={47.327,2.769,4.3175,-0.0279,3.2002,0.12959,3.0168,0,0.022};
   AddMaterial(M156,"G4_FERROUS_OXIDE");
 
 //G4_FERROUS_SULFATE  index=157
-  G4float M157[NDENSARRAY]={21.69,2.208,3.5183,0.2378,2.8254,0.08759,3.4923,0,0.096};
+  G4double M157[NDENSARRAY]={21.69,2.208,3.5183,0.2378,2.8254,0.08759,3.4923,0,0.096};
   AddMaterial(M157,"G4_FERROUS_SULFATE");
 
 //G4_FREON-12  index=158
-  G4float M158[NDENSARRAY]={21.121,1.974,4.8251,0.3035,3.2659,0.07978,3.4626,0,0.025};
+  G4double M158[NDENSARRAY]={21.121,1.974,4.8251,0.3035,3.2659,0.07978,3.4626,0,0.025};
   AddMaterial(M158,"G4_FREON-12");
 
 //G4_FREON-12B2  index=159
-  G4float M159[NDENSARRAY]={25.877,2.195,5.7976,0.3406,3.7956,0.05144,3.5565,0,0.021};
+  G4double M159[NDENSARRAY]={25.877,2.195,5.7976,0.3406,3.7956,0.05144,3.5565,0,0.021};
   AddMaterial(M159,"G4_FREON-12B2");
 
 //G4_FREON-13  index=160
-  G4float M160[NDENSARRAY]={19.432,2.116,4.7483,0.3659,3.2337,0.07238,3.5551,0,0.05};
+  G4double M160[NDENSARRAY]={19.432,2.116,4.7483,0.3659,3.2337,0.07238,3.5551,0,0.05};
   AddMaterial(M160,"G4_FREON-13");
 
 //G4_FREON-13B1  index=161
-  G4float M161[NDENSARRAY]={23.849,2.233,5.3555,0.3522,3.7554,0.03925,3.7194,0,0.036};
+  G4double M161[NDENSARRAY]={23.849,2.233,5.3555,0.3522,3.7554,0.03925,3.7194,0,0.036};
   AddMaterial(M161,"G4_FREON-13B1");
 
 //G4_FREON-13I1  index=162
-  G4float M162[NDENSARRAY]={25.615,1.924,5.8774,0.2847,3.728,0.09112,3.1658,0,0.025};
+  G4double M162[NDENSARRAY]={25.615,1.924,5.8774,0.2847,3.728,0.09112,3.1658,0,0.025};
   AddMaterial(M162,"G4_FREON-13I1");
 
 //G4_GADOLINIUM_OXYSULFIDE  index=163
-  G4float M163[NDENSARRAY]={51.099,2.179,5.5347,-0.1774,3.4045,0.22161,2.63,0,0.056};
+  G4double M163[NDENSARRAY]={51.099,2.179,5.5347,-0.1774,3.4045,0.22161,2.63,0,0.056};
   AddMaterial(M163,"G4_GADOLINIUM_OXYSULFIDE");
 
 //G4_GALLIUM_ARSENIDE  index=164
-  G4float M164[NDENSARRAY]={44.17,2.652,5.3299,0.1764,3.642,0.07152,3.3356,0,0.027};
+  G4double M164[NDENSARRAY]={44.17,2.652,5.3299,0.1764,3.642,0.07152,3.3356,0,0.027};
   AddMaterial(M164,"G4_GALLIUM_ARSENIDE");
 
 //G4_GEL_PHOTO_EMULSION  index=165
-  G4float M165[NDENSARRAY]={24.058,2.156,3.2687,0.1709,2.7058,0.10102,3.4418,0,0.06};
+  G4double M165[NDENSARRAY]={24.058,2.156,3.2687,0.1709,2.7058,0.10102,3.4418,0,0.06};
   AddMaterial(M165,"G4_GEL_PHOTO_EMULSION");
 
 //G4_Pyrex_Glass  index=166
-  G4float M166[NDENSARRAY]={30.339,2.369,3.9708,0.1479,2.9933,0.0827,3.5224,0,0.022};
+  G4double M166[NDENSARRAY]={30.339,2.369,3.9708,0.1479,2.9933,0.0827,3.5224,0,0.022};
   AddMaterial(M166,"G4_Pyrex_Glass");
 
 //G4_GLASS_LEAD  index=167
-  G4float M167[NDENSARRAY]={46.631,2.085,5.8476,0.0614,3.8146,0.09544,3.074,0,0.025};
+  G4double M167[NDENSARRAY]={46.631,2.085,5.8476,0.0614,3.8146,0.09544,3.074,0,0.025};
   AddMaterial(M167,"G4_GLASS_LEAD");
 
 //G4_GLASS_PLATE  index=168
-  G4float M168[NDENSARRAY]={31.481,2.329,4.0602,0.1237,3.0649,0.07678,3.5381,0,0.025};
+  G4double M168[NDENSARRAY]={31.481,2.329,4.0602,0.1237,3.0649,0.07678,3.5381,0,0.025};
   AddMaterial(M168,"G4_GLASS_PLATE");
 
 //G4_GLUCOSE  index=169
-  G4float M169[NDENSARRAY]={26.153,2.174,3.1649,0.1411,2.67,0.10783,3.3946,0,0.061};
+  G4double M169[NDENSARRAY]={26.153,2.174,3.1649,0.1411,2.67,0.10783,3.3946,0,0.061};
   AddMaterial(M169,"G4_GLUCOSE");
 
 //G4_GLUTAMINE  index=170
-  G4float M170[NDENSARRAY]={25.437,2.077,3.1167,0.1347,2.6301,0.11931,3.3254,0,0.055};
+  G4double M170[NDENSARRAY]={25.437,2.077,3.1167,0.1347,2.6301,0.11931,3.3254,0,0.055};
   AddMaterial(M170,"G4_GLUTAMINE");
 
 //G4_GLYCEROL  index=171
-  G4float M171[NDENSARRAY]={23.846,2.12,3.2267,0.1653,2.6862,0.10168,3.4481,0,0.067};
+  G4double M171[NDENSARRAY]={23.846,2.12,3.2267,0.1653,2.6862,0.10168,3.4481,0,0.067};
   AddMaterial(M171,"G4_GLYCEROL");
 
 //G4_GUANINE  index=172
-  G4float M172[NDENSARRAY]={26.022,1.97,3.1171,0.1163,2.4296,0.2053,3.0186,0,0.069};
+  G4double M172[NDENSARRAY]={26.022,1.97,3.1171,0.1163,2.4296,0.2053,3.0186,0,0.069};
   AddMaterial(M172,"G4_GUANINE");
 
 //G4_GYPSUM  index=173
-  G4float M173[NDENSARRAY]={31.379,2.187,3.8382,0.0995,3.1206,0.06949,3.5134,0,0.038};
+  G4double M173[NDENSARRAY]={31.379,2.187,3.8382,0.0995,3.1206,0.06949,3.5134,0,0.038};
   AddMaterial(M173,"G4_GYPSUM");
 
 //G4_N-HEPTANE  index=174
-  G4float M174[NDENSARRAY]={18.128,1.848,3.1978,0.1928,2.5706,0.11255,3.4885,0,0.059};
+  G4double M174[NDENSARRAY]={18.128,1.848,3.1978,0.1928,2.5706,0.11255,3.4885,0,0.059};
   AddMaterial(M174,"G4_N-HEPTANE");
 
 //G4_N-HEXANE  index=175
-  G4float M175[NDENSARRAY]={17.836,1.843,3.2156,0.1984,2.5757,0.11085,3.5027,0,0.061};
+  G4double M175[NDENSARRAY]={17.836,1.843,3.2156,0.1984,2.5757,0.11085,3.5027,0,0.061};
   AddMaterial(M175,"G4_N-HEXANE");
 
 //G4_KAPTON  index=176
-  G4float M176[NDENSARRAY]={24.586,2.109,3.3497,0.1509,2.5631,0.15972,3.1921,0,0.05};
+  G4double M176[NDENSARRAY]={24.586,2.109,3.3497,0.1509,2.5631,0.15972,3.1921,0,0.05};
   AddMaterial(M176,"G4_KAPTON");
 
 //G4_LANTHANUM_OXYBROMIDE  index=177
-  G4float M177[NDENSARRAY]={47.125,1.831,5.4666,-0.035,3.3288,0.1783,2.8457,0,0.04};
+  G4double M177[NDENSARRAY]={47.125,1.831,5.4666,-0.035,3.3288,0.1783,2.8457,0,0.04};
   AddMaterial(M177,"G4_LANTHANUM_OXYBROMIDE");
 
 //G4_LANTHANUM_OXYSULFIDE  index=178
-  G4float M178[NDENSARRAY]={45.394,1.681,5.6151,-0.0934,3.2741,0.22579,2.7075,0,0.065};
+  G4double M178[NDENSARRAY]={45.394,1.681,5.6151,-0.0934,3.2741,0.22579,2.7075,0,0.065};
   AddMaterial(M178,"G4_LANTHANUM_OXYSULFIDE");
 
 //G4_LEAD_OXIDE  index=179
-  G4float M179[NDENSARRAY]={56.488,2.012,6.2162,0.0356,3.5456,0.19645,2.7299,0,0.039};
+  G4double M179[NDENSARRAY]={56.488,2.012,6.2162,0.0356,3.5456,0.19645,2.7299,0,0.039};
   AddMaterial(M179,"G4_LEAD_OXIDE");
 
 //G4_LITHIUM_AMIDE  index=180
-  G4float M180[NDENSARRAY]={22.609,1.74,2.7961,0.0198,2.5152,0.0874,3.7534,0,0.05};
+  G4double M180[NDENSARRAY]={22.609,1.74,2.7961,0.0198,2.5152,0.0874,3.7534,0,0.05};
   AddMaterial(M180,"G4_LITHIUM_AMIDE");
 
 //G4_LITHIUM_CARBONATE index=181
-  G4float M181[NDENSARRAY]={29.217,2.246,3.2029,0.0551,2.6598,0.09936,3.5417,0,0.062};
+  G4double M181[NDENSARRAY]={29.217,2.246,3.2029,0.0551,2.6598,0.09936,3.5417,0,0.062};
   AddMaterial(M181,"G4_LITHIUM_CARBONATE");
 
 //G4_LITHIUM_FLUORIDE  index=182
-  G4float M182[NDENSARRAY]={31.815,2.197,3.1667,0.0171,2.7049,0.07593,3.7478,0,0.084};
+  G4double M182[NDENSARRAY]={31.815,2.197,3.1667,0.0171,2.7049,0.07593,3.7478,0,0.084};
   AddMaterial(M182,"G4_LITHIUM_FLUORIDE");
 
 //G4_LITHIUM_HYDRIDE  index=183
-  G4float M183[NDENSARRAY]={18.51,1.482,2.358,-0.0988,1.4515,0.90567,2.5849,0,0.035};
+  G4double M183[NDENSARRAY]={18.51,1.482,2.358,-0.0988,1.4515,0.90567,2.5849,0,0.035};
   AddMaterial(M183,"G4_LITHIUM_HYDRIDE");
 
 //G4_LITHIUM_IODIDE  index=184
-  G4float M184[NDENSARRAY]={34.841,1.706,6.2671,0.0892,3.3702,0.23274,2.7146,0,0.043};
+  G4double M184[NDENSARRAY]={34.841,1.706,6.2671,0.0892,3.3702,0.23274,2.7146,0,0.043};
   AddMaterial(M184,"G4_LITHIUM_IODIDE");
 
 //G4_LITHIUM_OXIDE  index=185
-  G4float M185[NDENSARRAY]={27.984,2.039,2.934,-0.0511,2.5874,0.08035,3.7878,0,0.043};
+  G4double M185[NDENSARRAY]={27.984,2.039,2.934,-0.0511,2.5874,0.08035,3.7878,0,0.043};
   AddMaterial(M185,"G4_LITHIUM_OXIDE");
 
 //G4_LITHIUM_TETRABORATE  index=186
-  G4float M186[NDENSARRAY]={31.343,2.36,3.2093,0.0737,2.6502,0.11075,3.4389,0,0.048};
+  G4double M186[NDENSARRAY]={31.343,2.36,3.2093,0.0737,2.6502,0.11075,3.4389,0,0.048};
   AddMaterial(M186,"G4_LITHIUM_TETRABORATE");
 
 //G4_LUNG_ICRP  index=187
-  G4float M187[NDENSARRAY]={21.891,2.184,3.4708,0.2261,2.8001,0.08588,3.5353,0,0.089};
+  G4double M187[NDENSARRAY]={21.891,2.184,3.4708,0.2261,2.8001,0.08588,3.5353,0,0.089};
   AddMaterial(M187,"G4_LUNG_ICRP");
 
 //G4_M3_WAX  index=188
-  G4float M188[NDENSARRAY]={22,1.975,3.254,0.1523,2.7529,0.07864,3.6412,0,0.044};
+  G4double M188[NDENSARRAY]={22,1.975,3.254,0.1523,2.7529,0.07864,3.6412,0,0.044};
   AddMaterial(M188,"G4_M3_WAX");
 
 //G4_MAGNESIUM_CARBONATE  index=189
-  G4float M189[NDENSARRAY]={34.979,2.388,3.4319,0.086,2.7997,0.09219,3.5003,0,0.045};
+  G4double M189[NDENSARRAY]={34.979,2.388,3.4319,0.086,2.7997,0.09219,3.5003,0,0.045};
   AddMaterial(M189,"G4_MAGNESIUM_CARBONATE");
 
 //G4_MAGNESIUM_FLUORIDE  index=190
-  G4float M190[NDENSARRAY]={34.634,2.33,3.7105,0.1369,2.863,0.07934,3.6485,0,0.085};
+  G4double M190[NDENSARRAY]={34.634,2.33,3.7105,0.1369,2.863,0.07934,3.6485,0,0.085};
   AddMaterial(M190,"G4_MAGNESIUM_FLUORIDE");
 
 //G4_MAGNESIUM_OXIDE  index=191
-  G4float M191[NDENSARRAY]={38.407,2.412,3.6404,0.0575,2.858,0.08313,3.5968,0,0.055};
+  G4double M191[NDENSARRAY]={38.407,2.412,3.6404,0.0575,2.858,0.08313,3.5968,0,0.055};
   AddMaterial(M191,"G4_MAGNESIUM_OXIDE");
 
 //G4_MAGNESIUM_TETRABORATE  index=192
-  G4float M192[NDENSARRAY]={32.089,2.43,3.4328,0.1147,2.7635,0.09703,3.4893,0,0.044};
+  G4double M192[NDENSARRAY]={32.089,2.43,3.4328,0.1147,2.7635,0.09703,3.4893,0,0.044};
   AddMaterial(M192,"G4_MAGNESIUM_TETRABORATE");
 
 //G4_MERCURIC_IODIDE  index=193
-  G4float M193[NDENSARRAY]={46.494,1.892,6.3787,0.104,3.4728,0.21513,2.7264,0,0.047};
+  G4double M193[NDENSARRAY]={46.494,1.892,6.3787,0.104,3.4728,0.21513,2.7264,0,0.047};
   AddMaterial(M193,"G4_MERCURIC_IODIDE");
 
 //G4_METHANE  index=194
-  G4float M194[NDENSARRAY]={0.588,1.662,9.5243,1.6263,3.9716,0.09253,3.6257,0,0.112};
+  G4double M194[NDENSARRAY]={0.588,1.662,9.5243,1.6263,3.9716,0.09253,3.6257,0,0.112};
   AddMaterial(M194,"G4_METHANE");
 
 //G4_METHANOL  index=195
-  G4float M195[NDENSARRAY]={19.214,2.125,3.516,0.2529,2.7639,0.0897,3.5477,0,0.08};
+  G4double M195[NDENSARRAY]={19.214,2.125,3.516,0.2529,2.7639,0.0897,3.5477,0,0.08};
   AddMaterial(M195,"G4_METHANOL");
 
 //G4_MIX_D_WAX  index=196
-  G4float M196[NDENSARRAY]={21.547,1.905,3.078,0.1371,2.7145,0.0749,3.6823,0,0.047};
+  G4double M196[NDENSARRAY]={21.547,1.905,3.078,0.1371,2.7145,0.0749,3.6823,0,0.047};
   AddMaterial(M196,"G4_MIX_D_WAX");
 
 //G4_MS20_TISSUE  index=197
-  G4float M197[NDENSARRAY]={21.153,2.07,3.5241,0.1997,2.8033,0.08294,3.6061,0,0.053};
+  G4double M197[NDENSARRAY]={21.153,2.07,3.5241,0.1997,2.8033,0.08294,3.6061,0,0.053};
   AddMaterial(M197,"G4_MS20_TISSUE");
 
 //G4_MUSCLE_SCELETAL_ICRP  index=198
-  G4float M198[NDENSARRAY]={21.781,2.185,3.4809,0.2282,2.7999,0.08636,3.533,0,0.089};
+  G4double M198[NDENSARRAY]={21.781,2.185,3.4809,0.2282,2.7999,0.08636,3.533,0,0.089};
   AddMaterial(M198,"G4_MUSCLE_SCELETAL_ICRP");
 
 //G4_MUSCLE_STRIATED_ICRU  index=199
-  G4float M199[NDENSARRAY]={21.795,2.174,3.4636,0.2249,2.8032,0.08507,3.5383,0,0.086};
+  G4double M199[NDENSARRAY]={21.795,2.174,3.4636,0.2249,2.8032,0.08507,3.5383,0,0.086};
   AddMaterial(M199,"G4_MUSCLE_STRIATED_ICRU");
 
 //G4_MUSCLE_WITH_SUCROSE  index=200
-  G4float M200[NDENSARRAY]={22.48,2.169,3.391,0.2098,2.755,0.09481,3.4699,0,0.08};
+  G4double M200[NDENSARRAY]={22.48,2.169,3.391,0.2098,2.755,0.09481,3.4699,0,0.08};
   AddMaterial(M200,"G4_MUSCLE_WITH_SUCROSE");
 
 //G4_MUSCLE_WITHOUT_SUCROSE  index=201
-  G4float M201[NDENSARRAY]={22.109,2.173,3.4216,0.2187,2.768,0.09143,3.4982,0,0.056};
+  G4double M201[NDENSARRAY]={22.109,2.173,3.4216,0.2187,2.768,0.09143,3.4982,0,0.056};
   AddMaterial(M201,"G4_MUSCLE_WITHOUT_SUCROSE");
 
 //G4_NAPHTALENE  index=202
-  G4float M202[NDENSARRAY]={22.459,1.956,3.2274,0.1374,2.5429,0.14766,3.2654,0,0.051};
+  G4double M202[NDENSARRAY]={22.459,1.956,3.2274,0.1374,2.5429,0.14766,3.2654,0,0.051};
   AddMaterial(M202,"G4_NAPHTALENE");
 
 //G4_NITROBENZENE  index=203
-  G4float M203[NDENSARRAY]={22.747,2.065,3.4073,0.1777,2.663,0.12727,3.3091,0,0.051};
+  G4double M203[NDENSARRAY]={22.747,2.065,3.4073,0.1777,2.663,0.12727,3.3091,0,0.051};
   AddMaterial(M203,"G4_NITROBENZENE");
 
 //G4_NITROUS_OXIDE  index=204
-  G4float M204[NDENSARRAY]={0.872,2.059,10.1575,1.6477,4.1565,0.11992,3.3318,0,0.086};
+  G4double M204[NDENSARRAY]={0.872,2.059,10.1575,1.6477,4.1565,0.11992,3.3318,0,0.086};
   AddMaterial(M204,"G4_NITROUS_OXIDE");
 
 //G4_NYLON-8062  index=205
-  G4float M205[NDENSARRAY]={22.221,1.967,3.125,0.1503,2.6004,0.11513,3.4044,0,0.054};
+  G4double M205[NDENSARRAY]={22.221,1.967,3.125,0.1503,2.6004,0.11513,3.4044,0,0.054};
   AddMaterial(M205,"G4_NYLON-8062");
 
 //G4_NYLON-6/6  index=206
-  G4float M206[NDENSARRAY]={22.774,1.931,3.0634,0.1336,2.5834,0.11818,3.3826,0,0.051};
+  G4double M206[NDENSARRAY]={22.774,1.931,3.0634,0.1336,2.5834,0.11818,3.3826,0,0.051};
   AddMaterial(M206,"G4_NYLON-6-6");
 
 //G4_NYLON-6/10  index=207
-  G4float M207[NDENSARRAY]={22.866,1.942,3.0333,0.1304,2.5681,0.11852,3.3912,0,0.05};
+  G4double M207[NDENSARRAY]={22.866,1.942,3.0333,0.1304,2.5681,0.11852,3.3912,0,0.05};
   AddMaterial(M207,"G4_NYLON-6-10");
 
 //G4_NYLON-11_RILSAN  index=208
-  G4float M208[NDENSARRAY]={25.661,1.902,2.7514,0.0678,2.4281,0.14868,3.2576,0,0.044};
+  G4double M208[NDENSARRAY]={25.661,1.902,2.7514,0.0678,2.4281,0.14868,3.2576,0,0.044};
   AddMaterial(M208,"G4_NYLON-11_RILSAN");
 
 //G4_OCTANE  index=209
-  G4float M209[NDENSARRAY]={18.36,1.851,3.1834,0.1882,2.5664,0.11387,3.4776,0,0.057};
+  G4double M209[NDENSARRAY]={18.36,1.851,3.1834,0.1882,2.5664,0.11387,3.4776,0,0.057};
   AddMaterial(M209,"G4_OCTANE");
 
 //G4_PARAFFIN  index=210
-  G4float M210[NDENSARRAY]={21.031,1.844,2.9551,0.1289,2.5084,0.12087,3.4288,0,0.052};
+  G4double M210[NDENSARRAY]={21.031,1.844,2.9551,0.1289,2.5084,0.12087,3.4288,0,0.052};
   AddMaterial(M210,"G4_PARAFFIN");
 
 //G4_N-PENTANE  index=211
-  G4float M211[NDENSARRAY]={17.398,1.842,3.2504,0.2086,2.5855,0.10809,3.5265,0,0.064};
+  G4double M211[NDENSARRAY]={17.398,1.842,3.2504,0.2086,2.5855,0.10809,3.5265,0,0.064};
   AddMaterial(M211,"G4_N-PENTANE");
 
 //G4_PHOTO_EMULSION  index=212
-  G4float M212[NDENSARRAY]={37.946,2.264,5.3319,0.1009,3.4866,0.12399,3.0094,0,0.028};
+  G4double M212[NDENSARRAY]={37.946,2.264,5.3319,0.1009,3.4866,0.12399,3.0094,0,0.028};
   AddMaterial(M212,"G4_PHOTO_EMULSION");
 
 //G4_PLASTIC_SC_VINYLTOLUENE  index=213
-  G4float M213[NDENSARRAY]={21.54,1.929,3.1997,0.1464,2.4855,0.16101,3.2393,0,0.05};
+  G4double M213[NDENSARRAY]={21.54,1.929,3.1997,0.1464,2.4855,0.16101,3.2393,0,0.05};
   AddMaterial(M213,"G4_PLASTIC_SC_VINYLTOLUENE");
 
 //G4_PLUTONIUM_DIOXIDE  index=214
-  G4float M214[NDENSARRAY]={62.143,1.846,5.9719,-0.2311,3.5554,0.20594,2.6522,0,0.111};
+  G4double M214[NDENSARRAY]={62.143,1.846,5.9719,-0.2311,3.5554,0.20594,2.6522,0,0.111};
   AddMaterial(M214,"G4_PLUTONIUM_DIOXIDE");
 
 //G4_POLYACRYLONITRILE  index=215
-  G4float M215[NDENSARRAY]={22.642,1.955,3.2459,0.1504,2.5159,0.16275,3.1975,0,0.05};
+  G4double M215[NDENSARRAY]={22.642,1.955,3.2459,0.1504,2.5159,0.16275,3.1975,0,0.05};
   AddMaterial(M215,"G4_POLYACRYLONITRILE");
 
 //G4_POLYCARBONATE  index=216
-  G4float M216[NDENSARRAY]={22.915,2.06,3.3201,0.1606,2.6225,0.1286,3.3288,0,0.049};
+  G4double M216[NDENSARRAY]={22.915,2.06,3.3201,0.1606,2.6225,0.1286,3.3288,0,0.049};
   AddMaterial(M216,"G4_POLYCARBONATE");
 
 //G4_POLYCHLOROSTYRENE  index=217
-  G4float M217[NDENSARRAY]={23.81,1.902,3.4659,0.1238,2.9241,0.0753,3.5441,0,0.029};
+  G4double M217[NDENSARRAY]={23.81,1.902,3.4659,0.1238,2.9241,0.0753,3.5441,0,0.029};
   AddMaterial(M217,"G4_POLYCHLOROSTYRENE");
 
 //G4_POLYETHYLENE  index=218
-  G4float M218[NDENSARRAY]={21.099,1.882,3.0016,0.137,2.5177,0.12108,3.4292,0,0.051};
+  G4double M218[NDENSARRAY]={21.099,1.882,3.0016,0.137,2.5177,0.12108,3.4292,0,0.051};
   AddMaterial(M218,"G4_POLYETHYLENE");
 
 //G4_MYLAR  index=219
-  G4float M219[NDENSARRAY]={24.595,2.144,3.3262,0.1562,2.6507,0.12679,3.3076,0,0.052};
+  G4double M219[NDENSARRAY]={24.595,2.144,3.3262,0.1562,2.6507,0.12679,3.3076,0,0.052};
   AddMaterial(M219,"G4_MYLAR");
 
 //G4_LUCITE  index=220
-  G4float M220[NDENSARRAY]={23.086,2.173,3.3297,0.1824,2.6681,0.11433,3.3836,0,0.056};
+  G4double M220[NDENSARRAY]={23.086,2.173,3.3297,0.1824,2.6681,0.11433,3.3836,0,0.056};
   AddMaterial(M220,"G4_LUCITE");
 
 //G4_POLYOXOMETHYLENE  index=221
-  G4float M221[NDENSARRAY]={25.11,2.175,3.2514,0.1584,2.6838,0.10808,3.4002,0,0.063};
+  G4double M221[NDENSARRAY]={25.11,2.175,3.2514,0.1584,2.6838,0.10808,3.4002,0,0.063};
   AddMaterial(M221,"G4_POLYOXOMETHYLENE");
 
 //G4_POLYPROPYLENE  index=222
-  G4float M222[NDENSARRAY]={20.457,1.884,3.1252,0.1534,2.4822,0.15045,3.2855,0,0.055};
+  G4double M222[NDENSARRAY]={20.457,1.884,3.1252,0.1534,2.4822,0.15045,3.2855,0,0.055};
   AddMaterial(M222,"G4_POLYPROPYLENE");
 
 //G4_POLYSTYRENE  index=223
-  G4float M223[NDENSARRAY]={21.754,2.027,3.2999,0.1647,2.5031,0.16454,3.2224,0,0.051};
+  G4double M223[NDENSARRAY]={21.754,2.027,3.2999,0.1647,2.5031,0.16454,3.2224,0,0.051};
   AddMaterial(M223,"G4_POLYSTYRENE");
 
 //G4_TEFLON  index=224
-  G4float M224[NDENSARRAY]={29.609,2.142,3.4161,0.1648,2.7404,0.10606,3.4046,0,0.073};
+  G4double M224[NDENSARRAY]={29.609,2.142,3.4161,0.1648,2.7404,0.10606,3.4046,0,0.073};
   AddMaterial(M224,"G4_TEFLON");
 
 //G4_POLYTRIFLUOROCHLOROETHYLENE  index=225
-  G4float M225[NDENSARRAY]={28.955,2.094,3.8551,0.1714,3.0265,0.07727,3.5085,0,0.035};
+  G4double M225[NDENSARRAY]={28.955,2.094,3.8551,0.1714,3.0265,0.07727,3.5085,0,0.035};
   AddMaterial(M225,"G4_POLYTRIFLUOROCHLOROETHYLENE");
 
 //G4_POLYVINYL_ACETATE  index=226
-  G4float M226[NDENSARRAY]={22.978,2.116,3.3309,0.1769,2.6747,0.11442,3.3762,0,0.055};
+  G4double M226[NDENSARRAY]={22.978,2.116,3.3309,0.1769,2.6747,0.11442,3.3762,0,0.055};
   AddMaterial(M226,"G4_POLYVINYL_ACETATE");
 
 //G4_PLOYVINYL_ALCOHOL  index=227
-  G4float M227[NDENSARRAY]={24.251,2.071,3.1115,0.1401,2.6315,0.11178,3.3893,0,0.056};
+  G4double M227[NDENSARRAY]={24.251,2.071,3.1115,0.1401,2.6315,0.11178,3.3893,0,0.056};
   AddMaterial(M227,"G4_PLOYVINYL_ALCOHOL");
 
 //G4_POLYVINYL_BUTYRAL  index=228
-  G4float M228[NDENSARRAY]={22.521,2.021,3.1865,0.1555,2.6186,0.11544,3.3983,0,0.054};
+  G4double M228[NDENSARRAY]={22.521,2.021,3.1865,0.1555,2.6186,0.11544,3.3983,0,0.054};
   AddMaterial(M228,"G4_POLYVINYL_BUTYRAL");
 
 //G4_POLYVINYL_CHLORIDE  index=229
-  G4float M229[NDENSARRAY]={23.51,1.84,4.0532,0.1559,2.9415,0.12438,3.2104,0,0.027};
+  G4double M229[NDENSARRAY]={23.51,1.84,4.0532,0.1559,2.9415,0.12438,3.2104,0,0.027};
   AddMaterial(M229,"G4_POLYVINYL_CHLORIDE");
 
 //G4_POLYVINYLIDENE_CHLORIDE  index=230
-  G4float M230[NDENSARRAY]={26.437,1.814,4.2506,0.1314,2.9009,0.15466,3.102,0,0.034};
+  G4double M230[NDENSARRAY]={26.437,1.814,4.2506,0.1314,2.9009,0.15466,3.102,0,0.034};
   AddMaterial(M230,"G4_POLYVINYLIDENE_CHLORIDE");
 
 //G4_POLYVINYLIDENE_FLUORIDE  index=231
-  G4float M231[NDENSARRAY]={27.024,2.16,3.3793,0.1717,2.7375,0.10316,3.42,0,0.067};
+  G4double M231[NDENSARRAY]={27.024,2.16,3.3793,0.1717,2.7375,0.10316,3.42,0,0.067};
   AddMaterial(M231,"G4_POLYVINYLIDENE_FLUORIDE");
 
 //G4_POLYVINYL_PYRROLIDONE  index=232
-  G4float M232[NDENSARRAY]={23.671,1.989,3.1017,0.1324,2.5867,0.12504,3.3326,0,0.031};
+  G4double M232[NDENSARRAY]={23.671,1.989,3.1017,0.1324,2.5867,0.12504,3.3326,0,0.031};
   AddMaterial(M232,"G4_POLYVINYL_PYRROLIDONE");
 
 //G4_POTASSIUM_IODIDE  index=233
-  G4float M233[NDENSARRAY]={33.575,1.784,6.1088,0.1044,3.3442,0.22053,2.7558,0,0.042};
+  G4double M233[NDENSARRAY]={33.575,1.784,6.1088,0.1044,3.3442,0.22053,2.7558,0,0.042};
   AddMaterial(M233,"G4_POTASSIUM_IODIDE");
 
 //G4_POTASSIUM_OXIDE  index=234
-  G4float M234[NDENSARRAY]={30.672,2.065,4.6463,0.048,3.011,0.16789,3.0121,0,0.027};
+  G4double M234[NDENSARRAY]={30.672,2.065,4.6463,0.048,3.011,0.16789,3.0121,0,0.027};
   AddMaterial(M234,"G4_POTASSIUM_OXIDE");
 
 //G4_PROPANE  index=235
-  G4float M235[NDENSARRAY]={0.959,1.708,8.7878,1.4326,3.7998,0.09916,3.592,0,0.093};
+  G4double M235[NDENSARRAY]={0.959,1.708,8.7878,1.4326,3.7998,0.09916,3.592,0,0.093};
   AddMaterial(M235,"G4_PROPANE");
 
 //G4_lPROPANE  index=236
-  G4float M236[NDENSARRAY]={14.509,1.844,3.5529,0.2861,2.6568,0.10329,3.562,0,0.068};
+  G4double M236[NDENSARRAY]={14.509,1.844,3.5529,0.2861,2.6568,0.10329,3.562,0,0.068};
   AddMaterial(M236,"G4_lPROPANE");
 
 //G4_N-PROPYL_ALCOHOL index=237
-  G4float M237[NDENSARRAY]={19.429,1.972,3.2915,0.2046,2.6681,0.09644,3.5415,0,0.07};
+  G4double M237[NDENSARRAY]={19.429,1.972,3.2915,0.2046,2.6681,0.09644,3.5415,0,0.07};
   AddMaterial(M237,"N-PROPYL_ALCOHOL");
 
 //G4_PYRIDINE  index=238
-  G4float M238[NDENSARRAY]={20.807,1.895,3.3148,0.167,2.5245,0.16399,3.1977,0,0.051};
+  G4double M238[NDENSARRAY]={20.807,1.895,3.3148,0.167,2.5245,0.16399,3.1977,0,0.051};
   AddMaterial(M238,"G4_PYRIDINE");
 
 //G4_RUBBER_BUTYL  index=239
-  G4float M239[NDENSARRAY]={20.873,1.852,2.9915,0.1347,2.5154,0.12108,3.4296,0,0.051};
+  G4double M239[NDENSARRAY]={20.873,1.852,2.9915,0.1347,2.5154,0.12108,3.4296,0,0.051};
   AddMaterial(M239,"G4_RUBBER_BUTYL");
 
 //G4_RUBBER_NATURAL  index=240
-  G4float M240[NDENSARRAY]={20.644,1.889,3.1272,0.1512,2.4815,0.15058,3.2879,0,0.053};
+  G4double M240[NDENSARRAY]={20.644,1.889,3.1272,0.1512,2.4815,0.15058,3.2879,0,0.053};
   AddMaterial(M240,"G4_RUBBER_NATURAL");
 
 //G4_RUBBER_NEOPRENE  index=241
-  G4float M241[NDENSARRAY]={23.036,1.874,3.7911,0.1501,2.9461,0.09763,3.3632,0,0.026};
+  G4double M241[NDENSARRAY]={23.036,1.874,3.7911,0.1501,2.9461,0.09763,3.3632,0,0.026};
   AddMaterial(M241,"G4_RUBBER_NEOPRENE");
 
 //G4_SILICON_DIOXIDE  index=242
-  G4float M242[NDENSARRAY]={31.014,2.335,4.0029,0.1385,3.0025,0.08408,3.5064,0,0.018};
+  G4double M242[NDENSARRAY]={31.014,2.335,4.0029,0.1385,3.0025,0.08408,3.5064,0,0.018};
   AddMaterial(M242,"G4_SILICON_DIOXIDE");
 
 //G4_SILVER_BROMIDE  index=243
-  G4float M243[NDENSARRAY]={48.448,2.271,5.6139,0.0352,3.2109,0.24582,2.682,0,0.043};
+  G4double M243[NDENSARRAY]={48.448,2.271,5.6139,0.0352,3.2109,0.24582,2.682,0,0.043};
   AddMaterial(M243,"G4_SILVER_BROMIDE");
 
 //G4_SILVER_CHLORIDE  index=244
-  G4float M244[NDENSARRAY]={45.405,2.096,5.3437,-0.0139,3.2022,0.22968,2.7041,0,0.062};
+  G4double M244[NDENSARRAY]={45.405,2.096,5.3437,-0.0139,3.2022,0.22968,2.7041,0,0.062};
   AddMaterial(M244,"G4_SILVER_CHLORIDE");
 
 //G4_SILVER_HALIDES  index=245
-  G4float M245[NDENSARRAY]={48.433,2.27,5.6166,0.0353,3.2117,0.24593,2.6814,0,0.043};
+  G4double M245[NDENSARRAY]={48.433,2.27,5.6166,0.0353,3.2117,0.24593,2.6814,0,0.043};
   AddMaterial(M245,"G4_SILVER_HALIDES");
 
 //G4_SILVER_IODIDE  index=246
-  G4float M246[NDENSARRAY]={46.105,1.945,5.9342,0.0148,3.2908,0.25059,2.6572,0,0.071};
+  G4double M246[NDENSARRAY]={46.105,1.945,5.9342,0.0148,3.2908,0.25059,2.6572,0,0.071};
   AddMaterial(M246,"G4_SILVER_IODIDE");
 
 //G4_SKIN_ICRP  index=247
-  G4float M247[NDENSARRAY]={22.4,2.14,3.3546,0.2019,2.7526,0.09459,3.4643,0,0.076};
+  G4double M247[NDENSARRAY]={22.4,2.14,3.3546,0.2019,2.7526,0.09459,3.4643,0,0.076};
   AddMaterial(M247,"G4_SKIN_ICRP");
 
 //G4_SODIUM_CARBONATE  index=248
-  G4float M248[NDENSARRAY]={32.117,2.557,3.7178,0.1287,2.8591,0.08715,3.5638,0,0.074};
+  G4double M248[NDENSARRAY]={32.117,2.557,3.7178,0.1287,2.8591,0.08715,3.5638,0,0.074};
   AddMaterial(M248,"G4_SODIUM_CARBONATE");
 
 //G4_SODIUM_IODIDE  index=249
-  G4float M249[NDENSARRAY]={36.057,1.857,6.0572,0.1203,3.592,0.12516,3.0398,0,0.031};
+  G4double M249[NDENSARRAY]={36.057,1.857,6.0572,0.1203,3.592,0.12516,3.0398,0,0.031};
   AddMaterial(M249,"G4_SODIUM_IODIDE");
 
 //G4_SODIUM_MONOXIDE  index=250
-  G4float M250[NDENSARRAY]={30.205,2.689,4.1892,0.1652,2.9793,0.07501,3.6943,0,0.097};
+  G4double M250[NDENSARRAY]={30.205,2.689,4.1892,0.1652,2.9793,0.07501,3.6943,0,0.097};
   AddMaterial(M250,"G4_SODIUM_MONOXIDE");
 
 //G4_SODIUM_NITRATE  index=251
-  G4float M251[NDENSARRAY]={30.459,2.456,3.6502,0.1534,2.8221,0.09391,3.5097,0,0.081};
+  G4double M251[NDENSARRAY]={30.459,2.456,3.6502,0.1534,2.8221,0.09391,3.5097,0,0.081};
   AddMaterial(M251,"G4_SODIUM_NITRATE");
 
 //G4_STILBENE  index=252
-  G4float M252[NDENSARRAY]={20.719,1.963,3.368,0.1734,2.5142,0.16659,3.2168,0,0.052};
+  G4double M252[NDENSARRAY]={20.719,1.963,3.368,0.1734,2.5142,0.16659,3.2168,0,0.052};
   AddMaterial(M252,"G4_STILBENE");
 
 //G4_SUCROSE  index=253
-  G4float M253[NDENSARRAY]={26.416,2.167,3.1526,0.1341,2.6558,0.11301,3.363,0,0.057};
+  G4double M253[NDENSARRAY]={26.416,2.167,3.1526,0.1341,2.6558,0.11301,3.363,0,0.057};
   AddMaterial(M253,"G4_SUCROSE");
 
 //G4_TERPHENYL  index=254
-  G4float M254[NDENSARRAY]={23.116,1.976,3.2639,0.1322,2.5429,0.14964,3.2685,0,0.043};
+  G4double M254[NDENSARRAY]={23.116,1.976,3.2639,0.1322,2.5429,0.14964,3.2685,0,0.043};
   AddMaterial(M254,"G4_TERPHENYL");
 
 //G4_TESTES_ICRP  index=255
-  G4float M255[NDENSARRAY]={21.815,2.185,3.4698,0.2274,2.7988,0.08533,3.5428,0,0.091};
+  G4double M255[NDENSARRAY]={21.815,2.185,3.4698,0.2274,2.7988,0.08533,3.5428,0,0.091};
   AddMaterial(M255,"G4_TESTES_ICRP");
 
 //G4_TETRACHLOROETHYLENE  index=256
-  G4float M256[NDENSARRAY]={25.513,1.79,4.6619,0.1713,2.9083,0.18595,3.0156,0,0.038};
+  G4double M256[NDENSARRAY]={25.513,1.79,4.6619,0.1713,2.9083,0.18595,3.0156,0,0.038};
   AddMaterial(M256,"G4_TETRACHLOROETHYLENE");
 
 //G4_THALIUM_CHLORIDE  index=257
-  G4float M257[NDENSARRAY]={48.749,1.997,6.3009,0.0705,3.5716,0.18599,2.769,0,0.04};
+  G4double M257[NDENSARRAY]={48.749,1.997,6.3009,0.0705,3.5716,0.18599,2.769,0,0.04};
   AddMaterial(M257,"G4_THALIUM_CHLORIDE");
 
 //G4_TISSUE_SOFT_ICRP  index=258
-  G4float M258[NDENSARRAY]={21.394,2.144,3.4354,0.2211,2.7799,0.08926,3.511,0,0.077};
+  G4double M258[NDENSARRAY]={21.394,2.144,3.4354,0.2211,2.7799,0.08926,3.511,0,0.077};
   AddMaterial(M258,"G4_TISSUE_SOFT_ICRP");
 
 //G4_TISSUE_SOFT_ICRU-4  index=259
-  G4float M259[NDENSARRAY]={21.366,2.192,3.5087,0.2377,2.7908,0.09629,3.4371,0,0.092};
+  G4double M259[NDENSARRAY]={21.366,2.192,3.5087,0.2377,2.7908,0.09629,3.4371,0,0.092};
   AddMaterial(M259,"G4_TISSUE_SOFT_ICRU-4");
 
 //G4_TISSUE-METHANE  index=260
-  G4float M260[NDENSARRAY]={0.697,1.89,9.95,1.6442,4.1399,0.09946,3.4708,0,0.098};
+  G4double M260[NDENSARRAY]={0.697,1.89,9.95,1.6442,4.1399,0.09946,3.4708,0,0.098};
   AddMaterial(M260,"G4_TISSUE-METHANE");
 
 //G4_TISSUE-PROPANE  index=261
-  G4float M261[NDENSARRAY]={0.913,1.856,9.3529,1.5139,3.9916,0.09802,3.5159,0,0.092};
+  G4double M261[NDENSARRAY]={0.913,1.856,9.3529,1.5139,3.9916,0.09802,3.5159,0,0.092};
   AddMaterial(M261,"G4_TISSUE-PROPANE");
 
 //G4_TITANIUM_DIOXIDE  index=262
-  G4float M262[NDENSARRAY]={41.022,2.307,3.9522,-0.0119,3.1647,0.08569,3.3267,0,0.027};
+  G4double M262[NDENSARRAY]={41.022,2.307,3.9522,-0.0119,3.1647,0.08569,3.3267,0,0.027};
   AddMaterial(M262,"G4_TITANIUM_DIOXIDE");
 
 //G4_TOLUENE  index=263
-  G4float M263[NDENSARRAY]={19.764,1.88,3.3026,0.1722,2.5728,0.13284,3.3558,0,0.052};
+  G4double M263[NDENSARRAY]={19.764,1.88,3.3026,0.1722,2.5728,0.13284,3.3558,0,0.052};
   AddMaterial(M263,"G4_TOLUENE");
 
 //G4_TRICHLOROETHYLENE  index=264
-  G4float M264[NDENSARRAY]={24.301,1.789,4.6148,0.1803,2.914,0.18272,3.0137,0,0.036};
+  G4double M264[NDENSARRAY]={24.301,1.789,4.6148,0.1803,2.914,0.18272,3.0137,0,0.036};
   AddMaterial(M264,"G4_TRICHLOROETHYLENE");
 
 //G4_TRIETHYL_PHOSPHATE  index=265
-  G4float M265[NDENSARRAY]={21.863,2.1,3.6242,0.2054,2.9428,0.06922,3.6302,0,0.049};
+  G4double M265[NDENSARRAY]={21.863,2.1,3.6242,0.2054,2.9428,0.06922,3.6302,0,0.049};
   AddMaterial(M265,"G4_TRIETHYL_PHOSPHATE");
 
 //G4_TUNGSTEN_HEXAFLUORIDE  index=266
-  G4float M266[NDENSARRAY]={29.265,2.325,5.9881,0.302,4.2602,0.03658,3.5134,0,0.055};
+  G4double M266[NDENSARRAY]={29.265,2.325,5.9881,0.302,4.2602,0.03658,3.5134,0,0.055};
   AddMaterial(M266,"G4_TUNGSTEN_HEXAFLUORIDE");
 
 //G4_URANIUM_DICARBIDE  index=267
-  G4float M267[NDENSARRAY]={60.969,1.703,6.0247,-0.2191,3.5208,0.2112,2.6577,0,0.12};
+  G4double M267[NDENSARRAY]={60.969,1.703,6.0247,-0.2191,3.5208,0.2112,2.6577,0,0.12};
   AddMaterial(M267,"G4_URANIUM_DICARBIDE");
 
 //G4_URANIUM_MONOCARBIDE  index=268
-  G4float M268[NDENSARRAY]={66.602,1.68,6.121,-0.2524,3.4941,0.22972,2.6169,0,0.132};
+  G4double M268[NDENSARRAY]={66.602,1.68,6.121,-0.2524,3.4941,0.22972,2.6169,0,0.132};
   AddMaterial(M268,"G4_URANIUM_MONOCARBIDE");
 
 //G4_URANIUM_OXIDE  index=269
-  G4float M269[NDENSARRAY]={60.332,1.76,5.9605,-0.1938,3.5292,0.20463,2.6711,0,0.098};
+  G4double M269[NDENSARRAY]={60.332,1.76,5.9605,-0.1938,3.5292,0.20463,2.6711,0,0.098};
   AddMaterial(M269,"G4_URANIUM_OXIDE");
 
 //G4_UREA  index=270
-  G4float M270[NDENSARRAY]={24.194,2.022,3.2032,0.1603,2.6225,0.11609,3.3461,0,0.06};
+  G4double M270[NDENSARRAY]={24.194,2.022,3.2032,0.1603,2.6225,0.11609,3.3461,0,0.06};
   AddMaterial(M270,"G4_UREA");
 
 //G4_VALINE  index=271
-  G4float M271[NDENSARRAY]={23.622,2.024,3.1059,0.1441,2.6227,0.11386,3.3774,0,0.056};
+  G4double M271[NDENSARRAY]={23.622,2.024,3.1059,0.1441,2.6227,0.11386,3.3774,0,0.056};
   AddMaterial(M271,"G4_VALINE");
 
 //G4_VITON  index=272
-  G4float M272[NDENSARRAY]={26.948,2.227,3.5943,0.2106,2.7874,0.09965,3.4556,0,0.07};
+  G4double M272[NDENSARRAY]={26.948,2.227,3.5943,0.2106,2.7874,0.09965,3.4556,0,0.07};
   AddMaterial(M272,"G4_VITON");
 
 //G4_WATER  index=273
-  G4float M273[NDENSARRAY]={21.469,2.203,3.5017,0.24,2.8004,0.09116,3.4773,0,0.097};
+  G4double M273[NDENSARRAY]={21.469,2.203,3.5017,0.24,2.8004,0.09116,3.4773,0,0.097};
   AddMaterial(M273,"G4_WATER");
 
 //G4_WATER_VAPOR  index=274
-  G4float M274[NDENSARRAY]={0.59,2.175,10.5962,1.7952,4.3437,0.08101,3.5901,0,0.121};
+  G4double M274[NDENSARRAY]={0.59,2.175,10.5962,1.7952,4.3437,0.08101,3.5901,0,0.121};
   AddMaterial(M274,"G4_WATER_VAPOR");
 
 //G4_XYLENE  index=275
-  G4float M275[NDENSARRAY]={19.866,1.882,3.2698,0.1695,2.5675,0.13216,3.3564,0,0.051};
+  G4double M275[NDENSARRAY]={19.866,1.882,3.2698,0.1695,2.5675,0.13216,3.3564,0,0.051};
   AddMaterial(M275,"G4_XYLENE");
 
 //G4_GRAPHITE  index=276
-  G4float M276[NDENSARRAY]={30.652,2.29,2.868,-0.0178,2.3415,0.26142,2.8697,0.12,0.038};
+  G4double M276[NDENSARRAY]={30.652,2.29,2.868,-0.0178,2.3415,0.26142,2.8697,0.12,0.038};
   AddMaterial(M276,"G4_GRAPHITE");
 
 //G4_GRAPHITE_POROUS  index=277
-  G4float  M277[NDENSARRAY]={26.555,2.49,3.155,0.048,2.5387,0.20762,2.9532,0.14,0.038};
+  G4double  M277[NDENSARRAY]={26.555,2.49,3.155,0.048,2.5387,0.20762,2.9532,0.14,0.038};
   AddMaterial(M277,"G4_GRAPHITE_POROUS");
 
@@ -1305,5 +1305,5 @@
 }
 
-void G4DensityEffectData::AddMaterial(G4float* val, const G4String& matName)
+void G4DensityEffectData::AddMaterial(G4double* val, const G4String& matName)
 {
   data[index][0] = val[0]*eV; 
Index: trunk/source/materials/src/G4IonisParamMat.cc
===================================================================
--- trunk/source/materials/src/G4IonisParamMat.cc	(revision 1227)
+++ trunk/source/materials/src/G4IonisParamMat.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4IonisParamMat.cc,v 1.33 2009/11/19 16:43:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4IonisParamMat.cc,v 1.34 2009/11/30 15:48:04 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -146,7 +146,9 @@
   // R.M. Sternheimer, Atomic Data and Nuclear Data Tables, 30: 261 (1984)
   G4int idx = fDensityData->GetIndex(fMaterial->GetName());
-  if(idx < 0 && fMaterial->GetNumberOfElements() == 1) {
-    idx = fDensityData->GetIndex(G4int(fMaterial->GetZ()));
-  }
+  // if(idx < 0 && fMaterial->GetNumberOfElements() == 1) {
+  //  idx = fDensityData->GetIndex(G4int(fMaterial->GetZ()));
+  // }
+
+  //G4cout << "DensityEffect for " << fMaterial->GetName() << "  " << idx << G4endl; 
 
   if(idx >= 0) {
@@ -256,5 +258,5 @@
       /std::pow((fX1density-fX0density),fMdensity);
   }
-  /*
+  /*  
   G4cout << "G4IonisParamMat: density effect data for <" << fMaterial->GetName() 
 	 << "> " << G4endl;
Index: trunk/source/materials/src/G4NistMaterialBuilder.cc
===================================================================
--- trunk/source/materials/src/G4NistMaterialBuilder.cc	(revision 1227)
+++ trunk/source/materials/src/G4NistMaterialBuilder.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4NistMaterialBuilder.cc,v 1.22 2009/11/03 17:02:03 alechner Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4NistMaterialBuilder.cc,v 1.23 2009/11/24 17:19:10 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -83,5 +83,5 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4Material* G4NistMaterialBuilder::FindOrBuildMaterial(const G4String& name,
+G4Material* G4NistMaterialBuilder::FindOrBuildMaterial(const G4String& matname,
                                                        G4bool isotopes,
 						       G4bool warning)
@@ -94,7 +94,11 @@
   }
 
-  if (verbose > 1)
+  G4String name = matname;
+  if("G4_NYLON-6/6" == matname)  name = "G4_NYLON-6-6";
+  if("G4_NYLON-6/10" == matname) name = "G4_NYLON-6-10";
+
+  if (verbose > 1) {
     G4cout << "G4NistMaterialBuilder::FindOrBuildMaterial " << name << G4endl;
-
+  }
   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
   G4int nmat = theMaterialTable->size();
Index: trunk/source/materials/src/G4NistMessenger.cc
===================================================================
--- trunk/source/materials/src/G4NistMessenger.cc	(revision 1227)
+++ trunk/source/materials/src/G4NistMessenger.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4NistMessenger.cc,v 1.8 2009/10/30 19:39:35 bagoulia Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4NistMessenger.cc,v 1.9 2009/12/03 11:09:47 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -125,4 +125,5 @@
   delete g4ElmCmd;   
   delete g4MatCmd;
+  delete g4DensCmd;
   delete g4Dir;
   delete matDir;  
Index: trunk/source/materials/src/G4OpticalSurface.cc
===================================================================
--- trunk/source/materials/src/G4OpticalSurface.cc	(revision 1227)
+++ trunk/source/materials/src/G4OpticalSurface.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4OpticalSurface.cc,v 1.15 2009/11/20 00:57:51 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4OpticalSurface.cc,v 1.16 2009/12/01 08:24:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
@@ -106,5 +106,5 @@
         if (type == dielectric_LUT) {
            AngularDistribution =
-                       new float[incidentIndexMax*thetaIndexMax*phiIndexMax];
+                       new G4float[incidentIndexMax*thetaIndexMax*phiIndexMax];
            ReadFile();
         }
@@ -166,5 +166,5 @@
   if (type == dielectric_LUT) {
      if (!AngularDistribution) AngularDistribution =
-                       new float[incidentIndexMax*thetaIndexMax*phiIndexMax];
+                       new G4float[incidentIndexMax*thetaIndexMax*phiIndexMax];
      ReadFile();
   }
@@ -176,5 +176,5 @@
   if (theType == dielectric_LUT) {
      if (!AngularDistribution) AngularDistribution =
-                       new float[incidentIndexMax*thetaIndexMax*phiIndexMax];
+                       new G4float[incidentIndexMax*thetaIndexMax*phiIndexMax];
      ReadFile();
   }
Index: trunk/source/parameterisations/gflash/include/G4GFlashSpot.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/G4GFlashSpot.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/G4GFlashSpot.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GFlashSpot.hh,v 1.4 2006/06/29 19:13:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/G4VGFlashSensitiveDetector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VGFlashSensitiveDetector.hh,v 1.5 2006/06/29 19:13:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashEnergySpot.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashEnergySpot.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashEnergySpot.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashEnergySpot.hh,v 1.5 2006/06/29 19:13:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashHitMaker.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashHitMaker.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashHitMaker.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashHitMaker.hh,v 1.5 2006/06/29 19:13:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashHomoShowerParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashHomoShowerParameterisation.hh,v 1.4 2006/06/29 19:13:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashParticleBounds.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashParticleBounds.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashParticleBounds.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashParticleBounds.hh,v 1.4 2006/06/29 19:13:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashSamplingShowerParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashSamplingShowerParameterisation.hh,v 1.4 2006/06/29 19:13:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashSamplingShowerTuning.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashSamplingShowerTuning.hh,v 1.3 2006/06/29 19:13:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashShowerModel.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashShowerModel.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashShowerModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashShowerModel.hh,v 1.9 2006/06/29 19:13:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GFlashShowerModelMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GFlashShowerModelMessenger.hh,v 1.4 2006/06/29 19:14:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GVFlashHomoShowerTuning.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GVFlashHomoShowerTuning.hh,v 1.7 2006/06/29 19:14:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/GVFlashShowerParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: GVFlashShowerParameterisation.hh,v 1.2 2006/06/29 19:14:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/include/Gamma.hh
===================================================================
--- trunk/source/parameterisations/gflash/include/Gamma.hh	(revision 1227)
+++ trunk/source/parameterisations/gflash/include/Gamma.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: Gamma.hh,v 1.6 2006/06/29 19:14:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashEnergySpot.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashEnergySpot.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashEnergySpot.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashEnergySpot.cc,v 1.5 2006/06/29 19:14:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashHitMaker.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashHitMaker.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashHitMaker.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashHitMaker.cc,v 1.7 2006/06/29 19:14:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashHomoShowerParameterisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashHomoShowerParameterisation.cc,v 1.5 2006/06/29 19:14:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashParticleBounds.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashParticleBounds.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashParticleBounds.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashParticleBounds.cc,v 1.4 2006/06/29 19:14:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashSamplingShowerParameterisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashSamplingShowerParameterisation.cc,v 1.6 2006/06/29 19:14:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashShowerModel.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashShowerModel.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashShowerModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashShowerModel.cc,v 1.13 2006/06/29 19:14:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GFlashShowerModelMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GFlashShowerModelMessenger.cc,v 1.6 2006/06/29 19:14:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/GVFlashShowerParameterisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: GVFlashShowerParameterisation.cc,v 1.2 2006/06/29 19:14:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/parameterisations/gflash/src/Gamma.cc
===================================================================
--- trunk/source/parameterisations/gflash/src/Gamma.cc	(revision 1227)
+++ trunk/source/parameterisations/gflash/src/Gamma.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: Gamma.cc,v 1.6 2006/06/29 19:14:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/History
===================================================================
--- trunk/source/persistency/ascii/History	(revision 1227)
+++ trunk/source/persistency/ascii/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.9 2009/02/25 10:43:40 gcosmo Exp $
+$Id: History,v 1.13 2009/11/25 15:36:09 gcosmo Exp $
 -------------------------------------------------------------------
      =========================================================
@@ -16,4 +16,21 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+25 November, 09  G.Cosmo (ascii-V09-02-10)
+- Fixed compilation warnings on G4tgbVolume detected on MacOS.
+
+24 November, 09  P.Arce (ascii-V09-02-09)
+- Corrected compilation errors introduced in last tag.
+
+19 November, 09  P.Arce (ascii-V09-02-08)
+- Small additions in Get and Set methods and constructors
+- Inclusion of extruded and tessellated solids
+
+17 May, 09  P.Arce (ascii-V09-02-06)
+- Fix of GNUmakefile 
+
+15 May, 09  P.Arce (ascii-V09-02-05)
+- Added parallel world management
+- Added G4tgbPlaceParamPhantom
 
 16 February, 09  P.Arce (ascii-V09-02-04)
Index: trunk/source/persistency/ascii/include/G4tgbDetectorBuilder.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbDetectorBuilder.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbDetectorBuilder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbDetectorBuilder.hh,v 1.2 2008/12/18 12:58:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbDetectorConstruction.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbDetectorConstruction.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbDetectorConstruction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbDetectorConstruction.hh,v 1.2 2008/12/18 12:58:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbElement.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbElement.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbElement.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbElement.hh,v 1.2 2008/12/18 12:58:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbIsotope.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbIsotope.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbIsotope.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbIsotope.hh,v 1.2 2008/12/18 12:58:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterial.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterial.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterial.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterial.hh,v 1.5 2008/12/18 12:58:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialMgr.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialMgr.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialMgr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMgr.hh,v 1.4 2008/12/18 12:58:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialMixture.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialMixture.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialMixture.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixture.hh,v 1.2 2008/12/18 12:58:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByNoAtoms.hh,v 1.3 2008/12/18 12:58:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByVolume.hh,v 1.4 2008/12/18 12:58:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByWeight.hh,v 1.2 2008/12/18 12:58:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbMaterialSimple.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbMaterialSimple.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbMaterialSimple.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialSimple.hh,v 1.2 2008/12/18 12:58:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbPlaceParamCircle.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbPlaceParamCircle.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbPlaceParamCircle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamCircle.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbPlaceParamLinear.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbPlaceParamLinear.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbPlaceParamLinear.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamLinear.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbPlaceParamSquare.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbPlaceParamSquare.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbPlaceParamSquare.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamSquare.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbPlaceParameterisation.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbPlaceParameterisation.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbPlaceParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParameterisation.hh,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbRotationMatrix.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbRotationMatrix.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbRotationMatrix.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbRotationMatrix.hh,v 1.2 2008/12/18 12:58:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbRotationMatrixMgr.hh,v 1.2 2008/12/18 12:58:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbVolume.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbVolume.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbVolume.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbVolume.hh,v 1.4 2008/12/18 12:58:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgbVolumeMgr.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgbVolumeMgr.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgbVolumeMgr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbVolumeMgr.hh,v 1.3 2008/12/18 12:58:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrElement.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrElement.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrElement.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElement.hh,v 1.2 2008/12/18 12:58:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrElementFromIsotopes.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrElementFromIsotopes.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrElementFromIsotopes.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElementFromIsotopes.hh,v 1.6 2008/12/18 12:58:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrElementSimple.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrElementSimple.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrElementSimple.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElementSimple.hh,v 1.6 2008/12/18 12:58:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrEvaluator.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrEvaluator.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrEvaluator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrEvaluator.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrFileIn.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrFileIn.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrFileIn.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrFileIn.hh,v 1.3 2008/12/18 12:58:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrFileReader.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrFileReader.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrFileReader.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrFileReader.hh,v 1.2 2008/11/12 08:41:19 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrIsotope.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrIsotope.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrIsotope.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrIsotope.hh,v 1.4 2008/12/18 12:58:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrLineProcessor.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrLineProcessor.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrLineProcessor.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrLineProcessor.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrMaterial.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrMaterial.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrMaterial.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterial.hh,v 1.5 2008/12/18 12:58:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrMaterialFactory.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrMaterialFactory.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrMaterialFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialFactory.hh,v 1.2 2008/12/18 12:58:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrMaterialMixture.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrMaterialMixture.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrMaterialMixture.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialMixture.hh,v 1.2 2008/12/18 12:58:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrMaterialSimple.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrMaterialSimple.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrMaterialSimple.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialSimple.hh,v 1.2 2008/12/18 12:58:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrMessenger.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrMessenger.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMessenger.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrParameterMgr.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrParameterMgr.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrParameterMgr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrParameterMgr.hh,v 1.2 2008/12/18 12:58:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrPlace.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrPlace.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrPlace.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlace.hh,v 1.4 2008/12/18 12:58:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrPlaceDivRep.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrPlaceDivRep.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrPlaceDivRep.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceDivRep.hh,v 1.5 2008/12/18 12:58:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrPlaceParameterisation.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrPlaceParameterisation.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrPlaceParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceParameterisation.hh,v 1.7 2008/12/18 12:58:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrPlaceSimple.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrPlaceSimple.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrPlaceSimple.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceSimple.hh,v 1.5 2008/12/18 12:58:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrRotationMatrix.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrRotationMatrix.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrRotationMatrix.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrRotationMatrix.hh,v 1.5 2008/12/18 12:58:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrRotationMatrixFactory.hh,v 1.2 2008/12/18 12:59:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrSolid.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrSolid.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrSolid.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrSolid.hh,v 1.2 2008/12/18 12:59:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrSolidBoolean.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrSolidBoolean.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrSolidBoolean.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrSolidBoolean.hh,v 1.2 2008/12/18 12:59:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrUtils.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrUtils.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrUtils.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrUtils.hh,v 1.6 2008/12/18 12:59:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrVolume.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrVolume.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrVolume.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4tgrVolume.hh,v 1.7 2008/12/18 12:59:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4tgrVolume.hh,v 1.10 2009/11/23 11:38:54 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -65,4 +65,5 @@
     G4tgrVolume();
     G4tgrVolume( const std::vector<G4String>& wl );
+    G4tgrVolume( const G4tgrVolume& vol );
     virtual ~G4tgrVolume();
 
@@ -94,5 +95,7 @@
     const std::vector<G4tgrPlace*> GetPlacements() const {return thePlacements;}
     G4bool GetVisibility() const {return theVisibility;}
-    const G4double* GetColour() const {return theRGBColour;}
+    G4double* GetColour() const {return theRGBColour;}
+    G4double* GetRGBColour() const {return theRGBColour;}
+
     G4bool GetCheckOverlaps() const {return theCheckOverlaps;}
 
Index: trunk/source/persistency/ascii/include/G4tgrVolumeAssembly.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrVolumeAssembly.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrVolumeAssembly.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeAssembly.hh,v 1.5 2008/12/18 12:59:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrVolumeDivision.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrVolumeDivision.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrVolumeDivision.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeDivision.hh,v 1.5 2008/12/18 12:59:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/include/G4tgrVolumeMgr.hh
===================================================================
--- trunk/source/persistency/ascii/include/G4tgrVolumeMgr.hh	(revision 1227)
+++ trunk/source/persistency/ascii/include/G4tgrVolumeMgr.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeMgr.hh,v 1.5 2008/12/18 12:59:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbDetectorBuilder.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbDetectorBuilder.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbDetectorBuilder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbDetectorBuilder.cc,v 1.4 2008/12/18 12:59:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbDetectorConstruction.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbDetectorConstruction.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbDetectorConstruction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbDetectorConstruction.cc,v 1.4 2008/12/18 12:59:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbElement.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbElement.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbElement.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbElement.cc,v 1.4 2008/12/18 12:59:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbGeometryDumper.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbGeometryDumper.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbGeometryDumper.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4tgbGeometryDumper.cc,v 1.11 2008/12/18 12:59:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4tgbGeometryDumper.cc,v 1.12 2009/11/19 13:29:04 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -642,8 +642,8 @@
 
   } else if (solidType == "SUBTRACTIONSOLID")  {
-    DumpBooleanVolume( "SUBS", solid );
+    DumpBooleanVolume( "SUBTRACTION", solid );
 
   } else if (solidType == "INTERSECTIONSOLID") {
-    DumpBooleanVolume( "INTERS", solid );
+    DumpBooleanVolume( "INTERSECTION", solid );
 
   } else if (solidType == "REFLECTEDSOLID") {
Index: trunk/source/persistency/ascii/src/G4tgbIsotope.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbIsotope.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbIsotope.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbIsotope.cc,v 1.4 2008/12/18 12:59:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterial.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterial.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterial.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterial.cc,v 1.2 2008/12/18 12:59:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialMgr.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialMgr.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialMgr.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMgr.cc,v 1.5 2008/12/18 12:59:28 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialMixture.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialMixture.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialMixture.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixture.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByNoAtoms.cc,v 1.6 2008/12/18 12:59:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByVolume.cc,v 1.8 2008/12/18 12:59:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialMixtureByWeight.cc,v 1.4 2008/12/18 12:59:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbMaterialSimple.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbMaterialSimple.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbMaterialSimple.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbMaterialSimple.cc,v 1.5 2008/12/18 12:59:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbPlaceParamCircle.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbPlaceParamCircle.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbPlaceParamCircle.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamCircle.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbPlaceParamLinear.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbPlaceParamLinear.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbPlaceParamLinear.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamLinear.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbPlaceParamSquare.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbPlaceParamSquare.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbPlaceParamSquare.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParamSquare.cc,v 1.6 2008/12/03 16:16:01 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbPlaceParameterisation.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbPlaceParameterisation.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbPlaceParameterisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbPlaceParameterisation.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4tgbPlaceParameterisation
Index: trunk/source/persistency/ascii/src/G4tgbRotationMatrix.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbRotationMatrix.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbRotationMatrix.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbRotationMatrix.cc,v 1.8 2008/12/18 12:59:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbRotationMatrixMgr.cc,v 1.2 2008/12/18 12:59:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgbVolume.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbVolume.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbVolume.cc	(revision 1228)
@@ -92,6 +92,10 @@
 #include "G4BREPSolidPolyhedra.hh"
 #include "G4BREPSolidOpenPCone.hh"
+#include "G4TessellatedSolid.hh"
+#include "G4TriangularFacet.hh"
+#include "G4QuadrangularFacet.hh"
+#include "G4ExtrudedSolid.hh"
+
 #include "G4VisExtent.hh"
-
 #include "G4Material.hh"
 #include "G4RotationMatrix.hh"
@@ -633,4 +637,111 @@
                                       &((*z_p)[0]), &((*rmin_p)[0]),
                                       &((*rmax_p)[0]));
+  }
+  else if( stype == "TESSELLATED" )
+  {
+    G4int nFacets = G4int(solParam[0]);
+    G4int jj = 0;
+    solid = new G4TessellatedSolid(sname);
+    G4TessellatedSolid* solidTS = (G4TessellatedSolid*)(solid);
+    G4VFacet* facet=0;
+    
+    for( G4int ii = 0; ii < nFacets; ii++){
+      G4int nPoints = G4int(solParam[jj+1]);
+      if( G4int(solParam.size()) < jj + nPoints*3 + 2 ) {
+	G4String Err1 = "Too small number of parameters in tesselated solid, it should be at least "  + G4UIcommand::ConvertToString(jj + nPoints*3 + 2 );
+	G4String Err2 = " facet number " + G4UIcommand::ConvertToString(ii);
+	G4String Err3 = " number of parameters is " + G4UIcommand::ConvertToString(G4int(solParam.size()));
+	G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+	G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+		    "InvalidSetup", FatalException, ErrMessage);
+      }
+      
+      if( nPoints == 3 ) 
+      {
+	G4ThreeVector pt0(solParam[jj+2],solParam[jj+3],solParam[jj+4]);
+	G4ThreeVector vt1(solParam[jj+5],solParam[jj+6],solParam[jj+7]);
+	G4ThreeVector vt2(solParam[jj+8],solParam[jj+9],solParam[jj+10]);
+	G4FacetVertexType vertexType = ABSOLUTE;
+	if( solParam[jj+11] == 0 ) 
+	{
+	  vertexType = ABSOLUTE;
+	} 
+	else if( solParam[jj+11] == 0 ) 
+	{
+	  vertexType = RELATIVE;
+	} 
+	else 
+	{
+	  G4String Err1 = "Wrong number of vertex type in tesselated solid, it should be 0 =ABSOLUTE) or 1 (=RELATIVE)";
+	  G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+	  G4String Err3 = " vertex type is " + G4UIcommand::ConvertToString(solParam[jj+11]);
+	  G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+	  G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+		      "InvalidSetup", FatalException, ErrMessage);
+	}
+	facet = new G4TriangularFacet( pt0, vt1, vt2, vertexType );
+      } 
+      else if( nPoints == 4 ) 
+      {
+	G4ThreeVector pt0(solParam[jj+2],solParam[jj+3],solParam[jj+4]);
+	G4ThreeVector vt1(solParam[jj+5],solParam[jj+6],solParam[jj+7]);
+	G4ThreeVector vt2(solParam[jj+8],solParam[jj+9],solParam[jj+10]);
+	G4ThreeVector vt3(solParam[jj+11],solParam[jj+12],solParam[jj+13]);
+	G4FacetVertexType vertexType = ABSOLUTE;
+	if( solParam[jj+14] == 0 ) 
+	{
+	  vertexType = ABSOLUTE;
+	}
+	else if( solParam[jj+14] == 0 ) 
+	{
+	  vertexType = RELATIVE;
+	} 
+	else 
+	{
+	  G4String Err1 = "Wrong number of vertex type in tesselated solid, it should be 0 =ABSOLUTE) or 1 (=RELATIVE)";
+	  G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+	  G4String Err3 = " vertex type is " + G4UIcommand::ConvertToString(solParam[jj+14]);
+	  G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+	  G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+		      "InvalidSetup", FatalException, ErrMessage);
+	}
+	facet = new G4QuadrangularFacet( pt0, vt1, vt2, vt3, vertexType );
+      } 
+      else 
+      {
+	G4String Err1 = "Wrong number of points in tesselated solid, it should be 3 or 4";
+	G4String Err2 = " facet number " + G4UIcommand::ConvertToString(G4int(ii));
+	G4String Err3 = " number of points is " + G4UIcommand::ConvertToString(G4int(nPoints));
+	G4String ErrMessage = Err1 + Err2 + Err3 + " !";
+	G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
+		    "InvalidSetup", FatalException, ErrMessage);
+      }
+      
+      solidTS->AddFacet( facet );
+      jj += nPoints*3 + 2;
+    }
+    
+  }  
+  else if( stype == "EXTRUDED" ) 
+  {
+    std::vector<G4TwoVector> polygonList;
+    std::vector<G4ExtrudedSolid::ZSection> zsectionList;
+    G4int nPolygons = G4int(solParam[0]);
+    G4int ii = 1;
+    G4int nMax = nPolygons*2+1;
+    for( ;ii < nMax; ii+=2 )
+    {
+      polygonList.push_back( G4TwoVector(solParam[ii],solParam[ii+1]) );
+    }
+    G4int nZSections = G4int(solParam[ii]);
+    nMax = nPolygons*2 + nZSections*4 + 2; 
+    ii++;
+    for( ; ii < nMax; ii+=4 )
+    {
+      G4TwoVector offset(solParam[ii+1],solParam[ii+2]);
+      zsectionList.push_back( G4ExtrudedSolid::ZSection(solParam[ii],offset,solParam[ii+3]) );
+    }
+    solid = new G4ExtrudedSolid( sname, polygonList, zsectionList );
+    
   }
   else if( stype.substr(0,7) == "Boolean" )
Index: trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgbVolumeMgr.cc,v 1.5 2008/12/18 12:59:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrElement.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrElement.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrElement.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElement.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrElementFromIsotopes.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrElementFromIsotopes.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrElementFromIsotopes.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElementFromIsotopes.cc,v 1.5 2008/12/18 12:59:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrElementSimple.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrElementSimple.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrElementSimple.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrElementSimple.cc,v 1.5 2008/12/18 12:59:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrEvaluator.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrEvaluator.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrEvaluator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrEvaluator.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrFileIn.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrFileIn.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrFileIn.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrFileIn.cc,v 1.9 2008/12/18 12:59:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrFileReader.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrFileReader.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrFileReader.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrFileReader.cc,v 1.4 2008/11/12 08:44:07 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrIsotope.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrIsotope.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrIsotope.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrIsotope.cc,v 1.5 2008/12/18 12:59:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrMaterial.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrMaterial.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrMaterial.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterial.cc,v 1.3 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrMaterialFactory.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrMaterialFactory.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrMaterialFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialFactory.cc,v 1.4 2008/12/18 12:59:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrMaterialMixture.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrMaterialMixture.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrMaterialMixture.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialMixture.cc,v 1.7 2008/12/18 12:59:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrMaterialSimple.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrMaterialSimple.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrMaterialSimple.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMaterialSimple.cc,v 1.7 2008/12/18 12:59:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrMessenger.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrMessenger.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrMessenger.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrParameterMgr.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrParameterMgr.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrParameterMgr.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrParameterMgr.cc,v 1.6 2008/12/18 13:00:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrPlace.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrPlace.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrPlace.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlace.cc,v 1.3 2008/11/03 17:04:41 arce Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrPlaceDivRep.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrPlaceDivRep.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrPlaceDivRep.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceDivRep.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrPlaceParameterisation.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrPlaceParameterisation.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrPlaceParameterisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceParameterisation.cc,v 1.6 2008/12/18 13:00:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrPlaceSimple.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrPlaceSimple.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrPlaceSimple.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrPlaceSimple.cc,v 1.5 2008/12/18 13:00:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrRotationMatrix.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrRotationMatrix.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrRotationMatrix.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrRotationMatrix.cc,v 1.5 2008/12/18 13:00:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrRotationMatrixFactory.cc,v 1.2 2008/12/18 13:00:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrSolid.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrSolid.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrSolid.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrSolid.cc,v 1.6 2008/12/18 13:00:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrSolidBoolean.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrSolidBoolean.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrSolidBoolean.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrSolidBoolean.cc,v 1.4 2008/12/18 13:00:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrVolume.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrVolume.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrVolume.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4tgrVolume.cc,v 1.7 2008/12/18 13:00:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4tgrVolume.cc,v 1.10 2009/11/23 11:36:29 arce Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -109,4 +109,18 @@
 
 //-------------------------------------------------------------------------
+G4tgrVolume::G4tgrVolume( const G4tgrVolume& vol )
+{
+  theName = vol.GetName();   
+  theType = vol.GetType();
+  theMaterialName = vol.GetMaterialName();   
+  theSolid = const_cast<G4tgrSolid*>(vol.GetSolid());
+  thePlacements  = vol.GetPlacements();
+  theVisibility   = vol.GetVisibility();
+  theRGBColour   = vol.GetRGBColour();
+  theCheckOverlaps = vol.GetCheckOverlaps();
+}
+
+
+//-------------------------------------------------------------------------
 G4tgrVolume* G4tgrVolume::GetVolume( G4int ii ) const
 {
Index: trunk/source/persistency/ascii/src/G4tgrVolumeAssembly.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrVolumeAssembly.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrVolumeAssembly.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeAssembly.cc,v 1.6 2008/12/18 13:00:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrVolumeDivision.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrVolumeDivision.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrVolumeDivision.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeDivision.cc,v 1.6 2008/12/18 13:00:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/ascii/src/G4tgrVolumeMgr.cc
===================================================================
--- trunk/source/persistency/ascii/src/G4tgrVolumeMgr.cc	(revision 1227)
+++ trunk/source/persistency/ascii/src/G4tgrVolumeMgr.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4tgrVolumeMgr.cc,v 1.7 2008/12/18 13:00:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/gdml/History
===================================================================
--- trunk/source/persistency/gdml/History	(revision 1227)
+++ trunk/source/persistency/gdml/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.101 2009/02/26 10:13:49 gcosmo Exp $
+$Id: History,v 1.116 2009/12/04 13:59:05 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,70 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+04 Dec 2009 Gabriele Cosmo (gdml-V09-02-18)
+- Updated list of optical properties in G4GDMLReadSolid according to
+  last changes to G4OpticalSurface and G4SurfaceProperty.
+
+14 Oct 2009 Gabriele Cosmo (gdml-V09-02-17)
+- Added support for GDML 'expression' tag, implementing generic expressions
+  stored as literal constants.
+- Corrected handling of 'quantity' tag; added missing caching of evaluation. 
+
+24 Sep 2009 Gabriele Cosmo (gdml-V09-02-16)
+- Added support for the GDML 'assembly' tag, implementing assemblies of
+  simple placements through G4AssemblyVolume.
+
+12 May 2009 Gabriele Cosmo (gdml-V09-02-15)
+- Restricted usage of loops only for placement of volumes. Now correctly
+  handling most common use-case of multiple copies of the same volume/solid
+  through loop statement. Addressing problem report #1063.
+
+11 May 2009 Gabriele Cosmo (gdml-V09-02-14)
+- Allow for name stripping of volumes which are included in loops; do not
+  store appended internal counter reference.
+
+27 April 2009 Gabriele Cosmo (gdml-V09-02-13)
+- Get rid of unused parameter in G4GDMLWriteMaterials::PropertyVectorWrite().
+
+24 April 2009 Gabriele Cosmo (gdml-V09-02-12)
+- Some code cleanup: rationalised inclusion of headers, replacing them
+  with forward declarations where possible.
+
+24 April 2009 Gabriele Cosmo (gdml-V09-02-11)
+- Allow for reading/writing of constant material properties.
+- Implemented ability to write surface properties associated to volumes
+  and material properties.
+
+17 April 2009 Gabriele Cosmo (gdml-V09-02-10)
+- Defined missing copy constructor and operator=() to G4GDMLMatrix
+  internal class, to avoid cases of memory corruption when handling matrices.
+
+15 April 2009 Gabriele Cosmo (gdml-V09-02-09)
+- Completed virtual layer for allowing customisation of the writer for
+  user-extended schemas.
+
+09 April 2009 Gabriele Cosmo (gdml-V09-02-08)
+- Correction in G4GDMLWriteSolids::BooleanWrite() in order to handle
+  cases of nested displaced solids given to both operands in a Boolean
+  operation (ATLAS use case).
+- Renamed flag for maximum number of transformations applied to a solid
+  and moved to G4GDMLWriteSolids base class.
+- First virtual layer for custom writer classes G4GDMLWriteSolids and
+  G4GDMLWriteStructure.
+
+03 April 2009 Tatiana Nikitina (gdml-V09-02-07)
+- Correction in materials and solids tags for allowing parsing of
+  definitions within the tag scope; possibility foreseen by the schema.
+
+24 March 2009 Gabriele Cosmo (gdml-V09-02-06)
+- Added empty default constructor and virtual destructor to classes in the
+  inheritance chain.
+
+02 March 2009 Gabriele Cosmo (gdml-V09-02-05)
+- Fixed association of entities in nested loops for solids and materials.
+  Definitions of materials are not supposed to be included in loops being
+  therefore repeated...
+- Strip off white spaces from names G4GDMLWrite::GenerateName(), to avoid
+  parsing problems in imported files.
 
 26 February 2009 Tatiana Nikitina (gdml-V09-02-04)
Index: trunk/source/persistency/gdml/include/G4GDMLEvaluator.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLEvaluator.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLEvaluator.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLEvaluator.hh,v 1.16 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLEvaluator.hh,v 1.17 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -45,5 +45,5 @@
 #include <vector>
 
-#include "globals.hh"
+#include "G4Types.hh"
 
 class G4GDMLEvaluator
Index: trunk/source/persistency/gdml/include/G4GDMLParameterisation.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLParameterisation.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLParameterisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GDMLParameterisation.hh,v 1.10 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/gdml/include/G4GDMLParser.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLParser.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLParser.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLParser.hh,v 1.57 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLParser.hh,v 1.58 2009/04/15 13:29:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -54,4 +54,5 @@
    G4GDMLParser();
    G4GDMLParser(G4GDMLReadStructure*);
+   G4GDMLParser(G4GDMLReadStructure*, G4GDMLWriteStructure*);
   ~G4GDMLParser();
      //
@@ -113,5 +114,5 @@
    G4GDMLReadStructure* reader;
    G4GDMLWriteStructure* writer;
-   G4bool ucode;
+   G4bool urcode, uwcode;
 
 };
Index: trunk/source/persistency/gdml/include/G4GDMLParser.icc
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLParser.icc	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLParser.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GDMLParser.icc,v 1.8 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/persistency/gdml/include/G4GDMLRead.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLRead.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLRead.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLRead.hh,v 1.27 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLRead.hh,v 1.31 2009/05/12 15:46:43 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLRead
@@ -47,11 +47,10 @@
 #include <xercesc/dom/DOM.hpp>
 
+#include "G4Types.hh"
+
 #include "G4GDMLEvaluator.hh"
 
-#include "G4LogicalVolume.hh"
-#include "G4VisAttributes.hh"
-#include "G4PVPlacement.hh"
-
-#include <sstream>
+class G4LogicalVolume;
+class G4VPhysicalVolume;
 
 class G4GDMLErrorHandler : public xercesc::ErrorHandler
@@ -149,5 +148,5 @@
  private:
 
-   G4int inLoop;
+   G4int inLoop, loopCount;
 
 };
Index: trunk/source/persistency/gdml/include/G4GDMLReadDefine.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadDefine.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadDefine.hh	(revision 1228)
@@ -41,4 +41,6 @@
 
 #include "G4ThreeVector.hh"
+#include "G4RotationMatrix.hh"
+
 #include "G4GDMLRead.hh"
 
@@ -50,5 +52,7 @@
    G4GDMLMatrix();
    G4GDMLMatrix(size_t rows0,size_t cols0);
-   ~G4GDMLMatrix();
+   G4GDMLMatrix(const G4GDMLMatrix& rhs);
+   G4GDMLMatrix& operator=(const G4GDMLMatrix& rhs); 
+  ~G4GDMLMatrix();
 
    void Set(size_t r,size_t c,G4double a);
@@ -80,4 +84,7 @@
  protected:
 
+   G4GDMLReadDefine();
+   virtual ~G4GDMLReadDefine();
+
    G4RotationMatrix GetRotationMatrix(const G4ThreeVector&);
    void VectorRead(const xercesc::DOMElement* const,G4ThreeVector&);
@@ -90,5 +97,6 @@
    void ScaleRead(const xercesc::DOMElement* const);
    void VariableRead(const xercesc::DOMElement* const); 
-   void QuantityRead(const xercesc::DOMElement* const); 
+   void QuantityRead(const xercesc::DOMElement* const);
+   void ExpressionRead(const xercesc::DOMElement* const);
 
  protected:
Index: trunk/source/persistency/gdml/include/G4GDMLReadMaterials.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadMaterials.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadMaterials.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLReadMaterials.hh,v 1.9 2008/11/20 15:33:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadMaterials.hh,v 1.11 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -43,10 +43,10 @@
 #define _G4GDMLREADMATERIALS_INCLUDED_
 
-#include "G4Element.hh"
-#include "G4Isotope.hh"
-#include "G4Material.hh"
-#include "G4NistManager.hh"
+#include "G4Types.hh"
+#include "G4GDMLReadDefine.hh"
 
-#include "G4GDMLReadDefine.hh"
+class G4Element;
+class G4Isotope;
+class G4Material;
 
 class G4GDMLReadMaterials : public G4GDMLReadDefine 
@@ -62,4 +62,7 @@
 
  protected:
+
+   G4GDMLReadMaterials();
+   virtual ~G4GDMLReadMaterials();
 
    G4double AtomRead(const xercesc::DOMElement* const);
Index: trunk/source/persistency/gdml/include/G4GDMLReadParamvol.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadParamvol.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadParamvol.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLReadParamvol.hh,v 1.6 2008/11/20 15:33:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadParamvol.hh,v 1.8 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,11 +42,8 @@
 #define _G4GDMLREADPARAMVOL_INCLUDED_
 
-#include "G4LogicalVolume.hh"
-#include "G4PVParameterised.hh"
-#include "G4PVPlacement.hh"
-#include "G4VPhysicalVolume.hh"
+#include "G4GDMLReadSetup.hh"
+#include "G4GDMLParameterisation.hh"
 
-#include "G4GDMLParameterisation.hh"
-#include "G4GDMLReadSetup.hh"
+class G4LogicalVolume;
 
 class G4GDMLReadParamvol : public G4GDMLReadSetup
@@ -60,4 +57,7 @@
 
  protected:
+
+   G4GDMLReadParamvol();
+   virtual ~G4GDMLReadParamvol();
 
    void Box_dimensionsRead(const xercesc::DOMElement* const,
Index: trunk/source/persistency/gdml/include/G4GDMLReadSetup.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadSetup.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadSetup.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLReadSetup.hh,v 1.5 2008/11/20 15:33:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadSetup.hh,v 1.6 2009/03/24 15:47:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -58,4 +58,9 @@
  protected:
 
+   G4GDMLReadSetup();
+   virtual ~G4GDMLReadSetup();
+
+ protected:
+
    std::map<G4String,G4String> setupMap;
 };
Index: trunk/source/persistency/gdml/include/G4GDMLReadSolids.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadSolids.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadSolids.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLReadSolids.hh,v 1.12 2008/11/21 09:32:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadSolids.hh,v 1.15 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,39 +42,12 @@
 #define _G4GDMLREADSOLIDS_INCLUDED_
 
-#include "G4Box.hh"
-#include "G4Cons.hh"
-#include "G4Ellipsoid.hh"
-#include "G4EllipticalCone.hh"
-#include "G4EllipticalTube.hh"
+#include "G4Types.hh"
+#include "G4GDMLReadMaterials.hh"
 #include "G4ExtrudedSolid.hh"
-#include "G4Hype.hh"
-#include "G4IntersectionSolid.hh"
-#include "G4Orb.hh"
-#include "G4Para.hh"
-#include "G4Paraboloid.hh"
-#include "G4Polycone.hh"
-#include "G4Polyhedra.hh"
-#include "G4QuadrangularFacet.hh"
-#include "G4ReflectedSolid.hh"
-#include "G4Sphere.hh"
-#include "G4SolidStore.hh"
-#include "G4SubtractionSolid.hh"
-#include "G4TessellatedSolid.hh"
-#include "G4Tet.hh"
-#include "G4Torus.hh"
-#include "G4Transform3D.hh"
-#include "G4Trap.hh"
-#include "G4Trd.hh"
-#include "G4TriangularFacet.hh"
-#include "G4Tubs.hh"
-#include "G4TwistedBox.hh"
-#include "G4TwistedTrap.hh"
-#include "G4TwistedTrd.hh"
-#include "G4TwistedTubs.hh"
-#include "G4UnionSolid.hh"
-#include "G4OpticalSurface.hh"
-#include "G4SurfaceProperty.hh"
 
-#include "G4GDMLReadMaterials.hh"
+class G4VSolid;
+class G4QuadrangularFacet;
+class G4TriangularFacet;
+class G4SurfaceProperty;
 
 class G4GDMLReadSolids : public G4GDMLReadMaterials
@@ -91,4 +64,7 @@
 
  protected:
+
+   G4GDMLReadSolids();
+   virtual ~G4GDMLReadSolids();
 
    void BooleanRead(const xercesc::DOMElement* const,const BooleanOp);
@@ -122,5 +98,5 @@
    G4TwoVector TwoDimVertexRead(const xercesc::DOMElement* const,G4double);
    zplaneType ZplaneRead(const xercesc::DOMElement* const);
-   void OpticalsurfaceRead(const xercesc::DOMElement* const);
+   void OpticalSurfaceRead(const xercesc::DOMElement* const);
 };
 
Index: trunk/source/persistency/gdml/include/G4GDMLReadStructure.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLReadStructure.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLReadStructure.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLReadStructure.hh,v 1.24 2009/02/24 17:41:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadStructure.hh,v 1.28 2009/09/24 15:04:34 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,20 +42,12 @@
 #define _G4GDMLREADSTRUCTURE_INCLUDED_
 
-#include "G4AssemblyVolume.hh"
-#include "G4LogicalVolume.hh"
-#include "G4LogicalVolumeStore.hh"
-#include "G4PhysicalVolumeStore.hh"
-#include "G4PVDivision.hh"
-#include "G4PVPlacement.hh"
-#include "G4PVReplica.hh"
-#include "G4SolidStore.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4ReflectionFactory.hh"
-#include "G4PhysicalVolumeStore.hh"
-#include "G4LogicalSkinSurface.hh"
-#include "G4LogicalBorderSurface.hh"
-#include "G4PVDivisionFactory.hh"
+#include "G4Types.hh"
+#include "geomdefs.hh"
 
 #include "G4GDMLReadParamvol.hh"
+
+class G4AssemblyVolume;
+class G4LogicalVolume;
+class G4VPhysicalVolume;
 
 struct G4GDMLAuxPairType
@@ -67,4 +59,5 @@
 typedef std::vector<G4GDMLAuxPairType> G4GDMLAuxListType;
 typedef std::map<const G4LogicalVolume*,G4GDMLAuxListType> G4GDMLAuxMapType;
+typedef std::map<G4String, G4AssemblyVolume*> G4GDMLAssemblyMapType;
 
 class G4GDMLReadStructure : public G4GDMLReadParamvol
@@ -73,6 +66,10 @@
  public:
 
+   G4GDMLReadStructure();
+   virtual ~G4GDMLReadStructure();
+
    G4VPhysicalVolume* GetPhysvol(const G4String&) const;
    G4LogicalVolume* GetVolume(const G4String&) const;
+   G4AssemblyVolume* GetAssembly(const G4String&) const;
    G4GDMLAuxListType GetVolumeAuxiliaryInformation(const G4LogicalVolume* const);
    G4VPhysicalVolume* GetWorldVolume(const G4String&);
@@ -86,8 +83,9 @@
 
    G4GDMLAuxPairType AuxiliaryRead(const xercesc::DOMElement* const);
-   void BordersurfaceRead(const xercesc::DOMElement* const);
+   void AssemblyRead(const xercesc::DOMElement* const);
    void DivisionvolRead(const xercesc::DOMElement* const);
    G4LogicalVolume* FileRead(const xercesc::DOMElement* const);
-   void PhysvolRead(const xercesc::DOMElement* const);
+   void PhysvolRead(const xercesc::DOMElement* const,
+                    G4AssemblyVolume* assembly=0);
    void ReplicavolRead(const xercesc::DOMElement* const, G4int number);
    void ReplicaRead(const xercesc::DOMElement* const replicaElement,
@@ -95,9 +93,11 @@
    EAxis AxisRead(const xercesc::DOMElement* const axisElement);
    G4double QuantityRead(const xercesc::DOMElement* const readElement);
-   void SkinsurfaceRead(const xercesc::DOMElement* const);
+   void BorderSurfaceRead(const xercesc::DOMElement* const);
+   void SkinSurfaceRead(const xercesc::DOMElement* const);
 
  protected:
 
    G4GDMLAuxMapType auxMap;
+   G4GDMLAssemblyMapType assemblyMap;
    G4LogicalVolume *pMotherLogical;
 
Index: trunk/source/persistency/gdml/include/G4GDMLWrite.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWrite.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWrite.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWrite.hh,v 1.37 2008/08/19 15:03:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWrite.hh,v 1.41 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,6 +42,5 @@
 #define _G4GDMLWRITE_INCLUDED_
 
-#include <sys/stat.h>
-#include <iostream>
+#include <map>
 
 #include <xercesc/dom/DOM.hpp>
@@ -50,56 +49,80 @@
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
 
-#include "G4LogicalVolume.hh"
 #include "G4Transform3D.hh"
-#include "G4PVDivision.hh"
+
+class G4LogicalVolume;
+class G4VPhysicalVolume;
 
 class G4GDMLWrite
 {
-   typedef std::map<const G4LogicalVolume*,G4Transform3D> VolumeMapType;
-   typedef std::map<const G4VPhysicalVolume*,G4String> PhysVolumeMapType;
-   typedef std::map<G4int,G4int> DepthMapType;
+  typedef std::map<const G4LogicalVolume*,G4Transform3D> VolumeMapType;
+  typedef std::map<const G4VPhysicalVolume*,G4String> PhysVolumeMapType;
+  typedef std::map<G4int,G4int> DepthMapType;
 
- public:  // without description
+  public:  // with description
 
-   G4Transform3D Write(const G4String& filename,
-                       const G4LogicalVolume* const topLog,
-                       const G4String& schemaPath,
-                       const G4int depth, G4bool storeReferences=true);
-   void AddModule(const G4VPhysicalVolume* const topVol);
-   void AddModule(const G4int depth);
-   static void SetAddPointerToName(G4bool);
+    G4Transform3D Write(const G4String& filename,
+                        const G4LogicalVolume* const topLog,
+                        const G4String& schemaPath,
+                        const G4int depth, G4bool storeReferences=true);
+      //
+      // Main method for writing GDML files.
 
- protected:
+    void AddModule(const G4VPhysicalVolume* const topVol);
+    void AddModule(const G4int depth);
+      //
+      // Split geometry structure in modules, by volume subtree or level
 
-   G4String SchemaLocation;
+    static void SetAddPointerToName(G4bool);
+      //
+      // Specify if to add or not memory addresses to IDs.
 
-   VolumeMapType& VolumeMap();
+    virtual void DefineWrite(xercesc::DOMElement*)=0;
+    virtual void MaterialsWrite(xercesc::DOMElement*)=0;
+    virtual void SolidsWrite(xercesc::DOMElement*)=0;
+    virtual void StructureWrite(xercesc::DOMElement*)=0;
+    virtual G4Transform3D TraverseVolumeTree(const G4LogicalVolume* const,
+                                             const G4int)=0;
+    virtual void SurfacesWrite()=0;
+    virtual void SetupWrite(xercesc::DOMElement*,
+                            const G4LogicalVolume* const)=0;
+      //
+      // Pure virtual methods implemented in concrete writer plugin's classes
 
-   G4String GenerateName(const G4String&,const void* const);
-   xercesc::DOMAttr* NewAttribute(const G4String&, const G4String&);
-   xercesc::DOMAttr* NewAttribute(const G4String&, const G4double&);
-   xercesc::DOMElement* NewElement(const G4String&);
-   virtual void DefineWrite(xercesc::DOMElement*)=0;
-   virtual void MaterialsWrite(xercesc::DOMElement*)=0;
-   virtual void SolidsWrite(xercesc::DOMElement*)=0;
-   virtual void StructureWrite(xercesc::DOMElement*)=0;
-   virtual G4Transform3D TraverseVolumeTree(const G4LogicalVolume* const,
-                                            const G4int)=0;
-   virtual void SetupWrite(xercesc::DOMElement*,
-                           const G4LogicalVolume* const)=0;
-   G4String Modularize(const G4VPhysicalVolume* const topvol,
-                       const G4int depth);
+    virtual void ExtensionWrite(xercesc::DOMElement*);
+    virtual void AddExtension(xercesc::DOMElement*,
+                              const G4LogicalVolume* const);
+      //
+      // To be implemented in the client code for handling extensions
+      // to the GDML schema, identified with the tag "extension".
+      // The implementation should be placed inside a user-class
+      // inheriting from G4GDMLWriteStructure and being registered
+      // as argument to G4GDMLParser.
 
- private:
+  protected:
 
-   G4bool FileExists(const G4String&) const;
-   PhysVolumeMapType& PvolumeMap();
-   DepthMapType& DepthMap();
+    G4GDMLWrite();
+    virtual ~G4GDMLWrite();
 
- private:
+    VolumeMapType& VolumeMap();
 
-   static G4bool addPointerToName;
-   xercesc::DOMDocument* doc;
-   XMLCh tempStr[100];
+    G4String GenerateName(const G4String&,const void* const);
+    xercesc::DOMAttr* NewAttribute(const G4String&, const G4String&);
+    xercesc::DOMAttr* NewAttribute(const G4String&, const G4double&);
+    xercesc::DOMElement* NewElement(const G4String&);
+    G4String Modularize(const G4VPhysicalVolume* const topvol,
+                        const G4int depth);
+
+    G4bool FileExists(const G4String&) const;
+    PhysVolumeMapType& PvolumeMap();
+    DepthMapType& DepthMap();
+
+  protected:
+
+    G4String SchemaLocation;
+    static G4bool addPointerToName;
+    xercesc::DOMDocument* doc;
+    xercesc::DOMElement* extElement;
+    XMLCh tempStr[100];
 
 };
Index: trunk/source/persistency/gdml/include/G4GDMLWriteDefine.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteDefine.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteDefine.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteDefine.hh,v 1.11 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteDefine.hh,v 1.14 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,51 +42,55 @@
 #define _G4GDMLWRITEDEFINE_INCLUDED_
 
+#include "G4Types.hh"
+#include "G4ThreeVector.hh"
+#include "G4RotationMatrix.hh"
+
 #include "G4GDMLWrite.hh"
-#include <sstream>
 
 class G4GDMLWriteDefine : public G4GDMLWrite
 {
 
- protected:
+  public:
 
-   G4ThreeVector GetAngles(const G4RotationMatrix&);
-   void ScaleWrite(xercesc::DOMElement* element, const G4String& name,
-                    const G4ThreeVector& scl)
-     { Scale_vectorWrite(element,"scale",name,scl); }
-   void RotationWrite(xercesc::DOMElement* element, const G4String& name,
-                    const G4ThreeVector& rot)
-     { Rotation_vectorWrite(element,"rotation",name,rot); }
-   void PositionWrite(xercesc::DOMElement* element, const G4String& name,
-                    const G4ThreeVector& pos)
-     { Position_vectorWrite(element,"position",name,pos); }
-   void FirstrotationWrite(xercesc::DOMElement* element, const G4String& name,
-                    const G4ThreeVector& rot)
-     { Rotation_vectorWrite(element,"firstrotation",name,rot); }
-   void FirstpositionWrite(xercesc::DOMElement* element, const G4String& name,
-                    const G4ThreeVector& pos)
-     { Position_vectorWrite(element,"firstposition",name,pos); }
-   void AddPosition(const G4String& name,
-                    const G4ThreeVector& pos)
-     { Position_vectorWrite(defineElement,"position",name,pos); }
+    G4ThreeVector GetAngles(const G4RotationMatrix&);
+    void ScaleWrite(xercesc::DOMElement* element,
+                    const G4String& name, const G4ThreeVector& scl)
+         { Scale_vectorWrite(element,"scale",name,scl); }
+    void RotationWrite(xercesc::DOMElement* element,
+                    const G4String& name, const G4ThreeVector& rot)
+         { Rotation_vectorWrite(element,"rotation",name,rot); }
+    void PositionWrite(xercesc::DOMElement* element,
+                    const G4String& name, const G4ThreeVector& pos)
+         { Position_vectorWrite(element,"position",name,pos); }
+    void FirstrotationWrite(xercesc::DOMElement* element,
+                    const G4String& name, const G4ThreeVector& rot)
+         { Rotation_vectorWrite(element,"firstrotation",name,rot); }
+    void FirstpositionWrite(xercesc::DOMElement* element,
+                    const G4String& name, const G4ThreeVector& pos)
+         { Position_vectorWrite(element,"firstposition",name,pos); }
+    void AddPosition(const G4String& name, const G4ThreeVector& pos)
+         { Position_vectorWrite(defineElement,"position",name,pos); }
 
- protected:
+    virtual void DefineWrite(xercesc::DOMElement*);
 
-   static const G4double kRelativePrecision;
-   static const G4double kAngularPrecision;
-   static const G4double kLinearPrecision;
+  protected:
+
+    G4GDMLWriteDefine();
+    virtual ~G4GDMLWriteDefine();
+
+    void Scale_vectorWrite(xercesc::DOMElement*, const G4String&,
+                              const G4String&, const G4ThreeVector&);
+    void Rotation_vectorWrite(xercesc::DOMElement*, const G4String&,
+                              const G4String&, const G4ThreeVector&);
+    void Position_vectorWrite(xercesc::DOMElement*, const G4String&,
+                              const G4String&, const G4ThreeVector&);
+
+  protected:
+
+    static const G4double kRelativePrecision;
+    static const G4double kAngularPrecision;
+    static const G4double kLinearPrecision;
   
- private:
-
-   void Scale_vectorWrite(xercesc::DOMElement*, const G4String&,
-                             const G4String&, const G4ThreeVector&);
-   void Rotation_vectorWrite(xercesc::DOMElement*, const G4String&,
-                             const G4String&, const G4ThreeVector&);
-   void Position_vectorWrite(xercesc::DOMElement*, const G4String&,
-                             const G4String&, const G4ThreeVector&);
-   void DefineWrite(xercesc::DOMElement*);
-
- private:
-
-   xercesc::DOMElement* defineElement;
+    xercesc::DOMElement* defineElement;
 
 };
Index: trunk/source/persistency/gdml/include/G4GDMLWriteMaterials.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteMaterials.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteMaterials.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteMaterials.hh,v 1.12 2008/07/16 15:46:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteMaterials.hh,v 1.17 2009/04/27 07:22:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,14 +42,18 @@
 #define _G4GDMLWRITEMATERIALS_INCLUDED_
 
-#include "G4Element.hh"
-#include "G4Isotope.hh"
-#include "G4Material.hh"
+#include "G4Types.hh"
+#include <vector>
 
 #include "G4GDMLWriteDefine.hh"
+
+class G4Isotope;
+class G4Element;
+class G4Material;
+class G4MaterialPropertyVector;
 
 class G4GDMLWriteMaterials : public G4GDMLWriteDefine
 {
 
- protected:
+ public:
 
    void AddIsotope(const G4Isotope* const);
@@ -57,5 +61,10 @@
    void AddMaterial(const G4Material* const);
 
- private:
+   virtual void MaterialsWrite(xercesc::DOMElement*);
+
+ protected:
+
+   G4GDMLWriteMaterials();
+   virtual ~G4GDMLWriteMaterials();
 
    void AtomWrite(xercesc::DOMElement*,const G4double&);
@@ -66,7 +75,8 @@
    void ElementWrite(const G4Element* const);
    void MaterialWrite(const G4Material* const);
-   void MaterialsWrite(xercesc::DOMElement*);
-
- private:
+   void PropertyWrite(xercesc::DOMElement*, const G4Material* const);
+   void PropertyVectorWrite(const G4String&,
+                            const G4MaterialPropertyVector* const);
+ protected:
 
    std::vector<const G4Isotope*> isotopeList;
Index: trunk/source/persistency/gdml/include/G4GDMLWriteParamvol.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteParamvol.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteParamvol.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteParamvol.hh,v 1.10 2008/08/13 13:58:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteParamvol.hh,v 1.13 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,17 +42,32 @@
 #define _G4GDMLWRITEPARAMVOL_INCLUDED_
 
-#include "G4PVParameterised.hh"
-#include "G4VPhysicalVolume.hh"
+#include "G4GDMLWriteSetup.hh"
 
-#include "G4GDMLWriteSetup.hh"
+class G4Box;
+class G4Trd;
+class G4Trap;
+class G4Tubs;
+class G4Cons;
+class G4Sphere;
+class G4Orb;
+class G4Torus;
+class G4Para;
+class G4Hype;
+class G4VPhysicalVolume;
 
 class G4GDMLWriteParamvol : public G4GDMLWriteSetup
 {
 
+ public:
+
+   virtual void ParamvolWrite(xercesc::DOMElement*,
+                              const G4VPhysicalVolume* const);
+   virtual void ParamvolAlgorithmWrite(xercesc::DOMElement* paramvolElement,
+                              const G4VPhysicalVolume* const paramvol);
+
  protected:
 
-   void ParamvolWrite(xercesc::DOMElement*, const G4VPhysicalVolume* const);
-
- private:
+   G4GDMLWriteParamvol();
+   virtual ~G4GDMLWriteParamvol();
 
    void Box_dimensionsWrite(xercesc::DOMElement*, const G4Box* const);
@@ -68,6 +83,4 @@
    void ParametersWrite(xercesc::DOMElement*,
                         const G4VPhysicalVolume* const, const G4int&);
-   void ParamvolAlgorithmWrite(xercesc::DOMElement* paramvolElement,
-                               const G4VPhysicalVolume* const paramvol);
 
 };
Index: trunk/source/persistency/gdml/include/G4GDMLWriteSetup.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteSetup.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteSetup.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteSetup.hh,v 1.7 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteSetup.hh,v 1.9 2009/04/15 13:29:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -46,7 +46,13 @@
 class G4GDMLWriteSetup : public G4GDMLWriteSolids
 {
- private:
+  public:
 
-   void SetupWrite(xercesc::DOMElement*, const G4LogicalVolume* const);
+    virtual void SetupWrite(xercesc::DOMElement*, const G4LogicalVolume* const);
+
+ protected:
+
+   G4GDMLWriteSetup();
+   virtual ~G4GDMLWriteSetup();
+
 };
 
Index: trunk/source/persistency/gdml/include/G4GDMLWriteSolids.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteSolids.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteSolids.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteSolids.hh,v 1.32 2008/11/21 09:32:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteSolids.hh,v 1.38 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,43 +42,46 @@
 #define _G4GDMLWRITESOLIDS_INCLUDED_
 
-#include "G4BooleanSolid.hh"
-#include "G4Box.hh"
-#include "G4Cons.hh"
-#include "G4Ellipsoid.hh"
-#include "G4EllipticalCone.hh"
-#include "G4EllipticalTube.hh"
-#include "G4ExtrudedSolid.hh"
-#include "G4Hype.hh"
-#include "G4Orb.hh"
-#include "G4Para.hh"
-#include "G4Paraboloid.hh"
-#include "G4IntersectionSolid.hh"
-#include "G4Polycone.hh"
-#include "G4Polyhedra.hh"
-#include "G4ReflectedSolid.hh"
-#include "G4Sphere.hh"
-#include "G4SubtractionSolid.hh"
-#include "G4TessellatedSolid.hh"
-#include "G4Tet.hh"
-#include "G4Torus.hh"
-#include "G4Trap.hh"
-#include "G4Trd.hh"
-#include "G4Tubs.hh"
-#include "G4TwistedBox.hh"
-#include "G4TwistedTrap.hh"
-#include "G4TwistedTrd.hh"
-#include "G4TwistedTubs.hh"
-#include "G4UnionSolid.hh"
+#include "G4Types.hh"
 
 #include "G4GDMLWriteMaterials.hh"
 
+class G4BooleanSolid;
+class G4Box;
+class G4Cons;
+class G4EllipticalCone;
+class G4Ellipsoid;
+class G4EllipticalTube;
+class G4ExtrudedSolid;
+class G4Hype;
+class G4Orb;
+class G4Para;
+class G4Paraboloid;
+class G4Polycone;
+class G4Polyhedra;
+class G4Sphere;
+class G4TessellatedSolid;
+class G4Tet;
+class G4Torus;
+class G4Trap;
+class G4Trd;
+class G4Tubs;
+class G4TwistedBox;
+class G4TwistedTrap;
+class G4TwistedTrd;
+class G4TwistedTubs;
+class G4VSolid;
+class G4OpticalSurface;
+
 class G4GDMLWriteSolids : public G4GDMLWriteMaterials
 {
+  public:
 
- protected:
+   virtual void AddSolid(const G4VSolid* const);
+   virtual void SolidsWrite(xercesc::DOMElement*);
 
-   void AddSolid(const G4VSolid* const);
+  protected:
 
- private:
+   G4GDMLWriteSolids();
+   virtual ~G4GDMLWriteSolids();
 
    void BooleanWrite(xercesc::DOMElement*, const G4BooleanSolid* const);
@@ -108,10 +111,14 @@
    void ZplaneWrite(xercesc::DOMElement*, const G4double&,
                     const G4double&, const G4double&);
-   void SolidsWrite(xercesc::DOMElement*);
+   void OpticalSurfaceWrite(xercesc::DOMElement*,
+                    const G4OpticalSurface* const);
 
- private:
+  protected:
 
    std::vector<const G4VSolid*> solidList;
    xercesc::DOMElement* solidsElement;
+   static const G4int maxTransforms = 8; // Constant for limiting the number
+                                         // of displacements/reflections
+                                         // applied to a single solid
 };
 
Index: trunk/source/persistency/gdml/include/G4GDMLWriteStructure.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4GDMLWriteStructure.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4GDMLWriteStructure.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteStructure.hh,v 1.34 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteStructure.hh,v 1.39 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -42,34 +42,51 @@
 #define _G4GDMLWRITESTRUCTURE_INCLUDED_
 
-#include "G4LogicalVolumeStore.hh"
-#include "G4PhysicalVolumeStore.hh"
-#include "G4Material.hh"
-#include "G4PVDivision.hh"
-#include "G4PVReplica.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4ReflectedSolid.hh"
+#include "G4Types.hh"
 #include "G4Transform3D.hh"
 
 #include "G4GDMLWriteParamvol.hh"
 
+class G4LogicalVolume;
+class G4VPhysicalVolume;
+class G4PVDivision;
+class G4LogicalBorderSurface;
+class G4LogicalSkinSurface;
+class G4OpticalSurface;
+class G4SurfaceProperty;
+
 class G4GDMLWriteStructure : public G4GDMLWriteParamvol
 {
 
- private:
+ public:
 
-   void DivisionvolWrite(xercesc::DOMElement*,const G4PVDivision* const);
+   G4GDMLWriteStructure();
+   virtual ~G4GDMLWriteStructure();
+
+   virtual void StructureWrite(xercesc::DOMElement*);
+
+ protected:
+
+   void DivisionvolWrite(xercesc::DOMElement*, const G4PVDivision* const);
    void PhysvolWrite(xercesc::DOMElement*,const G4VPhysicalVolume* const topVol,
-                                          const G4Transform3D& transform,
-                                          const G4String& moduleName);
-   void ReplicavolWrite(xercesc::DOMElement*,const G4VPhysicalVolume* const);
-   void StructureWrite(xercesc::DOMElement*);
+                   const G4Transform3D& transform, const G4String& moduleName);
+   void ReplicavolWrite(xercesc::DOMElement*, const G4VPhysicalVolume* const);
    G4Transform3D TraverseVolumeTree(const G4LogicalVolume* const topVol,
                                     const G4int depth);
- private:
+   void SurfacesWrite();
+   void BorderSurfaceCache(const G4LogicalBorderSurface* const);
+   void SkinSurfaceCache(const G4LogicalSkinSurface* const);
+   const G4LogicalBorderSurface* GetBorderSurface(const G4VPhysicalVolume* const);
+   const G4LogicalSkinSurface* GetSkinSurface(const G4LogicalVolume* const);
+   G4bool FindOpticalSurface(const G4SurfaceProperty*);
+
+ protected:
 
    xercesc::DOMElement* structureElement;
-   static const int maxReflections = 8; // Constant for limiting the number
-                                        // of displacements/reflections applied
-                                        // to a single solid
+   std::vector<xercesc::DOMElement*> borderElementVec;
+   std::vector<xercesc::DOMElement*> skinElementVec;
+
+ private:  // cache for optical surfaces...
+
+   std::vector<const G4OpticalSurface*> opt_vec;
 };
 
Index: trunk/source/persistency/gdml/include/G4STRead.hh
===================================================================
--- trunk/source/persistency/gdml/include/G4STRead.hh	(revision 1227)
+++ trunk/source/persistency/gdml/include/G4STRead.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4STRead.hh,v 1.3 2008/07/17 14:05:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4STRead.hh,v 1.4 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -44,15 +44,13 @@
 #define _G4STREAD_INCLUDED_
 
-#include <fstream>
 #include <vector>
 #include <map>
 
-#include "G4TessellatedSolid.hh"
-#include "G4QuadrangularFacet.hh"
-#include "G4TriangularFacet.hh"
-#include "G4LogicalVolume.hh"
-#include "G4PVPlacement.hh"
-#include "G4Material.hh"
-#include "G4Box.hh"
+#include "G4ThreeVector.hh"
+
+class G4Material;
+class G4Box;
+class G4TessellatedSolid;
+class G4LogicalVolume;
 
 class G4STRead
Index: trunk/source/persistency/gdml/src/G4GDMLEvaluator.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLEvaluator.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLEvaluator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4GDMLEvaluator.cc,v 1.22 2009/02/26 10:13:35 gcosmo Exp $
+// $Id: G4GDMLEvaluator.cc,v 1.23 2009/04/24 15:34:20 gcosmo Exp $
 // GEANT4 tag $ Name:$
 //
@@ -35,4 +35,7 @@
 
 #include <sstream>
+
+#include "globals.hh"
+
 #include "G4GDMLEvaluator.hh"
 
Index: trunk/source/persistency/gdml/src/G4GDMLParameterisation.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLParameterisation.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLParameterisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GDMLParameterisation.cc,v 1.11 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLParameterisation Implementation
Index: trunk/source/persistency/gdml/src/G4GDMLParser.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLParser.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLParser.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLParser.cc,v 1.13 2008/11/20 15:33:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-cand-01 $
+// $Id: G4GDMLParser.cc,v 1.14 2009/04/15 13:29:30 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -36,5 +36,5 @@
 
 G4GDMLParser::G4GDMLParser()
-  : ucode(false)
+  : urcode(false), uwcode(false)
 {
   reader = new G4GDMLReadStructure;
@@ -43,9 +43,18 @@
 }
 
-G4GDMLParser::G4GDMLParser(G4GDMLReadStructure* ext)
-  : ucode(true)
+G4GDMLParser::G4GDMLParser(G4GDMLReadStructure* extr)
+  : urcode(true), uwcode(false)
 {
-  reader = ext;
+  reader = extr;
   writer = new G4GDMLWriteStructure;
+  xercesc::XMLPlatformUtils::Initialize();
+}
+
+G4GDMLParser::G4GDMLParser(G4GDMLReadStructure* extr,
+                           G4GDMLWriteStructure* extw)
+  : urcode(true), uwcode(true)
+{
+  reader = extr;
+  writer = extw;
   xercesc::XMLPlatformUtils::Initialize();
 }
@@ -54,5 +63,5 @@
 {
   xercesc::XMLPlatformUtils::Terminate();
-  delete writer;
-  if (!ucode) { delete reader; }
+  if (!urcode) { delete reader; }
+  if (!uwcode) { delete writer; }
 }
Index: trunk/source/persistency/gdml/src/G4GDMLRead.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLRead.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLRead.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLRead.cc,v 1.41 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLRead.cc,v 1.47 2009/05/12 15:46:43 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLRead Implementation
@@ -33,5 +33,9 @@
 // -------------------------------------------------------------------------
 
+#include "globals.hh"
+
 #include "G4GDMLRead.hh"
+
+#include "G4UnitsTable.hh"
 #include "G4Element.hh"
 #include "G4Material.hh"
@@ -39,8 +43,7 @@
 #include "G4LogicalVolumeStore.hh"
 #include "G4PhysicalVolumeStore.hh"
-#include "G4UnitsTable.hh"
 
 G4GDMLRead::G4GDMLRead()
-  : validate(true), check(false)
+  : validate(true), check(false), inLoop(0), loopCount(0)
 {
    G4UnitDefinition::BuildUnitsTable();
@@ -68,5 +71,11 @@
    G4String nameOut(nameIn);
 
-   if (inLoop>0) { nameOut = eval.SolveBrackets(nameOut); }
+   if (inLoop>0)
+   {
+     nameOut = eval.SolveBrackets(nameOut);
+//     std::stringstream stream;
+//     stream << "0x" << loopCount;
+//     nameOut = nameOut + stream.str();
+   }
    if (strip) { StripName(nameOut); }
 
@@ -235,14 +244,15 @@
 
    inLoop++;
-   
+
    while (_var <= _to)
    {
       eval.SetVariable(var,_var);
       (this->*func)(element);
-
       _var += _step;
+      loopCount++;
    }
 
    inLoop--;
+   if (!inLoop) { loopCount = 0; }
 }
 
Index: trunk/source/persistency/gdml/src/G4GDMLReadDefine.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadDefine.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadDefine.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadDefine.cc,v 1.20 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadDefine.cc,v 1.24 2009/10/14 13:10:18 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLReadDefine Implementation
@@ -36,12 +36,15 @@
 
 G4GDMLMatrix::G4GDMLMatrix()
-{
-   rows = 0;
-   cols = 0;
-   m = 0;
-}
-
-G4GDMLMatrix::G4GDMLMatrix(size_t rows0,size_t cols0)
+  : m(0), rows(0), cols(0)
+{
+}
+
+G4GDMLMatrix::G4GDMLMatrix(size_t rows0, size_t cols0)
 {   
+   if ((rows<=0) || (cols<=0))
+   {
+     G4Exception("G4GDMLMatrix::G4GDMLMatrix(r,c)", "InvalidSetup",
+                 FatalException, "Zero indeces as arguments!?");
+   }
    rows = rows0;
    cols = cols0;
@@ -49,7 +52,42 @@
 }
 
+G4GDMLMatrix::G4GDMLMatrix(const G4GDMLMatrix& rhs)
+  : m(0), rows(0), cols(0)
+{
+   if (rhs.m)
+   {
+     rows = rhs.rows;
+     cols = rhs.cols;
+     m = new G4double[rows*cols];
+     for (size_t i=0; i<rows*cols; i++)  { m[i] = rhs.m[i]; }
+   }
+}
+
+G4GDMLMatrix& G4GDMLMatrix::operator=(const G4GDMLMatrix& rhs)
+{
+   // Check assignment to self
+   //
+   if (this == &rhs)  { return *this; }
+
+   // Copy data
+   //
+   rows = rhs.rows;
+   cols = rhs.cols;
+   if (rhs.m)
+   {
+     m = new G4double[rows*cols];
+     for (size_t i=0; i<rows*cols; i++)  { m[i] = rhs.m[i]; }
+   }
+   else
+   {
+     m = 0;
+   }
+
+   return *this;
+}
+
 G4GDMLMatrix::~G4GDMLMatrix()
 {
-   if (m) { delete [] m; }
+   delete [] m;
 }
 
@@ -84,4 +122,12 @@
 }
 
+G4GDMLReadDefine::G4GDMLReadDefine() : G4GDMLRead()
+{
+}
+
+G4GDMLReadDefine::~G4GDMLReadDefine()
+{
+}
+
 G4RotationMatrix
 G4GDMLReadDefine::GetRotationMatrix(const G4ThreeVector& angles)
@@ -122,4 +168,34 @@
    }
 
+   eval.DefineConstant(name,value);
+}
+
+void
+G4GDMLReadDefine::ExpressionRead(const xercesc::DOMElement* const expElement)
+{
+   G4String name  = "";
+   G4double value = 0.0;
+
+   const xercesc::DOMNamedNodeMap* const attributes
+         = expElement->getAttributes();
+   XMLSize_t attributeCount = attributes->getLength();
+
+   for (XMLSize_t attribute_index=0;
+        attribute_index<attributeCount; attribute_index++)
+   {
+      xercesc::DOMNode* node = attributes->item(attribute_index);
+
+      if (node->getNodeType() != xercesc::DOMNode::ATTRIBUTE_NODE) { continue; }
+
+      const xercesc::DOMAttr* const attribute
+            = dynamic_cast<xercesc::DOMAttr*>(node);   
+      const G4String attName = Transcode(attribute->getName());
+      const G4String attValue = Transcode(attribute->getValue());
+
+      if (attName=="name")  { name = attValue; }
+   }
+
+   const G4String expValue = Transcode(expElement->getTextContent());
+   value = eval.Evaluate(expValue);
    eval.DefineConstant(name,value);
 }
@@ -328,4 +404,5 @@
 
    quantityMap[name] = value*unit;
+   eval.DefineConstant(name,value*unit);
 }
 
@@ -350,5 +427,6 @@
       if (tag=="scale")    { ScaleRead(child); }    else
       if (tag=="variable") { VariableRead(child); } else
-      if (tag=="quantity") { QuantityRead(child); }
+      if (tag=="quantity") { QuantityRead(child); } else
+      if (tag=="expression") { ExpressionRead(child); }
       else
       {
Index: trunk/source/persistency/gdml/src/G4GDMLReadMaterials.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadMaterials.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadMaterials.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4GDMLReadMaterials.cc,v 1.16 2008/08/22 10:00:20 gcosmo Exp $
+// $Id: G4GDMLReadMaterials.cc,v 1.20 2009/04/24 15:34:20 gcosmo Exp $
 // GEANT4 tag $ Name:$
 //
@@ -35,4 +35,17 @@
 
 #include "G4GDMLReadMaterials.hh"
+
+#include "G4Element.hh"
+#include "G4Isotope.hh"
+#include "G4Material.hh"
+#include "G4NistManager.hh"
+
+G4GDMLReadMaterials::G4GDMLReadMaterials() : G4GDMLReadDefine()
+{
+}
+
+G4GDMLReadMaterials::~G4GDMLReadMaterials()
+{
+}
 
 G4double
@@ -497,16 +510,23 @@
    if (matrix.GetRows() == 0) { return; }
 
-   G4MaterialPropertiesTable* matprop = material->GetMaterialPropertiesTable();
+   G4MaterialPropertiesTable* matprop=material->GetMaterialPropertiesTable();
    if (!matprop)
    {
-     material->SetMaterialPropertiesTable(
-               matprop = new G4MaterialPropertiesTable());
-   }
-   G4MaterialPropertyVector* propvect = new G4MaterialPropertyVector(0,0,0);
-   for (size_t i=0; i<matrix.GetRows(); i++)
-   {
-     propvect->AddElement(matrix.Get(i,0),matrix.Get(i,1));
-   }
-   matprop->AddProperty(Strip(name),propvect);
+     matprop = new G4MaterialPropertiesTable();
+     material->SetMaterialPropertiesTable(matprop);
+   }
+   if (matrix.GetCols() == 1)  // constant property assumed
+   {
+     matprop->AddConstProperty(Strip(name), matrix.Get(0,0));
+   }
+   else  // build the material properties vector
+   {
+     G4MaterialPropertyVector* propvect = new G4MaterialPropertyVector(0,0,0);
+     for (size_t i=0; i<matrix.GetRows(); i++)
+     {
+       propvect->AddElement(matrix.Get(i,0),matrix.Get(i,1));
+     }
+     matprop->AddProperty(Strip(name),propvect);
+   }
 }
 
@@ -524,5 +544,6 @@
             = dynamic_cast<xercesc::DOMElement*>(iter);
       const G4String tag = Transcode(child->getTagName());
-
+      
+      if (tag=="define")   { DefineRead(child);  }  else 
       if (tag=="element")  { ElementRead(child); }  else 
       if (tag=="isotope")  { IsotopeRead(child); }  else 
Index: trunk/source/persistency/gdml/src/G4GDMLReadParamvol.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadParamvol.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadParamvol.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadParamvol.cc,v 1.11 2009/01/22 11:02:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadParamvol.cc,v 1.13 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLReadParamvol Implementation
@@ -34,4 +34,17 @@
 
 #include "G4GDMLReadParamvol.hh"
+
+#include "G4LogicalVolume.hh"
+#include "G4PVParameterised.hh"
+#include "G4PVPlacement.hh"
+#include "G4VPhysicalVolume.hh"
+
+G4GDMLReadParamvol::G4GDMLReadParamvol() : G4GDMLReadSetup()
+{
+}
+
+G4GDMLReadParamvol::~G4GDMLReadParamvol()
+{
+}
 
 void G4GDMLReadParamvol::
Index: trunk/source/persistency/gdml/src/G4GDMLReadSetup.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadSetup.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadSetup.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadSetup.cc,v 1.9 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadSetup.cc,v 1.10 2009/03/24 15:47:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLReadSetup Implementation
@@ -34,4 +34,12 @@
 
 #include "G4GDMLReadSetup.hh"
+
+G4GDMLReadSetup::G4GDMLReadSetup() : G4GDMLReadSolids()
+{
+}
+
+G4GDMLReadSetup::~G4GDMLReadSetup()
+{
+}
 
 G4String G4GDMLReadSetup::GetSetup(const G4String& ref)
Index: trunk/source/persistency/gdml/src/G4GDMLReadSolids.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadSolids.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadSolids.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadSolids.cc,v 1.22 2008/11/21 09:32:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadSolids.cc,v 1.27 2009/12/04 13:58:51 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLReadSolids Implementation
@@ -34,4 +34,45 @@
 
 #include "G4GDMLReadSolids.hh"
+
+#include "G4Box.hh"
+#include "G4Cons.hh"
+#include "G4Ellipsoid.hh"
+#include "G4EllipticalCone.hh"
+#include "G4EllipticalTube.hh"
+#include "G4Hype.hh"
+#include "G4IntersectionSolid.hh"
+#include "G4Orb.hh"
+#include "G4Para.hh"
+#include "G4Paraboloid.hh"
+#include "G4Polycone.hh"
+#include "G4Polyhedra.hh"
+#include "G4QuadrangularFacet.hh"
+#include "G4ReflectedSolid.hh"
+#include "G4Sphere.hh"
+#include "G4SolidStore.hh"
+#include "G4SubtractionSolid.hh"
+#include "G4TessellatedSolid.hh"
+#include "G4Tet.hh"
+#include "G4Torus.hh"
+#include "G4Transform3D.hh"
+#include "G4Trap.hh"
+#include "G4Trd.hh"
+#include "G4TriangularFacet.hh"
+#include "G4Tubs.hh"
+#include "G4TwistedBox.hh"
+#include "G4TwistedTrap.hh"
+#include "G4TwistedTrd.hh"
+#include "G4TwistedTubs.hh"
+#include "G4UnionSolid.hh"
+#include "G4OpticalSurface.hh"
+#include "G4SurfaceProperty.hh"
+
+G4GDMLReadSolids::G4GDMLReadSolids() : G4GDMLReadMaterials()
+{
+}
+
+G4GDMLReadSolids::~G4GDMLReadSolids()
+{
+}
 
 void G4GDMLReadSolids::
@@ -1478,5 +1519,5 @@
 
 void G4GDMLReadSolids::
-OpticalsurfaceRead(const xercesc::DOMElement* const opticalsurfaceElement)
+OpticalSurfaceRead(const xercesc::DOMElement* const opticalsurfaceElement)
 {
    G4String name;
@@ -1514,5 +1555,7 @@
    G4SurfaceType type;   
    
-   if (smodel="unified") { model = unified; } else { model = glisur; }
+   if (smodel="unified") { model = unified; } else
+   if (smodel="glisur") { model = glisur; }
+   else { model = LUT; }
 
    if (sfinish=="polishedfrontpainted") { finish = polishedfrontpainted; } else
@@ -1520,9 +1563,36 @@
    if (sfinish=="groundfrontpainted") { finish = groundfrontpainted; } else
    if (sfinish=="groundbackpainted") { finish = groundbackpainted; } else
-   if (sfinish=="ground") { finish = ground; } else { finish = polished; }
+   if (sfinish=="ground") { finish = ground; } else
+   if (sfinish=="polished") { finish = polished; } else
+   if (sfinish=="polishedlumirrorair") { finish = polishedlumirrorair; } else
+   if (sfinish=="polishedlumirrorglue") { finish = polishedlumirrorglue; } else
+   if (sfinish=="polishedair") { finish = polishedair; } else
+   if (sfinish=="polishedteflonair") { finish = polishedteflonair; } else
+   if (sfinish=="polishedtioair") { finish = polishedtioair; } else
+   if (sfinish=="polishedtyvekair") { finish = polishedtyvekair; } else
+   if (sfinish=="polishedvm2000air") { finish = polishedvm2000air; } else
+   if (sfinish=="polishedvm2000glue") { finish = polishedvm2000glue; } else
+   if (sfinish=="etchedlumirrorair") { finish = etchedlumirrorair; } else
+   if (sfinish=="etchedlumirrorglue") { finish = etchedlumirrorglue; } else
+   if (sfinish=="etchedair") { finish = etchedair; } else
+   if (sfinish=="etchedteflonair") { finish = etchedteflonair; } else
+   if (sfinish=="etchedtioair") { finish = etchedtioair; } else
+   if (sfinish=="etchedtyvekair") { finish = etchedtyvekair; } else
+   if (sfinish=="etchedvm2000air") { finish = etchedvm2000air; } else
+   if (sfinish=="etchedvm2000glue") { finish = etchedvm2000glue; } else
+   if (sfinish=="groundlumirrorair") { finish = groundlumirrorair; } else
+   if (sfinish=="groundlumirrorglue") { finish = groundlumirrorglue; } else
+   if (sfinish=="groundair") { finish = groundair; } else
+   if (sfinish=="groundteflonair") { finish = groundteflonair; } else
+   if (sfinish=="groundtioair") { finish = groundtioair; } else
+   if (sfinish=="groundtyvekair") { finish = groundtyvekair; } else
+   if (sfinish=="groundvm2000air") { finish = groundvm2000air; }
+   else { finish = groundvm2000glue; }
 
    if (stype=="dielectric_metal") { type = dielectric_metal; } else
-   if (stype=="x_ray") { type = x_ray; } else
-   if (stype=="firsov") { type = firsov; } else { type = dielectric_dielectric; }
+   if (stype=="dielectric_dielectric") { type = dielectric_dielectric; } else
+   if (stype=="dielectric_LUT") { type = dielectric_LUT; } else
+   if (stype=="x_ray") { type = x_ray; }
+   else { type = firsov; }
 
    new G4OpticalSurface(name,model,finish,type,value);
@@ -1541,7 +1611,7 @@
             = dynamic_cast<xercesc::DOMElement*>(iter);
       const G4String tag = Transcode(child->getTagName());
-
-      if (tag=="box") { BoxRead(child); } else
-      if (tag=="cone") { ConeRead(child); } else
+      if (tag=="define") { DefineRead(child);  }  else 
+      if (tag=="box")    { BoxRead(child); } else
+      if (tag=="cone")   { ConeRead(child); } else
       if (tag=="elcone") { ElconeRead(child); } else
       if (tag=="ellipsoid") { EllipsoidRead(child); }else
@@ -1569,5 +1639,5 @@
       if (tag=="twistedtubs") { TwistedtubsRead(child); } else
       if (tag=="union") { BooleanRead(child,UNION); } else
-      if (tag=="opticalsurface") { OpticalsurfaceRead(child); } else
+      if (tag=="opticalsurface") { OpticalSurfaceRead(child); } else
       if (tag=="loop") { LoopRead(child,&G4GDMLRead::SolidsRead); }
       else
Index: trunk/source/persistency/gdml/src/G4GDMLReadStructure.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLReadStructure.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLReadStructure.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GDMLReadStructure.cc,v 1.56 2009/02/24 17:41:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLReadStructure.cc,v 1.62 2009/09/24 15:04:34 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLReadStructure Implementation
@@ -35,4 +35,24 @@
 #include "G4GDMLReadStructure.hh"
 
+#include "G4LogicalVolume.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4PVPlacement.hh"
+#include "G4LogicalVolumeStore.hh"
+#include "G4PhysicalVolumeStore.hh"
+#include "G4AssemblyVolume.hh"
+#include "G4ReflectionFactory.hh"
+#include "G4PVDivisionFactory.hh"
+#include "G4LogicalBorderSurface.hh"
+#include "G4LogicalSkinSurface.hh"
+#include "G4VisAttributes.hh"
+
+G4GDMLReadStructure::G4GDMLReadStructure() : G4GDMLReadParamvol()
+{
+}
+
+G4GDMLReadStructure::~G4GDMLReadStructure()
+{
+}
+
 G4GDMLAuxPairType G4GDMLReadStructure::
 AuxiliaryRead(const xercesc::DOMElement* const auxiliaryElement)
@@ -65,5 +85,5 @@
 
 void G4GDMLReadStructure::
-BordersurfaceRead(const xercesc::DOMElement* const bordersurfaceElement)
+BorderSurfaceRead(const xercesc::DOMElement* const bordersurfaceElement)
 {
    G4String name;
@@ -255,8 +275,10 @@
 
 void G4GDMLReadStructure::
-PhysvolRead(const xercesc::DOMElement* const physvolElement)
+PhysvolRead(const xercesc::DOMElement* const physvolElement,
+            G4AssemblyVolume* pAssembly)
 {
    G4String name;
    G4LogicalVolume* logvol = 0;
+   G4AssemblyVolume* assembly = 0;
    G4ThreeVector position(0.0,0.0,0.0);
    G4ThreeVector rotation(0.0,0.0,0.0);
@@ -270,15 +292,15 @@
         attribute_index<attributeCount; attribute_index++)
    {
-      xercesc::DOMNode* attribute_node = attributes->item(attribute_index);
-
-      if (attribute_node->getNodeType() != xercesc::DOMNode::ATTRIBUTE_NODE)
-        { continue; }
-
-      const xercesc::DOMAttr* const attribute
-            = dynamic_cast<xercesc::DOMAttr*>(attribute_node);   
-      const G4String attName = Transcode(attribute->getName());
-      const G4String attValue = Transcode(attribute->getValue());
-
-      if (attName=="name") { name = attValue; }
+     xercesc::DOMNode* attribute_node = attributes->item(attribute_index);
+
+     if (attribute_node->getNodeType() != xercesc::DOMNode::ATTRIBUTE_NODE)
+       { continue; }
+
+     const xercesc::DOMAttr* const attribute
+           = dynamic_cast<xercesc::DOMAttr*>(attribute_node);   
+     const G4String attName = Transcode(attribute->getName());
+     const G4String attValue = Transcode(attribute->getValue());
+
+     if (attName=="name") { name = attValue; }
    }
 
@@ -286,32 +308,36 @@
         iter != 0; iter = iter->getNextSibling())
    {
-      if (iter->getNodeType() != xercesc::DOMNode::ELEMENT_NODE)  { continue; }
-
-      const xercesc::DOMElement* const child
-            = dynamic_cast<xercesc::DOMElement*>(iter);
-      const G4String tag = Transcode(child->getTagName());
-
-      if (tag=="file")
-        { logvol = FileRead(child); } else
-      if (tag=="volumeref")
-        { logvol = GetVolume(GenerateName(RefRead(child))); } else
-      if (tag=="position")
-        { VectorRead(child,position); } else
-      if (tag=="rotation")
-        { VectorRead(child,rotation); } else
-      if (tag=="scale")
-        { VectorRead(child,scale); } else
-      if (tag=="positionref")
-        { position = GetPosition(GenerateName(RefRead(child))); } else
-      if (tag=="rotationref")
-        { rotation = GetRotation(GenerateName(RefRead(child))); } else
-      if (tag=="scaleref")
+     if (iter->getNodeType() != xercesc::DOMNode::ELEMENT_NODE)  { continue; }
+
+     const xercesc::DOMElement* const child
+           = dynamic_cast<xercesc::DOMElement*>(iter);
+     const G4String tag = Transcode(child->getTagName());
+
+     if (tag=="volumeref")
+       {
+         const G4String& child_name = GenerateName(RefRead(child));
+         assembly = GetAssembly(child_name);
+         if (!assembly) { logvol = GetVolume(child_name); }
+       }
+     else if (tag=="file")
+       { logvol = FileRead(child); }
+     else if (tag=="position")
+       { VectorRead(child,position); }
+     else if (tag=="rotation")
+       { VectorRead(child,rotation); }
+     else if (tag=="scale")
+       { VectorRead(child,scale); }
+     else if (tag=="positionref")
+       { position = GetPosition(GenerateName(RefRead(child))); }
+     else if (tag=="rotationref")
+        { rotation = GetRotation(GenerateName(RefRead(child))); }
+     else if (tag=="scaleref")
         { scale = GetScale(GenerateName(RefRead(child))); }
-      else
-      {
-        G4String error_msg = "Unknown tag in physvol: " + tag;
-        G4Exception("G4GDMLReadStructure::PhysvolRead()", "ReadError",
-                    FatalException, error_msg);
-      }
+     else
+        {
+          G4String error_msg = "Unknown tag in physvol: " + tag;
+          G4Exception("G4GDMLReadStructure::PhysvolRead()", "ReadError",
+                      FatalException, error_msg);
+        }
    }
 
@@ -319,10 +345,24 @@
    transform = transform*G4Scale3D(scale.x(),scale.y(),scale.z());
 
-   G4String pv_name = logvol->GetName() + "_PV";
-   G4PhysicalVolumesPair pair = G4ReflectionFactory::Instance()
-     ->Place(transform,pv_name,logvol,pMotherLogical,false,0,check);
-
-   if (pair.first != 0) { GeneratePhysvolName(name,pair.first); }
-   if (pair.second != 0) { GeneratePhysvolName(name,pair.second); }
+   if (pAssembly)   // Fill assembly structure
+   {
+     pAssembly->AddPlacedVolume(logvol, transform);
+   }
+   else             // Generate physical volume tree or do assembly imprint
+   {
+     if (assembly)
+     {
+       assembly->MakeImprint(pMotherLogical, transform, 0, check);
+     }
+     else
+     {
+       G4String pv_name = logvol->GetName() + "_PV";
+       G4PhysicalVolumesPair pair = G4ReflectionFactory::Instance()
+         ->Place(transform,pv_name,logvol,pMotherLogical,false,0,check);
+
+       if (pair.first != 0) { GeneratePhysvolName(name,pair.first); }
+       if (pair.second != 0) { GeneratePhysvolName(name,pair.second); }
+     }
+   }
 }
 
@@ -510,5 +550,35 @@
 
 void G4GDMLReadStructure::
-SkinsurfaceRead(const xercesc::DOMElement* const skinsurfaceElement)
+AssemblyRead(const xercesc::DOMElement* const assemblyElement)
+{
+   XMLCh *name_attr = xercesc::XMLString::transcode("name");
+   const G4String name = Transcode(assemblyElement->getAttribute(name_attr));
+   xercesc::XMLString::release(&name_attr);
+
+   G4AssemblyVolume* pAssembly = new G4AssemblyVolume();
+   assemblyMap.insert(std::make_pair(GenerateName(name), pAssembly));
+
+   for (xercesc::DOMNode* iter = assemblyElement->getFirstChild();
+        iter != 0; iter = iter->getNextSibling())
+   {
+      if (iter->getNodeType() != xercesc::DOMNode::ELEMENT_NODE) { continue; }
+      const xercesc::DOMElement* const child
+            = dynamic_cast<xercesc::DOMElement*>(iter);
+      const G4String tag = Transcode(child->getTagName());
+
+      if (tag=="physvol")
+      {
+        PhysvolRead(child, pAssembly);
+      }
+      else
+      {
+        G4cout << "Unsupported GDML tag '" << tag
+               << "' for Geant4 assembly structure !" << G4endl;
+      }
+   }
+}
+
+void G4GDMLReadStructure::
+SkinSurfaceRead(const xercesc::DOMElement* const skinsurfaceElement)
 {
    G4String name;
@@ -643,7 +713,8 @@
       const G4String tag = Transcode(child->getTagName());
 
-      if (tag=="bordersurface") { BordersurfaceRead(child); } else
-      if (tag=="skinsurface") { SkinsurfaceRead(child); } else
+      if (tag=="bordersurface") { BorderSurfaceRead(child); } else
+      if (tag=="skinsurface") { SkinSurfaceRead(child); } else
       if (tag=="volume") { VolumeRead(child); } else
+      if (tag=="assembly") { AssemblyRead(child); } else
       if (tag=="loop") { LoopRead(child,&G4GDMLRead::StructureRead); }
       else
@@ -688,8 +759,17 @@
 }
 
+G4AssemblyVolume* G4GDMLReadStructure::
+GetAssembly(const G4String& ref) const
+{
+   G4GDMLAssemblyMapType::const_iterator pos = assemblyMap.find(ref);
+   if (pos != assemblyMap.end()) { return pos->second; }
+   return 0;
+}
+
 G4GDMLAuxListType G4GDMLReadStructure::
 GetVolumeAuxiliaryInformation(const G4LogicalVolume* const logvol)
 {
-   if (auxMap.find(logvol) != auxMap.end()) { return auxMap[logvol]; }
+   G4GDMLAuxMapType::const_iterator pos = auxMap.find(logvol);
+   if (pos != auxMap.end()) { return pos->second; }
    else { return G4GDMLAuxListType(); }
 }
Index: trunk/source/persistency/gdml/src/G4GDMLWrite.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWrite.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWrite.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWrite.cc,v 1.50 2008/11/13 17:00:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWrite.cc,v 1.55 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWrite Implementation
@@ -34,7 +34,22 @@
 // --------------------------------------------------------------------
 
+#include <sys/stat.h>
+#include <iostream>
+
 #include "G4GDMLWrite.hh"
 
+#include "G4LogicalVolume.hh"
+#include "G4Transform3D.hh"
+#include "G4PVDivision.hh"
+
 G4bool G4GDMLWrite::addPointerToName = true;
+
+G4GDMLWrite::G4GDMLWrite() : extElement(0)
+{
+}
+
+G4GDMLWrite::~G4GDMLWrite()
+{
+}
 
 G4bool G4GDMLWrite::FileExists(const G4String& fname) const
@@ -62,9 +77,27 @@
 }
 
+void G4GDMLWrite::AddExtension(xercesc::DOMElement*,
+                               const G4LogicalVolume* const)
+{
+   // Empty implementation. To be overwritten by user for specific extensions
+   // related to attributes associated to volumes
+}
+
+void G4GDMLWrite::ExtensionWrite(xercesc::DOMElement*)
+{
+   // Empty implementation. To be overwritten by user for specific extensions
+}
+
 G4String G4GDMLWrite::GenerateName(const G4String& name, const void* const ptr)
 {
+   G4String nameOut;
    std::stringstream stream; stream << name;
-   if (addPointerToName) { stream << ptr; }
-   return G4String(stream.str());
+   if (addPointerToName) { stream << ptr; };
+
+   nameOut=G4String(stream.str());
+   if(nameOut.contains(' '))
+   nameOut.erase(std::remove(nameOut.begin(),nameOut.end(),' '),nameOut.end());
+
+   return nameOut;
 }
 
@@ -153,4 +186,5 @@
                           SchemaLocation));
 
+   ExtensionWrite(gdml);
    DefineWrite(gdml);
    MaterialsWrite(gdml);
@@ -161,4 +195,5 @@
    G4Transform3D R = TraverseVolumeTree(logvol,depth);
 
+   SurfacesWrite();
    xercesc::XMLFormatTarget *myFormTarget =
      new xercesc::LocalFileFormatTarget(fname.c_str());
Index: trunk/source/persistency/gdml/src/G4GDMLWriteDefine.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteDefine.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteDefine.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteDefine.cc,v 1.18 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteDefine.cc,v 1.19 2009/03/24 15:47:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWriteDefine Implementation
@@ -39,4 +39,12 @@
 const G4double G4GDMLWriteDefine::kAngularPrecision = DBL_EPSILON;
 const G4double G4GDMLWriteDefine::kLinearPrecision = DBL_EPSILON;
+
+G4GDMLWriteDefine::G4GDMLWriteDefine() : G4GDMLWrite()
+{
+}
+
+G4GDMLWriteDefine::~G4GDMLWriteDefine()
+{
+}
 
 G4ThreeVector G4GDMLWriteDefine::GetAngles(const G4RotationMatrix& mat)
Index: trunk/source/persistency/gdml/src/G4GDMLWriteMaterials.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteMaterials.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteMaterials.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteMaterials.cc,v 1.20 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteMaterials.cc,v 1.24 2009/04/27 07:22:36 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWriteMaterials Implementation
@@ -34,5 +34,20 @@
 // --------------------------------------------------------------------
 
+#include <sstream>
 #include "G4GDMLWriteMaterials.hh"
+
+#include "G4Element.hh"
+#include "G4Isotope.hh"
+#include "G4Material.hh"
+
+G4GDMLWriteMaterials::
+G4GDMLWriteMaterials() : G4GDMLWriteDefine()
+{
+}
+
+G4GDMLWriteMaterials::
+~G4GDMLWriteMaterials()
+{
+}
 
 void G4GDMLWriteMaterials::
@@ -134,4 +149,11 @@
    materialElement->setAttributeNode(NewAttribute("state",state_str));
 
+   // Write any property attached to the material...
+   //
+   if (materialPtr->GetMaterialPropertiesTable())
+   {
+     PropertyWrite(materialElement, materialPtr);
+   }
+
    if (materialPtr->GetTemperature() != STP_Temperature)
      { TWrite(materialElement,materialPtr->GetTemperature()); }
@@ -165,6 +187,59 @@
    }
 
+   // Append the material AFTER all the possible components are appended!
+   //
    materialsElement->appendChild(materialElement);
-     // Append the material AFTER all the possible components are appended!
+}
+
+void G4GDMLWriteMaterials::PropertyVectorWrite(const G4String& key,
+                           const G4MaterialPropertyVector* const pvec)
+{
+   xercesc::DOMElement* matrixElement = NewElement("matrix");
+   matrixElement->setAttributeNode(NewAttribute("name", key));
+   matrixElement->setAttributeNode(NewAttribute("coldim", "2"));
+   std::ostringstream pvalues;
+   for (G4int i=0; i<pvec->Entries(); i++)
+   {
+     G4MPVEntry cval = pvec->GetEntry(i);
+     if (i!=0)  { pvalues << " "; }
+     pvalues << cval.GetPhotonEnergy() << " " << cval.GetProperty();
+   }
+   matrixElement->setAttributeNode(NewAttribute("values", pvalues.str()));
+
+   defineElement->appendChild(matrixElement);
+}
+
+void G4GDMLWriteMaterials::PropertyWrite(xercesc::DOMElement* matElement,
+                                         const G4Material* const mat)
+{
+   xercesc::DOMElement* propElement;
+   G4MaterialPropertiesTable* ptable = mat->GetMaterialPropertiesTable();
+   const std::map< G4String, G4MaterialPropertyVector*,
+                 std::less<G4String> >* pmap = ptable->GetPropertiesMap();
+   const std::map< G4String, G4double,
+                 std::less<G4String> >* cmap = ptable->GetPropertiesCMap();
+   std::map< G4String, G4MaterialPropertyVector*,
+                 std::less<G4String> >::const_iterator mpos;
+   std::map< G4String, G4double,
+                 std::less<G4String> >::const_iterator cpos;
+   for (mpos=pmap->begin(); mpos!=pmap->end(); mpos++)
+   {
+      propElement = NewElement("property");
+      propElement->setAttributeNode(NewAttribute("name", mpos->first));
+      propElement->setAttributeNode(NewAttribute("ref", mpos->first));
+      PropertyVectorWrite(mpos->first, mpos->second);
+      matElement->appendChild(propElement);
+   }
+   for (cpos=cmap->begin(); cpos!=cmap->end(); cpos++)
+   {
+      propElement = NewElement("property");
+      propElement->setAttributeNode(NewAttribute("name", cpos->first));
+      propElement->setAttributeNode(NewAttribute("ref", cpos->first));
+      xercesc::DOMElement* constElement = NewElement("constant");
+      constElement->setAttributeNode(NewAttribute("name", cpos->first));
+      constElement->setAttributeNode(NewAttribute("value", cpos->second));
+      defineElement->appendChild(constElement);
+      matElement->appendChild(propElement);
+   }
 }
 
Index: trunk/source/persistency/gdml/src/G4GDMLWriteParamvol.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteParamvol.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteParamvol.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteParamvol.cc,v 1.23 2008/08/20 08:56:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteParamvol.cc,v 1.25 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLParamVol Implementation
@@ -35,5 +35,29 @@
 
 #include "G4GDMLWriteParamvol.hh"
-#include <sstream>
+
+#include "G4Box.hh"
+#include "G4Trd.hh"
+#include "G4Trap.hh"
+#include "G4Tubs.hh"
+#include "G4Cons.hh"
+#include "G4Sphere.hh"
+#include "G4Orb.hh"
+#include "G4Torus.hh"
+#include "G4Para.hh"
+#include "G4Hype.hh"
+#include "G4LogicalVolume.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4PVParameterised.hh"
+#include "G4VPVParameterisation.hh"
+
+G4GDMLWriteParamvol::
+G4GDMLWriteParamvol() : G4GDMLWriteSetup()
+{
+}
+
+G4GDMLWriteParamvol::
+~G4GDMLWriteParamvol()
+{
+}
 
 void G4GDMLWriteParamvol::
Index: trunk/source/persistency/gdml/src/G4GDMLWriteSetup.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteSetup.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteSetup.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteSetup.cc,v 1.11 2008/07/16 15:46:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteSetup.cc,v 1.13 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWriteSetup Implementation
@@ -35,4 +35,14 @@
 
 #include "G4GDMLWriteSetup.hh"
+
+#include "G4LogicalVolume.hh"
+
+G4GDMLWriteSetup::G4GDMLWriteSetup() : G4GDMLWriteSolids()
+{
+}
+
+G4GDMLWriteSetup::~G4GDMLWriteSetup()
+{
+}
 
 void G4GDMLWriteSetup::SetupWrite(xercesc::DOMElement* gdmlElement,
Index: trunk/source/persistency/gdml/src/G4GDMLWriteSolids.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteSolids.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteSolids.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteSolids.cc,v 1.59 2008/11/21 09:32:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteSolids.cc,v 1.65 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWriteSolids Implementation
@@ -36,8 +36,51 @@
 #include "G4GDMLWriteSolids.hh"
 
+#include "G4BooleanSolid.hh"
+#include "G4Box.hh"
+#include "G4Cons.hh"
+#include "G4Ellipsoid.hh"
+#include "G4EllipticalCone.hh"
+#include "G4EllipticalTube.hh"
+#include "G4ExtrudedSolid.hh"
+#include "G4Hype.hh"
+#include "G4Orb.hh"
+#include "G4Para.hh"
+#include "G4Paraboloid.hh"
+#include "G4IntersectionSolid.hh"
+#include "G4Polycone.hh"
+#include "G4Polyhedra.hh"
+#include "G4ReflectedSolid.hh"
+#include "G4Sphere.hh"
+#include "G4SubtractionSolid.hh"
+#include "G4TessellatedSolid.hh"
+#include "G4Tet.hh"
+#include "G4Torus.hh"
+#include "G4Trap.hh"
+#include "G4Trd.hh"
+#include "G4Tubs.hh"
+#include "G4TwistedBox.hh"
+#include "G4TwistedTrap.hh"
+#include "G4TwistedTrd.hh"
+#include "G4TwistedTubs.hh"
+#include "G4UnionSolid.hh"
+#include "G4OpticalSurface.hh"
+#include "G4SurfaceProperty.hh"
+
+G4GDMLWriteSolids::
+G4GDMLWriteSolids() : G4GDMLWriteMaterials()
+{
+}
+
+G4GDMLWriteSolids::
+~G4GDMLWriteSolids()
+{
+}
+
 void G4GDMLWriteSolids::
 BooleanWrite(xercesc::DOMElement* solidsElement,
              const G4BooleanSolid* const boolean)
 {
+   G4int displaced=0;
+
    G4String tag("undefined");
    if (dynamic_cast<const G4IntersectionSolid*>(boolean))
@@ -53,18 +96,52 @@
    G4ThreeVector firstpos,firstrot,pos,rot;
 
-   if (const G4DisplacedSolid* disp
-       = dynamic_cast<const G4DisplacedSolid*>(firstPtr))
-   {   
-      firstpos = disp->GetObjectTranslation();
-      firstrot = GetAngles(disp->GetObjectRotation());
-      firstPtr = disp->GetConstituentMovedSolid();
-   }
-
-   if (const G4DisplacedSolid* disp
-       = dynamic_cast<const G4DisplacedSolid*>(secondPtr))
-   {
-      pos = disp->GetObjectTranslation();
-      rot = GetAngles(disp->GetObjectRotation());
-      secondPtr = disp->GetConstituentMovedSolid();
+   // Solve possible displacement of referenced solids!
+   //
+   while (true)
+   {
+      if ( displaced>8 )
+      {
+        G4String ErrorMessage = "The referenced solid '"
+                              + firstPtr->GetName() +
+                              + "in the Boolean shape '" +
+                              + boolean->GetName() +
+                              + "' was displaced too many times!";
+        G4Exception("G4GDMLWriteSolids::BooleanWrite()",
+                    "InvalidSetup", FatalException, ErrorMessage);
+      }
+
+      if (G4DisplacedSolid* disp = dynamic_cast<G4DisplacedSolid*>(firstPtr))
+      {
+         firstpos += disp->GetObjectTranslation();
+         firstrot += firstrot + GetAngles(disp->GetObjectRotation());
+         firstPtr = disp->GetConstituentMovedSolid();
+         displaced++;
+         continue;
+      }
+      break;
+   }
+   displaced = 0;
+   while (true)
+   {
+      if ( displaced>maxTransforms )
+      {
+        G4String ErrorMessage = "The referenced solid '"
+                              + secondPtr->GetName() +
+                              + "in the Boolean shape '" +
+                              + boolean->GetName() +
+                              + "' was displaced too many times!";
+        G4Exception("G4GDMLWriteSolids::BooleanWrite()",
+                    "InvalidSetup", FatalException, ErrorMessage);
+      }
+
+      if (G4DisplacedSolid* disp = dynamic_cast<G4DisplacedSolid*>(secondPtr))
+      {
+         pos += disp->GetObjectTranslation();
+         rot += GetAngles(disp->GetObjectRotation());
+         secondPtr = disp->GetConstituentMovedSolid();
+         displaced++;
+         continue;
+      }
+      break;
    }
 
@@ -727,4 +804,21 @@
    zplaneElement->setAttributeNode(NewAttribute("rmax",rmax/mm));
    element->appendChild(zplaneElement);
+}
+
+void G4GDMLWriteSolids::
+OpticalSurfaceWrite(xercesc::DOMElement* solidsElement,
+                    const G4OpticalSurface* const surf)
+{
+   xercesc::DOMElement* optElement = NewElement("opticalsurface");
+   G4OpticalSurfaceModel smodel = surf->GetModel();
+   G4double sval = (smodel==glisur) ? surf->GetPolish() : surf->GetSigmaAlpha();
+
+   optElement->setAttributeNode(NewAttribute("name", surf->GetName()));
+   optElement->setAttributeNode(NewAttribute("model", smodel));
+   optElement->setAttributeNode(NewAttribute("finish", surf->GetFinish()));
+   optElement->setAttributeNode(NewAttribute("type", surf->GetType()));
+   optElement->setAttributeNode(NewAttribute("value", sval));
+
+   solidsElement->appendChild(optElement);
 }
 
@@ -822,6 +916,7 @@
    else
    {
-     G4String error_msg = "Unknown solid: " + solidPtr->GetName();
-     G4Exception("G4GDMLWriteSolids::AddSolid()", "ReadError",
+     G4String error_msg = "Unknown solid: " + solidPtr->GetName()
+                        + "; Type: " + solidPtr->GetEntityType();
+     G4Exception("G4GDMLWriteSolids::AddSolid()", "WriteError",
                  FatalException, error_msg);
    }
Index: trunk/source/persistency/gdml/src/G4GDMLWriteStructure.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4GDMLWriteStructure.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4GDMLWriteStructure.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GDMLWriteStructure.cc,v 1.74 2008/11/13 16:48:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4GDMLWriteStructure.cc,v 1.80 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4GDMLWriteStructure Implementation
@@ -35,4 +35,24 @@
 
 #include "G4GDMLWriteStructure.hh"
+
+#include "G4Material.hh"
+#include "G4ReflectedSolid.hh"
+#include "G4DisplacedSolid.hh"
+#include "G4LogicalVolumeStore.hh"
+#include "G4PhysicalVolumeStore.hh"
+#include "G4PVDivision.hh"
+#include "G4PVReplica.hh"
+#include "G4OpticalSurface.hh"
+#include "G4LogicalSkinSurface.hh"
+#include "G4LogicalBorderSurface.hh"
+
+G4GDMLWriteStructure::G4GDMLWriteStructure()
+  : G4GDMLWriteParamvol()
+{
+}
+
+G4GDMLWriteStructure::~G4GDMLWriteStructure()
+{
+}
 
 void
@@ -50,9 +70,9 @@
    G4String unitString("mm");
    G4String axisString("kUndefined");
-   if (axis==kXAxis) { axisString = "kXAxis"; } else
-   if (axis==kYAxis) { axisString = "kYAxis"; } else
-   if (axis==kZAxis) { axisString = "kZAxis"; } else
-   if (axis==kRho) { axisString = "kRho";     } else
-   if (axis==kPhi) { axisString = "kPhi"; unitString = "degree"; }
+   if (axis==kXAxis) { axisString = "kXAxis"; }
+   else if (axis==kYAxis) { axisString = "kYAxis"; }
+   else if (axis==kZAxis) { axisString = "kZAxis"; }
+   else if (axis==kRho)   { axisString = "kRho";     }
+   else if (axis==kPhi)   { axisString = "kPhi"; unitString = "degree"; }
 
    const G4String name
@@ -154,14 +174,18 @@
    volumerefElement->setAttributeNode(NewAttribute("ref",volumeref));
    replicavolElement->appendChild(volumerefElement);
-
    xercesc::DOMElement* replicateElement = NewElement("replicate_along_axis");
    replicavolElement->appendChild(replicateElement);
 
    xercesc::DOMElement* dirElement = NewElement("direction");
-   if(axis==kXAxis)dirElement->setAttributeNode(NewAttribute("x","1"));
-   if(axis==kYAxis)dirElement->setAttributeNode(NewAttribute("y","1"));
-   if(axis==kZAxis)dirElement->setAttributeNode(NewAttribute("z","1"));
-   if(axis==kRho)dirElement->setAttributeNode(NewAttribute("rho","1"));
-   if(axis==kPhi)dirElement->setAttributeNode(NewAttribute("phi","1"));
+   if(axis==kXAxis)
+     { dirElement->setAttributeNode(NewAttribute("x","1")); }
+   else if(axis==kYAxis)
+     { dirElement->setAttributeNode(NewAttribute("y","1")); }
+   else if(axis==kZAxis)
+     { dirElement->setAttributeNode(NewAttribute("z","1")); }
+   else if(axis==kRho)
+     { dirElement->setAttributeNode(NewAttribute("rho","1")); }
+   else if(axis==kPhi)
+     { dirElement->setAttributeNode(NewAttribute("phi","1")); }
    replicateElement->appendChild(dirElement);
 
@@ -179,4 +203,135 @@
 }
 
+void G4GDMLWriteStructure::
+BorderSurfaceCache(const G4LogicalBorderSurface* const bsurf)
+{
+   if (!bsurf)  { return; }
+
+   const G4SurfaceProperty* psurf = bsurf->GetSurfaceProperty();
+
+   // Generate the new element for border-surface
+   //
+   xercesc::DOMElement* borderElement = NewElement("bordersurface");
+   borderElement->setAttributeNode(NewAttribute("name", bsurf->GetName()));
+   borderElement->setAttributeNode(NewAttribute("surfaceproperty",
+                                                psurf->GetName()));
+
+   const G4String volumeref1 = GenerateName(bsurf->GetVolume1()->GetName(),
+                                            bsurf->GetVolume1());
+   const G4String volumeref2 = GenerateName(bsurf->GetVolume2()->GetName(),
+                                            bsurf->GetVolume2());
+   xercesc::DOMElement* volumerefElement1 = NewElement("physvolref");
+   xercesc::DOMElement* volumerefElement2 = NewElement("physvolref");
+   volumerefElement1->setAttributeNode(NewAttribute("ref",volumeref1));
+   volumerefElement2->setAttributeNode(NewAttribute("ref",volumeref2));
+   borderElement->appendChild(volumerefElement1);
+   borderElement->appendChild(volumerefElement2);
+
+   if (FindOpticalSurface(psurf))
+   {
+     OpticalSurfaceWrite(solidsElement,
+                         dynamic_cast<const G4OpticalSurface*>(psurf));
+   }
+
+   borderElementVec.push_back(borderElement);
+}
+
+void G4GDMLWriteStructure::
+SkinSurfaceCache(const G4LogicalSkinSurface* const ssurf)
+{
+   if (!ssurf)  { return; }
+
+   const G4SurfaceProperty* psurf = ssurf->GetSurfaceProperty();
+
+   // Generate the new element for border-surface
+   //
+   xercesc::DOMElement* skinElement = NewElement("skinsurface");
+   skinElement->setAttributeNode(NewAttribute("name", ssurf->GetName()));
+   skinElement->setAttributeNode(NewAttribute("surfaceproperty",
+                                              psurf->GetName()));
+
+   const G4String volumeref = GenerateName(ssurf->GetLogicalVolume()->GetName(),
+                                           ssurf->GetLogicalVolume());
+   xercesc::DOMElement* volumerefElement = NewElement("volumeref");
+   volumerefElement->setAttributeNode(NewAttribute("ref",volumeref));
+   skinElement->appendChild(volumerefElement);
+
+   if (FindOpticalSurface(psurf))
+   {
+     OpticalSurfaceWrite(solidsElement,
+                         dynamic_cast<const G4OpticalSurface*>(psurf));
+   }
+
+   skinElementVec.push_back(skinElement);
+}
+
+G4bool G4GDMLWriteStructure::FindOpticalSurface(const G4SurfaceProperty* psurf)
+{
+   const G4OpticalSurface* osurf = dynamic_cast<const G4OpticalSurface*>(psurf);
+   std::vector<const G4OpticalSurface*>::const_iterator pos;
+   pos = std::find(opt_vec.begin(), opt_vec.end(), osurf);
+   if (pos != opt_vec.end()) { return false; }  // item already created!
+
+   opt_vec.push_back(osurf);              // cache it for future reference
+   return true;
+}
+
+const G4LogicalSkinSurface*
+G4GDMLWriteStructure::GetSkinSurface(const G4LogicalVolume* const lvol)
+{
+  G4LogicalSkinSurface* surf = 0;
+  G4int nsurf = G4LogicalSkinSurface::GetNumberOfSkinSurfaces();
+  if (nsurf)
+  {
+    const G4LogicalSkinSurfaceTable* stable =
+          G4LogicalSkinSurface::GetSurfaceTable();
+    std::vector<G4LogicalSkinSurface*>::const_iterator pos;
+    for (pos = stable->begin(); pos != stable->end(); pos++)
+    {
+      if (lvol == (*pos)->GetLogicalVolume())
+      {
+        surf = *pos; break;
+      }
+    }
+  }
+  return surf;
+}
+
+const G4LogicalBorderSurface*
+G4GDMLWriteStructure::GetBorderSurface(const G4VPhysicalVolume* const pvol)
+{
+  G4LogicalBorderSurface* surf = 0;
+  G4int nsurf = G4LogicalBorderSurface::GetNumberOfBorderSurfaces();
+  if (nsurf)
+  {
+    const G4LogicalBorderSurfaceTable* btable =
+          G4LogicalBorderSurface::GetSurfaceTable();
+    std::vector<G4LogicalBorderSurface*>::const_iterator pos;
+    for (pos = btable->begin(); pos != btable->end(); pos++)
+    {
+      if (pvol == (*pos)->GetVolume1())  // just the first in the couple 
+      {                                  // is enough
+        surf = *pos; break;
+      }
+    }
+  }
+  return surf;
+}
+
+void G4GDMLWriteStructure::SurfacesWrite()
+{
+   G4cout << "G4GDML: Writing surfaces..." << G4endl;
+
+   std::vector<xercesc::DOMElement*>::const_iterator pos;
+   for (pos = skinElementVec.begin(); pos != skinElementVec.end(); pos++)
+   {
+     structureElement->appendChild(*pos);
+   }
+   for (pos = borderElementVec.begin(); pos != borderElementVec.end(); pos++)
+   {
+     structureElement->appendChild(*pos);
+   }
+}
+
 void G4GDMLWriteStructure::StructureWrite(xercesc::DOMElement* gdmlElement)
 {
@@ -197,9 +352,9 @@
    G4VSolid* solidPtr = volumePtr->GetSolid();
    G4Transform3D R,invR;
-   G4int reflected = 0;
+   G4int trans=0;
 
    while (true) // Solve possible displacement/reflection
    {            // of the referenced solid!
-      if (reflected>maxReflections)
+      if (trans>maxTransforms)
       {
         G4String ErrorMessage = "Referenced solid in volume '"
@@ -214,5 +369,5 @@
          R = R*refl->GetTransform3D();
          solidPtr = refl->GetConstituentMovedSolid();
-         reflected++;
+         trans++;
          continue;
       }
@@ -223,5 +378,5 @@
                              disp->GetObjectTranslation());
          solidPtr = disp->GetConstituentMovedSolid();
-         reflected++;
+         trans++;
          continue;
       }
@@ -230,6 +385,7 @@
    }
 
-   if (reflected>0) { invR = R.inverse(); }
-     // Only compute the inverse when necessary!
+   // Only compute the inverse when necessary!
+   //
+   if (trans>0) { invR = R.inverse(); }
 
    const G4String name
@@ -318,4 +474,5 @@
          PhysvolWrite(volumeElement,physvol,invR*P*daughterR,ModuleName);
       }
+      BorderSurfaceCache(GetBorderSurface(physvol));
    }
 
@@ -326,8 +483,13 @@
    VolumeMap()[volumePtr] = R;
 
-   G4GDMLWriteMaterials::AddMaterial(volumePtr->GetMaterial());
+   AddExtension(volumeElement, volumePtr);
+     // Add any possible user defined extension attached to a volume
+
+   AddMaterial(volumePtr->GetMaterial());
      // Add the involved materials and solids!
 
-   G4GDMLWriteSolids::AddSolid(solidPtr);
+   AddSolid(solidPtr);
+
+   SkinSurfaceCache(GetSkinSurface(volumePtr));
 
    return R;
Index: trunk/source/persistency/gdml/src/G4STRead.cc
===================================================================
--- trunk/source/persistency/gdml/src/G4STRead.cc	(revision 1227)
+++ trunk/source/persistency/gdml/src/G4STRead.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4STRead.cc,v 1.3 2008/07/17 14:05:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4STRead.cc,v 1.4 2009/04/24 15:34:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class G4STRead Implementation
@@ -33,5 +33,15 @@
 // -------------------------------------------------------------------------
 
+#include <fstream>
+
 #include "G4STRead.hh"
+
+#include "G4Material.hh"
+#include "G4Box.hh"
+#include "G4QuadrangularFacet.hh"
+#include "G4TriangularFacet.hh"
+#include "G4TessellatedSolid.hh"
+#include "G4LogicalVolume.hh"
+#include "G4PVPlacement.hh"
 
 void G4STRead::TessellatedRead(const std::string& line)
Index: trunk/source/physics_lists/History
===================================================================
--- trunk/source/physics_lists/History	(revision 1227)
+++ trunk/source/physics_lists/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.78 2009/02/19 12:49:56 vnivanch Exp $
+q$Id: History,v 1.119 2009/12/04 13:09:12 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -16,13 +16,203 @@
      ----------------------------------------------------------
 
+04-12-2009, K.Murakami                  (phys-lists-V09-02-46)
+- Fixed typo in FTFP_EMV.icc for wrong call to G4WarnPLStatus.
+
+03-12-2009, P.Kaitaniemi                (phys-lists-V09-02-45)
+- QGSP_INCL_ABLA, Fix: Use Bertini cascade for kaons in the energy range 0 - 10 GeV.
+
+30-11-2009, M.Kosov                     (phys-lists-V09-02-44)
+- G4QNeutrinoPhysics - process is not created if neutrino is not simulated
+
+28-11-2009, V.Ivanchenko                (phys-lists-V09-02-43)
+- QBBC - fixed cross sections for hadron elastic
+
+27-11-2009, G.Folger                    (phys-lists-V09-02-42)
+- QGSP_BERT_TRV, change transition energies in HadronPhysicsQGSP_BERT_TRV to 
+   use BERT ]0,9.9], LEP [9.5, 15], QGSP [10, inf[
+- QGSP_BERT_NOLEP, use G4HadronQElasticPhysics  
+- explicitely mark experimental: QGSP_BERT_EMX, QGSP_BERT_TRV, QGSP_FTFP_BERT, 
+     QGSP_INCL_ABLA
+- mark as obsolete: FTFP, QGSP, QGSC, QGSC_CHIPS, QGSC_EMV, QGSC_QGSC 
+- mark supported ( remove experimental) :FTFP_BERT,  FTFP_BERT_EMV
+- Add initial version of G4IonQMDPhysics    
+   
+25-11-2009, V.Ivanchenko                  (phys-lists-V09-02-41)
+- G4PhysListFactory - update list of supported referenced PhysicsLists
+- QBBC - updated for the release
+
+24-11-2009, V.Ivanchenko                  (phys-lists-V09-02-40)
+- G4EmStandardPhysics_option3, G4EmLivermorePhysics, G4EmPenelopePhysics,
+  G4EmLivermorePolarizedPhysics - set finalRange=10um for ions
+- G4EmStandardPhysics_option2 - use default StepFunction for ions
+
+20-11-2009, M.Kosov                       (phys-lists-V09-02-39)
+- Something was wrong in CHIPS lis, but now it is working
+
+20-11-2009, M.Kosov                       (phys-lists-V09-02-38)
+- G4QAtomicPhysics and xs_dependent is excluded from the GNUmakefile's
+
+18-11-2009, M.Kosov                       (phys-lists-V09-02-37)
+- bug fix in CHIPS.icc (call for G4QCaptureAtRestPhysics)
+
+17-11-2009, M.Kosov                       (phys-lists-V09-02-36)
+- improved dependencies on CHIPS
+
+16-11-2009, M.Kosov                       (phys-lists-V09-02-35)
+- dependencies on split CHIPS-body and new class G4QCaptureAtRestPhysics
+
+13-11-2009, M.Kosov                       (phys-lists-V09-02-34)
+- two builders G4QNeutrinoPhysics & G4QPhotoNuclearPhysics with
+  the G4QMessenger are added to the CHIPS physics list
+
+10-11-2009, V.Ivanchenko                  (phys-lists-V09-02-33)
+- G4EmStandardPhysics_option3, G4EmLivermorePhysics, G4EmPenelopePhysics,
+  G4EmLivermorePolarizedPhysics - added G4NuclearStopping process for 
+                                  GenericIon, He3, alpha particles
+
+4-11-2009, P.Gumplinger                   (phys-lists-V09-02-32)
+- add G4OpticalPhysics and G4OpticalPhysicsMessenger class
+
+3-11-2009, M.Kosov                        (phys-lists-V09-02-31)
+- close the warning about not used quasiElastic
+
+31-10-2009, V.Ivanchenko                   (phys-lists-V09-02-30)
+- G4EmDNAPhysics (S.Inserti) updated combined Physics List standard/DNA
+
+30-10-2009, V.Ivanchenko                   (phys-lists-V09-02-29)
+- Review of all EM builders: 
+   - in all builders separate definition of processes for He3 and 
+     He4 ions; G4eMultipleScattering for e+, e-,
+     G4MuMultipleScattering for muons; 
+   - G4UrbanMscModel93 for e+- for all builders except Opt0 and Opt1
+   - G4WentzelVIModel for muons for all builders except Opt0 and Opt1
+   - G4ParameterizedIonModel for Opt3 and all combined builders
+   - StepFunction (0.1, 0.02*mm) for ions inside Opt2  
+
+30-10-2009, M.Kosov                        (phys-lists-V09-02-28)
+- first implementation of the one model CHIPS physics list
+
+08-10-2009, V.Ivanchenko                   (phys-lists-V09-02-27)
+- fixed compillation problem in G4HadronPhysicsQBBC
+
+04-10-2009, V.Ivanchenko                   (phys-lists-V09-02-26)
+- modified QBBC - remove template and move QBBC.icc to QBBC.cc;
+                  use a new G4VHadronPhysics interface
+- G4HadroHElasticPhysics uses G4WHadronElasticProcess (the result of 
+   redesign of elastic) instead of G4UHadronElasticProcess    
+- QGSP_BERT_EMV uses G4HadroHElasticPhysics instead of G4HadroElasticPhysics  
+
+02-10-2009, V.Ivanchenko                   (phys-lists-V09-02-25)
+- modified EM standard Physics Lists
+G4EmStandardPhysics         - return 9.2 configuration
+G4EmStandardPhysics_option1 - use ApplyCuts=true
+G4EmStandardPhysics_option2 - use G4eMultipleScattering for e+-
+
+09-09-2009, S.Incerti                      (phys-lists-V09-02-24)
+- added high energy limit to e- models for better clarity in
+G4EmLivermorePhysics.cc
+G4EmLivermorePolarizedPhysics.cc
+
+19-07-2009, P.Kaitaniemi                   (phys-lists-V09-02-23)
+- Added INCL/ABLA physics builders for protons, neutrons, pions and light ions
+- Added QGSP_INCL_ABLA physics list
+- Added QGSP_INCL_ABLA to the G4PhysListFactory
+
+08-07-2009, S.Incerti                      (phys-lists-V09-02-22)
+- adapted G4EmLivermorePolarizedPhysics builder similarly to
+the non polarized case
+
+03-06-2009, G.Folger                       (phys-lists-V09-02-21)
+- no code change
+- use versions of phys-lists-V09-02-18 for 
+   builders/include/G4QGSC_CHIPSNeutronBuilder.hh
+   builders/*/G4QNeutronBuilder.{hh,cc}
+   
+
+02-06-2009, G.Folger                       (phys-lists-V09-02-20)
+- Rename HadronPhysicsFB68.{hh,cc} to HadronPhysicsFTFP_BERT_TRV.{hh,cc};
+   required changes in FTFP_BERT_TRV.icc as well.
+- correct typo in experimental/Unsupported names in FTF_BIC.icc and QGSP_EMX.icc
+   
+25-05-2009, M.Kosov                        (phys-lists-V09-02-19)
+- Two new low energy (<290 MeV) nA CHIPS reactions are implemented in the QGSC_CHIPS
+  physics list (works together with the hadr-chips-inter-V09-02-07 CHIPS tag
+
+18-05-2009, G.Folger                       (phys-lists-V09-02-18)
+- Declare several list obsolete, partially disabling use.
+  Obsolete + disabled  (= remove)
+     FTF_EMV,   replacment FTFP_BERT_EMV
+     QGSC_EFLOW, replacment QGSC_CHIPS
+     QGSP_EMX, replacment QGSP_BERT_EMX
+  Obsolete:
+     FTFC
+     LHEP_BERT, LHEP_BERT_HP, LHEP_PRECO_HP
+     QGSP_BERT_DIF, QGSP_BERT_NQE, QGSP_DIF, QGSP_EMV, QGSP_EMV_NQE,
+     QGSP_NQE, QGSP_QEL  
+
+11-05-2009, V.Ivanchenko phys-lists-V09-02-17
+- Added new PhysLists with special EM options: FTFP_BERT_EMV,
+  FTFP_BERT_EMX, QGSP_BERT_EMX, QGSP_BIC_EMY (opt3 EM physics)
+- Renamed FB68 to FTFP_BERT_TRV
+- G4PhysicsListFactory - updated list of supported PhysLists
+
+10-05-2009, V.Ivanchenko phys-lists-V09-02-16
+G4EmStandardPhysics, G4EmStandardPhysics_option1 - use 9.2 msc
+                                                   model for e+-
+G4EmStandardPhysics_option2 - use G4WentzelVIModel for e+-
+G4EmStandardPhysics_option3 - use updated G4UrbanMscModel2 and 
+                              use G4RayleighScattering
+G4EmLivermorePhysics - upper limit of Livermore models 1 GeV
+
+23-04-2009, J.Apostolakis phys-lists-V09-02-15
+- Added MaxEnergy method in FTF builders.
+- Added QGSP_FTFP_BERT based on QGSP_BERT replacing the bridging LEP with FTFP, 
+  and transitioning from BERT to FTFP between 7 and 9 GeV;
+- Added FB68 as variant of FTFP_BERT with transition between 6 and 8 GeV. 
+
+20-04-2009, M.Kosov phys-lists-V09-02-14
+- Two new physics lists QGSC_QGSC and QGSC_CHIPS are added.
+- QGSC_QGSC physics list uses the QGS model with the MultySoft
+  interface to CHIPS at all energies, starting from E=0. For neutrons
+  it still uses LHEP models for the radiativ capture and fission.
+- QGSC_CHIPS physics list uses the QGS model with the EnergyFlow
+  interface to CHIPS at all energies. For the pA interactions the
+  native CHIPS process G4QCollision is used below 290 MeV. The QGSC and
+  G4QCollision processes are joined in one process by the CHIPS
+  G4QDiscProcessMixer interface.
+- The corresponding physics builders are added.
+
+17-04-2009, V.Ivanchenko phys-lists-V09-02-12
+- Restore History after modification of CHIPS builders
+- Fixed G4EmLivermorePhysics, G4EmPenelopePhysics
+- Added new CHIPS PhysLists to the G4PhysListFactory
+- Fixed G4HadronInelasticQBBC - cross sections are created by new, 
+  not by value, fission only instantiated for HP
+
+31-03-2009, V.Ivanchenko phys-lists-V09-02-05
+- To fix bug #1056 all cross section data sets are included not as a
+  member of classes but created by new
+- inline constructor and destructors are moved to source for classes:
+  G4VNeutronBuilder, G4VPiKBuilder, G4VProtonBuilder, G4WarnPLStatus
+
+26-03-2009, S.Incerti phys-lists-V09-02-04
+- Added builders for Livermore and Penelope physics processes:
+  G4EmLivermorePhysics, G4EmLivermorePolarizedPhysics, G4EmPenelopePhysics.
+
+25-03-2009, S.Incerti phys-lists-V09-02-03
+- Added builder for DNA physics processes: G4EmDNAPhysics.
+
+12-03-2009, V.Ivanchenko phys-lists-V09-02-02
+- HadronPhysicsQGSC: fixed crash at destruction.
+
 16-02-2009, V.Ivanchenko phys-lists-V09-02-01
-G4IonBinaryCascadePhysics - use Shen cross section only if Tripathi is
-                            not applicable (fixed order of x-sections)
-G4HadronInelasticQBBC - use G4StringChipsParticleLevelInterface instead of
-                        obsolete G4StringChipsInterface
+- G4IonBinaryCascadePhysics: use Shen cross section only if Tripathi is
+  not applicable (fixed order of x-sections).
+- G4HadronInelasticQBBC: use G4StringChipsParticleLevelInterface instead of
+  obsolete G4StringChipsInterface.
 
 05-02-2009, V.Ivanchenko phys-lists-V09-02-00
-G4MiscLHEPBuilder - create processes by "new" in order to have proper deletion 
-  at the end of run
+- G4MiscLHEPBuilder: create processes by "new" in order to have proper
+  deletion at the end of job.
 
 05-12-2008, G.Cosmo phys-lists-V09-01-20
@@ -32,6 +222,6 @@
 
 01-12-2008, V.Ivanchenko phys-lists-V09-01-19
-G4HadronElasticPhysics - fixed adding optional Barashenkov Xsection
-QBBC - added QBBBG option
+- G4HadronElasticPhysics: fixed adding optional Barashenkov Xsection
+  QBBC - added QBBBG option
 
 21-11-2008, V.Ivanchenko phys-lists-V09-01-18
Index: trunk/source/physics_lists/builders/GNUmakefile
===================================================================
--- trunk/source/physics_lists/builders/GNUmakefile	(revision 1227)
+++ trunk/source/physics_lists/builders/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.10 2009/11/20 10:24:28 mkossov Exp $
+# $Id: GNUmakefile,v 1.11 2009/11/27 17:26:44 gunter Exp $
 # ---------------------------------------------------------------------------
 # GNUmakefile for physics_lists/builders library.  Gunter Folger 25-Oct-2006.
@@ -50,4 +50,5 @@
             -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
             -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
+	    -I$(G4BASE)/processes/hadronic/models/qmd/include \
             -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
             -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
Index: trunk/source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniNeutronBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4BertiniPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BertiniPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BertiniPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4BertiniProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BertiniProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BertiniProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryNeutronBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4BinaryPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BinaryPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BinaryPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4BinaryProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4BinaryProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4BinaryProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4ChargeExchangePhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4ChargeExchangePhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4ChargeExchangePhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ChargeExchangePhysics.hh,v 1.1 2008/11/20 12:38:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh	(revision 1228)
@@ -33,15 +33,15 @@
 #include "G4VPiKBuilder.hh"
 
-enum G4DataType {no, photon, neutron, radioactive, lowenergy};
+enum G4DataType {no, photon, neutron, radioactive, lowenergy, optical};
 class G4DataQuestionaire
 {
   public: 
-    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, G4DataType t4=no) 
+    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, G4DataType t4=no, G4DataType t5=no) 
     {
       G4cout << G4endl;
-      G4cout << "<<< Geant4 Physics List engine packaging library: PACK 5.4"<<G4endl;
+      G4cout << "<<< Geant4 Physics List engine packaging library: PACK 5.5"<<G4endl;
       //      G4cout <<G4endl<<G4endl;
       // G4cout << "##### the input "<<t1<<" "<<t2<<" "<<t3<<" "<<t4<<G4endl;
-      for(G4int i=0; i<4; i++)
+      for(G4int i=0; i<5; i++)
       {
 	G4DataType t(no);
@@ -50,4 +50,5 @@
 	if(i==2) t=t3;
 	if(i==3) t=t4;
+	if(i==4) t=t5;
 	switch(t)
 	{
@@ -96,4 +97,15 @@
 	    }
 	    break;
+          case optical:
+	    if(!getenv("G4LEDATA") )
+	    {
+	      G4cout << "Data describing surface propeties for optical photons are needed."<<G4endl;
+	      G4cout << "Please set the environmental variable G4REALSURFACEDATA"<<G4endl;
+	      G4cout << "to point to your RealSurface directory."<<G4endl;
+	      G4cout << "Data are available from the Geant4 download page."<<G4endl;
+              G4Exception("G4DataQuestionaire", "007", FatalException,
+	                  "Fatal error: Missing mandatory data for this simulation engine");
+	    }
+	    break;
 	  case no:
 	    // all ok
Index: trunk/source/physics_lists/builders/include/G4DecayPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4DecayPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4DecayPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DecayPhysics.hh,v 1.2 2009/11/05 01:24:47 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmDNAPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmDNAPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmDNAPhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmDNAPhysics.hh,v 1.1 2009/03/25 11:28:07 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4EmDNAPhysics_h
Index: trunk/source/physics_lists/builders/include/G4EmExtraPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmExtraPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmExtraPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmExtraPhysics.hh,v 1.2 2007/11/15 18:08:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmLivermorePhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmLivermorePhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmLivermorePhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmLivermorePhysics.hh,v 1.1 2009/03/25 20:54:32 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4EmLivermorePhysics_h
Index: trunk/source/physics_lists/builders/include/G4EmLivermorePolarizedPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmLivermorePolarizedPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmLivermorePolarizedPhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmLivermorePolarizedPhysics.hh,v 1.1 2009/03/25 20:54:32 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4EmLivermorePolarizedPhysics_h
Index: trunk/source/physics_lists/builders/include/G4EmMessenger.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmMessenger.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmMessenger.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmMessenger.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmPenelopePhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmPenelopePhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmPenelopePhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmPenelopePhysics.hh,v 1.1 2009/03/25 13:24:57 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4EmPenelopePhysics_h
Index: trunk/source/physics_lists/builders/include/G4EmStandardPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmStandardPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmStandardPhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmStandardPhysics.hh,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option1.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option1.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option1.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmStandardPhysics_option1.hh,v 1.1 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option2.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option2.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option2.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmStandardPhysics_option2.hh,v 1.1 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option3.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option3.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4EmStandardPhysics_option3.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmStandardPhysics_option3.hh,v 1.1 2008/03/13 12:11:02 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFBinaryNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFBinaryNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFBinaryNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryNeutronBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFBinaryPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFBinaryPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFBinaryPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryPiKBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFBinaryProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFBinaryProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFBinaryProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryProtonBuilder.hh,v 1.2 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFCNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCNeutronBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFCPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFCPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFCPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCPiKBuilder.hh,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFCProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFCProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFCProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCProtonBuilder.hh,v 1.4 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPNeutronBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFPPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFPPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFPPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPPiKBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4FTFPProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4FTFPProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4FTFPProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPProtonBuilder.hh,v 1.4 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4HadronDElasticPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4HadronDElasticPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4HadronDElasticPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronDElasticPhysics.hh,v 1.1 2007/11/13 16:19:52 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4HadronElasticPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4HadronElasticPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4HadronElasticPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronElasticPhysics.hh,v 1.4 2006/11/23 15:46:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4HadronHElasticPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4HadronHElasticPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4HadronHElasticPhysics.hh	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4HadronHElasticPhysics.hh,v 1.3 2009/10/04 16:03:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: G4HadronHElasticPhysics.hh,v 1.4 2009/11/28 17:35:01 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -51,5 +51,6 @@
 {
 public: 
-  G4HadronHElasticPhysics(G4int ver = 0, G4bool hp = false);
+  G4HadronHElasticPhysics(G4int ver = 0, G4bool hp = false, 
+			  const G4String& type = "");
   virtual ~G4HadronHElasticPhysics();
 
@@ -69,4 +70,5 @@
   G4bool   hpFlag;
   G4bool   wasActivated;
+  G4String subtype;
 };
 
Index: trunk/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4HadronQElasticPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronQElasticPhysics.hh,v 1.1 2006/11/17 19:19:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4InclAblaPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4InclAblaPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4InclAblaPiKBuilder.hh	(revision 1228)
@@ -37,4 +37,5 @@
 #include "G4PiNuclearCrossSection.hh"
 #include "G4InclAblaCascadeInterface.hh"   
+#include "G4CascadeInterface.hh"
 
 /**
@@ -75,5 +76,5 @@
     G4double theMin;
     G4double theMax;
-
+    G4CascadeInterface *theBertiniModel;
 };
 
Index: trunk/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4IonBinaryCascadePhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonBinaryCascadePhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4IonInclAblaPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4IonInclAblaPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4IonInclAblaPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonInclAblaPhysics.hh,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4IonPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4IonPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4IonPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4LEPNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4LEPNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4LEPNeutronBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4LEPPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4LEPPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4LEPPiKBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4LEPProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4LEPProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4LEPProtonBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4LHEPStoppingPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LHEPStoppingPhysics.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4MiscLHEPBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4MiscLHEPBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4MiscLHEPBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4MiscQGSCBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4MiscQGSCBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4MiscQGSCBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4NeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4NeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4NeutronBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4NeutronTrackingCut.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4NeutronTrackingCut.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4NeutronTrackingCut.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronTrackingCut.hh,v 1.2 2008/09/17 18:19:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4PiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4PiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4PiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PiKBuilder.hh,v 1.1 2006/10/31 11:35:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PrecoNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4PrecoProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4PrecoProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4PrecoProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PrecoProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4ProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4ProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4ProtonBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QAtomicPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QAtomicPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QAtomicPhysics.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QAtomicPhysics.hh,v 1.1 2009/11/20 10:24:28 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QCaptureAtRestPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QCaptureAtRestPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QCaptureAtRestPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCaptureAtRestPhysics.hh,v 1.1 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QEmExtraPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QEmExtraPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QEmExtraPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QEmExtraPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSBinaryNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSBinaryNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSBinaryNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSBinaryPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSBinaryPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSBinaryPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryPiKBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSBinaryProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSBinaryProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSBinaryProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCEflowNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowNeutronBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCEflowPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowPiKBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCEflowProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowProtonBuilder.hh,v 1.3 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCNeutronBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCPiKBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSCProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCProtonBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPNeutronBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSPPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSPPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSPPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPPiKBuilder.hh,v 1.4 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QGSPProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QGSPProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QGSPProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPProtonBuilder.hh,v 1.5 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QInelasticCHIPSBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QInelasticCHIPSBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QInelasticCHIPSBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QMessenger.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QMessenger.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QMessenger.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QMessenger.hh,v 1.1 2009/11/13 18:50:14 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QNeutrinoPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QNeutrinoPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QNeutrinoPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QNeutrinoPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QNeutronBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QPhotoNuclearPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QPhotoNuclearPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QPhotoNuclearPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPhotoNuclearPhysics.hh,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QProtonBuilder.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4QStoppingPhysics.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4QStoppingPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4QStoppingPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QStoppingPhysics.hh,v 1.2 2007/04/26 16:03:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4StoppingHadronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4StoppingHadronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4StoppingHadronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StoppingHadronBuilder.hh,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4VHadronModelBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4VHadronModelBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4VHadronModelBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VHadronModelBuilder.hh,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4VNeutronBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4VNeutronBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4VNeutronBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VNeutronBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4VPiKBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4VPiKBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4VPiKBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VPiKBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/include/G4VProtonBuilder.hh
===================================================================
--- trunk/source/physics_lists/builders/include/G4VProtonBuilder.hh	(revision 1227)
+++ trunk/source/physics_lists/builders/include/G4VProtonBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VProtonBuilder.hh,v 1.2 2009/03/31 11:04:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BertiniNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BertiniNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BertiniNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniNeutronBuilder.cc,v 1.4 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BertiniPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BertiniPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BertiniPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BertiniProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BertiniProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BertiniProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BertiniProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BinaryNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BinaryNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BinaryNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryNeutronBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BinaryPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BinaryPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BinaryPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryPiKBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4BinaryProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4BinaryProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4BinaryProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BinaryProtonBuilder.cc,v 1.3 2009/04/02 08:11:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4ChargeExchangePhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4ChargeExchangePhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4ChargeExchangePhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ChargeExchangePhysics.cc,v 1.1 2008/11/20 12:38:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4DecayPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4DecayPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4DecayPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DecayPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4ElectroNuclearBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4ElectroNuclearBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4ElectroNuclearBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ElectroNuclearBuilder.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmDNAPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmDNAPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmDNAPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmDNAPhysics.cc,v 1.2 2009/11/01 13:21:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4EmDNAPhysics.hh"
Index: trunk/source/physics_lists/builders/src/G4EmExtraPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmExtraPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmExtraPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmExtraPhysics.cc,v 1.3 2008/01/08 10:36:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmLivermorePhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmLivermorePhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmLivermorePhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmLivermorePhysics.cc,v 1.7 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4EmLivermorePhysics.hh"
Index: trunk/source/physics_lists/builders/src/G4EmLivermorePolarizedPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmLivermorePolarizedPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmLivermorePolarizedPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmLivermorePolarizedPhysics.cc,v 1.6 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4EmLivermorePolarizedPhysics.hh"
Index: trunk/source/physics_lists/builders/src/G4EmMessenger.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmMessenger.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmMessenger.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmPenelopePhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmPenelopePhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmPenelopePhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmPenelopePhysics.cc,v 1.7 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4EmPenelopePhysics.hh"
Index: trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmStandardPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmStandardPhysics.cc,v 1.20 2009/10/30 18:36:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option1.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmStandardPhysics_option1.cc,v 1.15 2009/10/30 18:36:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmStandardPhysics_option2.cc,v 1.20 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option3.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option3.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option3.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmStandardPhysics_option3.cc,v 1.18 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFBinaryNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFBinaryNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFBinaryNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryNeutronBuilder.cc,v 1.4 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFBinaryPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFBinaryPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFBinaryPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryPiKBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFBinaryProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFBinaryProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFBinaryProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBinaryProtonBuilder.cc,v 1.3 2009/03/31 18:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFBuilder.cc,v 1.2 2009/11/25 19:33:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFCNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFCNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFCNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCNeutronBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFCPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFCPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFCPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCPiKBuilder.cc,v 1.3 2009/03/31 18:38:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFCProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFCProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFCProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFCProtonBuilder.cc,v 1.4 2009/03/31 18:38:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPNeutronBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFPPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFPPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFPPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPPiKBuilder.cc,v 1.5 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4FTFPProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4FTFPProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4FTFPProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FTFPProtonBuilder.cc,v 1.6 2009/04/23 18:54:57 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4HadronDElasticPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4HadronDElasticPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4HadronDElasticPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronDElasticPhysics.cc,v 1.3 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4HadronElasticPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronElasticPhysics.cc,v 1.9 2008/12/01 16:57:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4HadronHElasticPhysics.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4HadronHElasticPhysics.cc,v 1.6 2009/10/04 16:03:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: G4HadronHElasticPhysics.cc,v 1.7 2009/11/28 17:35:01 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -58,8 +58,10 @@
 #include "G4BGGNucleonElasticXS.hh"
 #include "G4BGGPionElasticXS.hh"
+#include "G4NeutronElasticXS.hh"
 
-G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool hp)
+G4HadronHElasticPhysics::G4HadronHElasticPhysics(G4int ver, G4bool hp,
+						 const G4String& type)
   : G4VPhysicsConstructor("HElastic"), verbose(ver), 
-    hpFlag(hp), wasActivated(false)
+    hpFlag(hp), wasActivated(false), subtype(type)
 {
   if(verbose > 1) G4cout << "### HadronHElasticPhysics" << G4endl;
@@ -157,5 +159,9 @@
       G4ProcessManager* pmanager = particle->GetProcessManager();
       G4WHadronElasticProcess* hel = new G4WHadronElasticProcess();
-      hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      if(subtype == "QBBC_XGGSN") {
+	hel->AddDataSet(new G4NeutronElasticXS());
+      } else {
+	hel->AddDataSet(new G4BGGNucleonElasticXS(particle));
+      }
       hel->RegisterMe(chipsn);
 
Index: trunk/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4HadronQElasticPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronQElasticPhysics.cc,v 1.7 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4InclAblaPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4InclAblaPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4InclAblaPiKBuilder.cc	(revision 1228)
@@ -37,4 +37,7 @@
    theModel->SetMinEnergy(theMin);
    theModel->SetMaxEnergy(theMax); 
+   theBertiniModel = new G4CascadeInterface;
+   theBertiniModel->SetMinEnergy(theMin);
+   theBertiniModel->SetMaxEnergy(theMax); 
  }
 
@@ -66,21 +69,33 @@
 
  void G4InclAblaPiKBuilder::
- Build(G4KaonPlusInelasticProcess *)
+ Build(G4KaonPlusInelasticProcess *aP)
  {
+   aP->RegisterMe(theBertiniModel);
+   theBertiniModel->SetMinEnergy(theMin);
+   theBertiniModel->SetMaxEnergy(theMax);
  }
 
  void G4InclAblaPiKBuilder::
- Build(G4KaonMinusInelasticProcess *)
+ Build(G4KaonMinusInelasticProcess *aP)
  {
+   aP->RegisterMe(theBertiniModel);
+   theBertiniModel->SetMinEnergy(theMin);
+   theBertiniModel->SetMaxEnergy(theMax);
  }
 
  void G4InclAblaPiKBuilder::
- Build(G4KaonZeroLInelasticProcess *)
+ Build(G4KaonZeroLInelasticProcess *aP)
  {
+   aP->RegisterMe(theBertiniModel);
+   theBertiniModel->SetMinEnergy(theMin);
+   theBertiniModel->SetMaxEnergy(theMax);
  }
 
  void G4InclAblaPiKBuilder::
- Build(G4KaonZeroSInelasticProcess *)
+ Build(G4KaonZeroSInelasticProcess *aP)
  {
+   aP->RegisterMe(theBertiniModel);
+   theBertiniModel->SetMinEnergy(theMin);
+   theBertiniModel->SetMaxEnergy(theMax);
  }
 
Index: trunk/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4IonBinaryCascadePhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonBinaryCascadePhysics.cc,v 1.2 2009/02/16 10:15:35 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4IonInclAblaPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4IonInclAblaPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4IonInclAblaPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonInclAblaPhysics.cc,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4IonPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4IonPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4IonPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonPhysics.cc,v 1.1 2006/10/31 11:35:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4LEPNeutronBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4LEPPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4LEPPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4LEPPiKBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4LEPProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4LEPProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4LEPProtonBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4LHEPStoppingPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LHEPStoppingPhysics.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4MiscLHEPBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4MiscQGSCBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4MiscQGSCBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4MiscQGSCBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4NeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4NeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4NeutronBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4NeutronTrackingCut.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4NeutronTrackingCut.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4NeutronTrackingCut.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronTrackingCut.cc,v 1.5 2008/09/17 18:19:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4PiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4PiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4PiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PiKBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4PrecoNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PrecoNeutronBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4PrecoProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4PrecoProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4PrecoProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PrecoProtonBuilder.cc,v 1.2 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4ProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4ProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4ProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ProtonBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QAtomicPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QAtomicPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QAtomicPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QAtomicPhysics.cc,v 1.1 2009/11/20 10:24:28 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QCaptureAtRestPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QCaptureAtRestPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QCaptureAtRestPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCaptureAtRestPhysics.cc,v 1.1 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QEmExtraPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QEmExtraPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QEmExtraPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QEmExtraPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSBinaryNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSBinaryNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSBinaryNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryNeutronBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSBinaryPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSBinaryPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSBinaryPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryPiKBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSBinaryProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSBinaryProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSBinaryProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBinaryProtonBuilder.cc,v 1.3 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSBuilder.cc,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCEflowNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowNeutronBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCEflowPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowPiKBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCEflowProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCEflowProtonBuilder.cc,v 1.4 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSCProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSCProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSPNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPNeutronBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSPPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSPPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSPPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPPiKBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QGSPProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QGSPProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QGSPProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QGSPProtonBuilder.cc,v 1.5 2009/03/31 11:03:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QInelasticCHIPSBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QInelasticCHIPSBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QInelasticCHIPSBuilder.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QMessenger.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QMessenger.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QMessenger.cc,v 1.1 2009/11/13 18:50:14 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QNeutrinoPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QNeutrinoPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QNeutrinoPhysics.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QNeutrinoPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: G4QNeutrinoPhysics.cc,v 1.3 2009/11/30 18:44:49 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -43,5 +43,5 @@
   G4VPhysicsConstructor(name), wasBuilt(false), nuEleActivated(false),
   nuMuoActivated(false), nuTauActivated(false), nuEleOn(false),
-  nuMuoOn(false), nuTauOn(false), nuNucBias(1.)
+  nuMuoOn(false), nuTauOn(false), nuNucBias(1.), inelastic(0)
 {
   theMessenger = G4QMessenger::GetPointer();
@@ -51,5 +51,5 @@
 G4QNeutrinoPhysics::~G4QNeutrinoPhysics()
 {
-  if(wasBuilt) delete inelastic;
+  if(wasBuilt && inelastic) delete inelastic;
 }
 
@@ -94,11 +94,14 @@
 {
   if(wasBuilt) return;
-  wasBuilt = true;
-
-  inelastic = new G4QInelastic("neutrinoNuclear");
-  inelastic->SetWeakNucBias(nuNucBias); // enough only once (static)
-  if (nuEleOn)   BuildNuEleNuclear();
-  if (nuMuoOn)   BuildNuMuoNuclear();
-  if (nuTauOn)   BuildNuTauNuclear();
+  if(nuEleOn || nuMuoOn || nuTauOn)
+  {
+    wasBuilt = true;
+    G4cout<<"Builded=>G4QNeutrinoPhysics: "<<nuEleOn<<", "<<nuMuoOn<<", "<<nuTauOn<<G4endl;
+    inelastic = new G4QInelastic("neutrinoNuclear");
+    inelastic->SetWeakNucBias(nuNucBias); // enough only once (static)
+    if (nuEleOn)   BuildNuEleNuclear();
+    if (nuMuoOn)   BuildNuMuoNuclear();
+    if (nuTauOn)   BuildNuTauNuclear();
+  }
 }
 
Index: trunk/source/physics_lists/builders/src/G4QNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QNeutronBuilder.cc,v 1.4 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QPhotoNuclearPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QPhotoNuclearPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QPhotoNuclearPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPhotoNuclearPhysics.cc,v 1.2 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QProtonBuilder.cc,v 1.4 2009/11/16 19:12:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4QStoppingPhysics.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4QStoppingPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4QStoppingPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QStoppingPhysics.cc,v 1.2 2007/04/26 16:03:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4StoppingHadronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StoppingHadronBuilder.cc,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4VHadronModelBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4VHadronModelBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4VHadronModelBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VHadronModelBuilder.cc,v 1.1 2009/10/04 16:29:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4VNeutronBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4VNeutronBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4VNeutronBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VNeutronBuilder.cc,v 1.1 2009/03/31 18:39:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4VPiKBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4VPiKBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4VPiKBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VPiKBuilder.cc,v 1.1 2009/03/31 18:39:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/builders/src/G4VProtonBuilder.cc
===================================================================
--- trunk/source/physics_lists/builders/src/G4VProtonBuilder.cc	(revision 1227)
+++ trunk/source/physics_lists/builders/src/G4VProtonBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VProtonBuilder.cc,v 1.1 2009/03/31 18:39:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/CHIPS.icc
===================================================================
--- trunk/source/physics_lists/lists/include/CHIPS.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/CHIPS.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: CHIPS.icc,v 1.7 2009/11/20 16:49:03 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/CVS/Entries
===================================================================
--- trunk/source/physics_lists/lists/include/CVS/Entries	(revision 1227)
+++ trunk/source/physics_lists/lists/include/CVS/Entries	(revision 1228)
@@ -1,119 +1,119 @@
-/CHIPS.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/CHIPS.icc/1.7/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFC.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/FTFC.icc/1.7/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/FTFP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/FTFP.icc/1.6/Thu Jun 19 08:08:22 2008//Tgeant4-09-03-cand-03
-/FTFP_BERT.hh/1.1/Fri Oct 19 15:35:08 2007//Tgeant4-09-03-cand-03
-/FTFP_BERT.icc/1.2/Thu Jun 19 08:08:22 2008//Tgeant4-09-03-cand-03
-/FTFP_BERT_EMV.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_BERT_EMV.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_BERT_EMX.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_BERT_EMX.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_BERT_TRV.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_BERT_TRV.icc/1.2/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/FTFP_EMV.hh/1.1/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/FTFP_EMV.icc/1.4/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/FTF_BIC.hh/1.1/Fri Nov 16 16:52:55 2007//Tgeant4-09-03-cand-03
-/FTF_BIC.icc/1.4/Tue Jun  2 16:51:35 2009//Tgeant4-09-03-cand-03
-/G4HadronInelasticQBBC.hh/1.12/Wed Nov 25 13:10:51 2009//Tgeant4-09-03-cand-03
-/G4HadronInelasticQLHEP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/G4PhysListFactory.hh/1.2/Fri Nov 21 16:50:30 2008//Tgeant4-09-03-cand-03
-/G4VHadronPhysics.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsCHIPS.hh/1.2/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFC.hh/1.3/Thu Jun 19 08:08:22 2008//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP.hh/1.3/Thu Jun 19 08:08:22 2008//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP_BERT.hh/1.3/Thu Jun 19 08:08:23 2008//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP_BERT_TRV.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsFTF_BIC.hh/1.3/Thu Jun 19 08:08:23 2008//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_BERT.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_BERT_HP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_EMV.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_PRECO_HP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC.hh/1.2/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_BERT.hh/1.2/Thu Apr  9 08:22:53 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_CHIPS.hh/1.6/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_EFLOW.hh/1.2/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_QGSC.hh/1.4/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP.hh/1.4/Tue Nov 13 10:16:09 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT.hh/1.3/Mon Dec 10 17:34:44 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_HP.hh/1.3/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_NOLEP.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_TRV.hh/1.1/Mon May  7 14:34:29 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BIC.hh/1.2/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BIC_HP.hh/1.2/Thu Apr 26 14:47:10 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_FTFP_BERT.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_INCL_ABLA.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGS_BIC.hh/1.1/Tue Nov 13 10:23:24 2007//Tgeant4-09-03-cand-03
-/LBE.hh/1.2/Fri Nov 24 16:52:11 2006//Tgeant4-09-03-cand-03
-/LBE.icc/1.3/Wed Dec 20 13:51:56 2006//Tgeant4-09-03-cand-03
-/LHEP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/LHEP.icc/1.3/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/LHEP_BERT.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/LHEP_BERT.icc/1.4/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/LHEP_BERT_HP.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/LHEP_BERT_HP.icc/1.4/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/LHEP_EMV.hh/1.1/Tue Oct 31 11:35:03 2006//Tgeant4-09-03-cand-03
-/LHEP_EMV.icc/1.3/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/LHEP_PRECO_HP.hh/1.1/Tue Oct 31 11:35:08 2006//Tgeant4-09-03-cand-03
-/LHEP_PRECO_HP.icc/1.4/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/MaxTimeCuts.hh/1.1/Tue Oct 31 11:35:08 2006//Tgeant4-09-03-cand-03
-/MinEkineCuts.hh/1.1/Tue Oct 31 11:35:08 2006//Tgeant4-09-03-cand-03
-/QBBC.hh/1.3/Sun Oct  4 16:05:10 2009//Tgeant4-09-03-cand-03
-/QGSC.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSC.icc/1.8/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSC_BERT.hh/1.1/Thu Nov 15 16:58:16 2007//Tgeant4-09-03-cand-03
-/QGSC_BERT.icc/1.1/Thu Nov 15 16:58:16 2007//Tgeant4-09-03-cand-03
-/QGSC_CHIPS.hh/1.3/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSC_CHIPS.icc/1.2/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSC_EFLOW.hh/1.1/Tue Dec  5 17:03:32 2006//Tgeant4-09-03-cand-03
-/QGSC_EFLOW.icc/1.5/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSC_EMV.hh/1.1/Fri Nov 24 15:49:09 2006//Tgeant4-09-03-cand-03
-/QGSC_EMV.icc/1.4/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSC_QGSC.hh/1.3/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSC_QGSC.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP.icc/1.7/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP_BERT.icc/1.5/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_DIF.hh/1.1/Mon Dec 10 17:34:44 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_DIF.icc/1.3/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_EMV.hh/1.1/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_EMV.icc/1.3/Sun Oct  4 16:06:39 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_EMX.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_EMX.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_HP.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP_BERT_HP.icc/1.4/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_NOLEP.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_NOLEP.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_NQE.hh/1.1/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_NQE.icc/1.3/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_BERT_TRV.hh/1.1/Mon May  7 14:34:29 2007//Tgeant4-09-03-cand-03
-/QGSP_BERT_TRV.icc/1.2/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSP_BIC.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP_BIC.icc/1.5/Wed May 16 11:35:36 2007//Tgeant4-09-03-cand-03
-/QGSP_BIC_EMY.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BIC_EMY.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_BIC_HP.hh/1.1/Fri Nov 24 16:31:35 2006//Tgeant4-09-03-cand-03
-/QGSP_BIC_HP.icc/1.5/Thu May 24 11:32:57 2007//Tgeant4-09-03-cand-03
-/QGSP_DIF.hh/1.1/Tue Nov 13 10:20:32 2007//Tgeant4-09-03-cand-03
-/QGSP_DIF.icc/1.2/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_EMV.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP_EMV.icc/1.6/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_EMV_NQE.hh/1.1/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/QGSP_EMV_NQE.icc/1.3/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_EMX.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
-/QGSP_EMX.icc/1.7/Tue Jun  2 16:51:35 2009//Tgeant4-09-03-cand-03
-/QGSP_FTFP_BERT.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_FTFP_BERT.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_INCL_ABLA.hh/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_INCL_ABLA.icc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/QGSP_NQE.hh/1.1/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/QGSP_NQE.icc/1.3/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGSP_QEL.hh/1.1/Tue Nov 28 15:41:23 2006//Tgeant4-09-03-cand-03
-/QGSP_QEL.icc/1.4/Mon May 18 08:54:22 2009//Tgeant4-09-03-cand-03
-/QGS_BIC.hh/1.1/Tue Nov 13 10:23:24 2007//Tgeant4-09-03-cand-03
-/QGS_BIC.icc/1.2/Mon Dec 10 17:33:58 2007//Tgeant4-09-03-cand-03
-/SpecialCuts.hh/1.1/Tue Oct 31 11:35:09 2006//Tgeant4-09-03-cand-03
+/CHIPS.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/CHIPS.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFC.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_EMV.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_EMX.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_BERT_TRV.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTFP_EMV.icc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTF_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/FTF_BIC.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4HadronInelasticQBBC.hh/1.12/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4HadronInelasticQLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4PhysListFactory.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4VHadronPhysics.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsCHIPS.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTF_BIC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_BERT.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_CHIPS.hh/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_EFLOW.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_QGSC.hh/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP.hh/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_HP.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BIC.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BIC_HP.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LBE.hh/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LBE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_BERT.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_PRECO_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/LHEP_PRECO_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/MaxTimeCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/MinEkineCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QBBC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC.icc/1.9/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_BERT.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_CHIPS.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_CHIPS.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_EFLOW.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_EFLOW.icc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_EMV.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_QGSC.hh/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSC_QGSC.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP.icc/1.8/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_DIF.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_EMV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_EMX.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_HP.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_NOLEP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_NOLEP.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_TRV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BERT_TRV.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC_EMY.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC_EMY.icc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC_HP.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_BIC_HP.icc/1.5/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_DIF.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_DIF.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMV.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMV.icc/1.7/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMV_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMV_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMX.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_EMX.icc/1.8/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_FTFP_BERT.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_FTFP_BERT.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_INCL_ABLA.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_INCL_ABLA.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_NQE.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_NQE.icc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_QEL.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGSP_QEL.icc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGS_BIC.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QGS_BIC.icc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/SpecialCuts.hh/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
 D
Index: trunk/source/physics_lists/lists/include/CVS/Tag
===================================================================
--- trunk/source/physics_lists/lists/include/CVS/Tag	(revision 1227)
+++ trunk/source/physics_lists/lists/include/CVS/Tag	(revision 1228)
@@ -1,1 +1,1 @@
-Ngeant4-09-03-cand-03
+Ngeant4-09-03
Index: trunk/source/physics_lists/lists/include/FTFC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFC.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFC.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFC.icc,v 1.7 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: FTFP.icc,v 1.6 2008/06/19 08:08:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: FTFP.icc,v 1.7 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -42,4 +42,5 @@
 // 16.05.2007 V.Ivanchenko: rename EM builders
 // 19.06.2008 G.Folger: don't use chips quasielastic in FTF
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //----------------------------------------------------------------------------
@@ -70,4 +71,6 @@
 #include "HadronPhysicsFTFP.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TFTFP<T>::TFTFP(G4int ver):  T()
 {
@@ -75,8 +78,11 @@
   // defaultCutValue = 1.0*mm;
   G4DataQuestionaire it(photon);
-  G4cout << "<<< Geant4 Physics List simulation engine: FTFP 4.4"<<G4endl;
+  G4cout << "<<< Geant4 Physics List simulation engine: FTFP 4.5"<<G4endl;
   G4cout <<G4endl;
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus obs;
+  obs.Unsupported("FTFP", "FTFP_BERT");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/FTFP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT.hh,v 1.1 2007/10/19 15:35:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_BERT.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT.icc,v 1.2 2008/06/19 08:08:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: FTFP_BERT.icc,v 1.3 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -35,5 +35,7 @@
 //   created from FTFP
 //
+// Modified:
 // 19.06.2008 G.Folger: don't use chips quasielastic in FTF
+// 27.11.2009 G.Folger: Remobe experimental status
 //
 //----------------------------------------------------------------------------
@@ -64,6 +66,4 @@
 #include "HadronPhysicsFTFP_BERT.hh"
 
-#include "G4WarnPLStatus.hh"
-
 template<class T> TFTFP_BERT<T>::TFTFP_BERT(G4int ver):  T()
 {
@@ -76,8 +76,5 @@
   this->SetVerboseLevel(ver);
 
-  G4WarnPLStatus exp;
-  exp.Experimental("FTFP_BERT");
-
-  // EM Physics
+ // EM Physics
   this->RegisterPhysics( new G4EmStandardPhysics(ver));
 
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT_EMV.hh,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_EMV.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: FTFP_BERT_EMV.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: FTFP_BERT_EMV.icc,v 1.2 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -33,4 +33,7 @@
 // Author: 11 May 2009  V.Ivanchenko
 //   created from FTFP_BERT
+//
+// Modified:
+// 27.11.2009 G.Folger: Remobe experimental status
 //
 //----------------------------------------------------------------------------
@@ -61,6 +64,4 @@
 #include "HadronPhysicsFTFP_BERT.hh"
 
-#include "G4WarnPLStatus.hh"
-
 template<class T> TFTFP_BERT_EMV<T>::TFTFP_BERT_EMV(G4int ver):  T()
 {
@@ -72,7 +73,4 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
-
-  G4WarnPLStatus exp;
-  exp.Experimental("FTFP_BERT_EMV");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT_EMX.hh,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_EMX.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT_EMX.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT_TRV.hh,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_BERT_TRV.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_BERT_TRV.icc,v 1.2 2009/06/02 16:51:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTFP_EMV.hh,v 1.1 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTFP_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTFP_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTFP_EMV.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: FTFP_EMV.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: FTFP_EMV.icc,v 1.6 2009/12/04 13:08:42 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -85,5 +85,5 @@
 
   G4WarnPLStatus obs;
-  obs.Unsupported("FTFP_EMV","FTFP_BERT_EMV");
+  obs.Replaced("FTFP_EMV","FTFP_BERT_EMV");
   G4Exception(" Crash for usage of replaced physics list");
 
Index: trunk/source/physics_lists/lists/include/FTF_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/FTF_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTF_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTF_BIC.hh,v 1.1 2007/11/16 16:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/FTF_BIC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/FTF_BIC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/FTF_BIC.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: FTF_BIC.icc,v 1.4 2009/06/02 16:51:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/G4HadronInelasticQBBC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronInelasticQBBC.hh,v 1.12 2009/11/25 13:10:51 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/G4HadronInelasticQLHEP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronInelasticQLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/G4PhysListFactory.hh
===================================================================
--- trunk/source/physics_lists/lists/include/G4PhysListFactory.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/G4PhysListFactory.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PhysListFactory.hh,v 1.2 2008/11/21 16:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/G4VHadronPhysics.hh
===================================================================
--- trunk/source/physics_lists/lists/include/G4VHadronPhysics.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/G4VHadronPhysics.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VHadronPhysics.hh,v 1.1 2009/09/01 14:48:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsCHIPS.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsCHIPS.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsCHIPS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsCHIPS.hh,v 1.2 2009/11/20 10:24:28 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsFTFC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsFTFC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsFTFC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFC.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsFTFP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsFTFP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsFTFP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP.hh,v 1.3 2008/06/19 08:08:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP_BERT.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT_TRV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT_TRV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsFTFP_BERT_TRV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP_BERT_TRV.hh,v 1.1 2009/06/02 16:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsFTF_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsFTF_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsFTF_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTF_BIC.hh,v 1.3 2008/06/19 08:08:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsLHEP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsLHEP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsLHEP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_BERT_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_BERT_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsLHEP_PRECO_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_BERT.hh,v 1.2 2009/04/09 08:22:53 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_CHIPS.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_CHIPS.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_CHIPS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_CHIPS.hh,v 1.6 2009/04/17 15:29:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_EFLOW.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_EFLOW.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_QGSC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_QGSC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSC_QGSC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_QGSC.hh,v 1.4 2009/04/14 07:23:08 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP.hh,v 1.4 2007/11/13 10:16:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT.hh,v 1.3 2007/12/10 17:34:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT_HP.hh,v 1.3 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_NOLEP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_NOLEP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_NOLEP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT_NOLEP.hh,v 1.1 2008/10/17 12:43:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_TRV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_TRV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BERT_TRV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT_TRV.hh,v 1.1 2007/05/07 14:34:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BIC.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_BIC_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BIC_HP.hh,v 1.2 2007/04/26 14:47:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_FTFP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_FTFP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_FTFP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_FTFP_BERT.hh,v 1.1 2009/04/23 19:04:18 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_INCL_ABLA.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_INCL_ABLA.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGSP_INCL_ABLA.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_INCL_ABLA.hh,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/HadronPhysicsQGS_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/HadronPhysicsQGS_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/HadronPhysicsQGS_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGS_BIC.hh,v 1.1 2007/11/13 10:23:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_BERT.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_BERT.icc
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_BERT.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_BERT.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_BERT.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_BERT_HP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_BERT_HP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_BERT_HP.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_BERT_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_EMV.hh,v 1.1 2006/10/31 11:35:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_EMV.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_EMV.icc,v 1.3 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_PRECO_HP.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/LHEP_PRECO_HP.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: LHEP_PRECO_HP.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/MinEkineCuts.hh
===================================================================
--- trunk/source/physics_lists/lists/include/MinEkineCuts.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/MinEkineCuts.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: MinEkineCuts.hh,v 1.1 2006/10/31 11:35:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/physics_lists/lists/include/QBBC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QBBC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QBBC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QBBC.hh,v 1.3 2009/10/04 16:05:10 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSC.icc,v 1.8 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSC.icc,v 1.9 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -43,4 +43,5 @@
 // 26.04.2007 G.Folger  Use QCaptureAtRest for muon
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //----------------------------------------------------------------------------
@@ -70,4 +71,6 @@
 #include "HadronPhysicsQGSC.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSC<T>::TQGSC(G4int ver):  T()
 {
@@ -79,4 +82,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus obs;
+  obs.Unsupported("QGSC", "QGSC_BERT");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSC_BERT.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_BERT.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_BERT.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSC_BERT.icc,v 1.1 2007/11/15 16:58:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSC_CHIPS.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_CHIPS.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_CHIPS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSC_CHIPS.hh,v 1.3 2009/04/17 15:29:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSC_CHIPS.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_CHIPS.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_CHIPS.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSC_CHIPS.icc,v 1.2 2009/04/17 15:29:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSC_CHIPS.icc,v 1.3 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -34,4 +34,5 @@
 //
 // Modified:
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //-------------------------------------------------------------------------------
@@ -71,4 +72,6 @@
 #include "HadronPhysicsQGSC_CHIPS.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSC_CHIPS<T>::TQGSC_CHIPS(G4int ver):  T()
 {
@@ -79,4 +82,7 @@
   this->defaultCutValue = 0.7*mm;
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus obs;
+  obs.Unsupported("QGSC_CHIPS", "CHIPS");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSC_EFLOW.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_EFLOW.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_EFLOW.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSC_EFLOW.icc,v 1.5 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSC_EFLOW.icc,v 1.6 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -39,4 +39,5 @@
 // 26.04.2007 G.Folger  Use QCaptureAtRest for muon
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: suggest different alternative list
 //
 //----------------------------------------------------------------------------
@@ -79,5 +80,5 @@
 
   G4WarnPLStatus obs;
-  obs.Unsupported("QGSC_EFLOW","QGSC_CHIPS");
+  obs.Replaced("QGSC_EFLOW","QGSC_BERT");
   G4Exception(" Crash for usage of replaced physics list");
 
Index: trunk/source/physics_lists/lists/include/QGSC_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_EMV.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSC_EMV.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSC_EMV.icc,v 1.5 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -40,4 +40,5 @@
 // 26.04.2007 G.Folger  Use QCaptureAtRest for muon
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //----------------------------------------------------------------------------
@@ -67,4 +68,6 @@
 #include "HadronPhysicsQGSC.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSC_EMV<T>::TQGSC_EMV(G4int ver):  T()
 {
@@ -76,4 +79,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus obs;
+  obs.Unsupported("QGSC_EMV", "QGSC_BERT");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSC_QGSC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSC_QGSC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSC_QGSC.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSC_QGSC.icc,v 1.1 2009/04/06 10:04:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSC_QGSC.icc,v 1.2 2009/11/27 17:28:18 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -34,4 +34,5 @@
 //
 // Modified:
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //----------------------------------------------------------------------------
@@ -61,4 +62,6 @@
 #include "HadronPhysicsQGSC_QGSC.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSC_QGSC<T>::TQGSC_QGSC(G4int ver):  T()
 {
@@ -70,4 +73,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus obs;
+  obs.Unsupported("QGSC_QGSC", "CHIPS");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: QGSP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP.icc,v 1.7 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP.icc,v 1.8 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -41,4 +41,5 @@
 // 30.03.2007 G.Folger: Enable quasielastic for QGS string model
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: Mark as obsolete
 //
 //----------------------------------------------------------------------------
@@ -69,4 +70,6 @@
 #include "HadronPhysicsQGSP.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSP<T>::TQGSP(G4int ver):  T()
 {
@@ -75,5 +78,5 @@
 
   G4DataQuestionaire it(photon);
-  G4cout << "<<< Geant4 Physics List simulation engine: QGSP 3.3"<<G4endl;
+  G4cout << "<<< Geant4 Physics List simulation engine: QGSP 3.4"<<G4endl;
   G4cout <<G4endl;
 
@@ -81,4 +84,7 @@
   this->SetVerboseLevel(ver);
 
+  G4WarnPLStatus obs;
+  obs.Unsupported("QGSP", "QGSP_BERT");
+  
   // EM Physics
   this->RegisterPhysics( new G4EmStandardPhysics(ver));
Index: trunk/source/physics_lists/lists/include/QGSP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_DIF.hh,v 1.1 2007/12/10 17:34:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_DIF.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_DIF.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_EMV.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_EMV.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_EMV.icc,v 1.3 2009/10/04 16:06:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_EMX.hh,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_EMX.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_EMX.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_BERT_EMX.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -33,4 +33,7 @@
 // Author: 11 May 2009  V.Ivanchenko
 //   created from QGSP_BERT
+//
+// Modified:
+// 27.11.2009 G.Folger: Mark as experimental
 //
 //----------------------------------------------------------------------------
@@ -61,4 +64,6 @@
 #include "HadronPhysicsQGSP_BERT.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSP_BERT_EMX<T>::TQGSP_BERT_EMX(G4int ver):  T()
 {
@@ -70,4 +75,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus exp;
+  exp.Experimental("QGSP_BERT_EMX");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_HP.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_HP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_HP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_HP.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_HP.icc,v 1.4 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_NOLEP.hh,v 1.1 2008/10/17 12:43:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_NOLEP.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_NOLEP.icc,v 1.1 2008/10/17 12:43:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_BERT_NOLEP.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -36,4 +36,5 @@
 // Modified:
 // 15.10.2005 G.Folger: first version
+// 27.11.2009 G.Folger, Use QElastic directly
 //
 //----------------------------------------------------------------------------
@@ -68,5 +69,5 @@
 
   G4DataQuestionaire it(photon);
-  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_NOLEP 1.0"<<G4endl;
+  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_NOLEP 1.1"<<G4endl;
   G4cout <<G4endl;
 
@@ -87,5 +88,5 @@
 
    // Hadron Elastic scattering
-  this-> RegisterPhysics( new G4HadronElasticPhysics("elastic",ver,false));
+  this-> RegisterPhysics( new G4HadronQElasticPhysics("elastic",ver));
 
   // Hadron Physics
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_NQE.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BERT_TRV.hh,v 1.1 2007/05/07 14:34:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BERT_TRV.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_BERT_TRV.icc,v 1.2 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_BERT_TRV.icc,v 1.3 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -36,4 +36,5 @@
 // Modified:
 // 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: Mark as experimental
 //
 //----------------------------------------------------------------------------
@@ -64,13 +65,18 @@
 #include "HadronPhysicsQGSP_BERT_TRV.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSP_BERT_TRV<T>::TQGSP_BERT_TRV(G4int ver):  T()
 {
 
   G4DataQuestionaire it(photon);
-  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_TRV 1.0"<<G4endl;
+  G4cout << "<<< Geant4 Physics List simulation engine: QGSP_BERT_TRV 1.1"<<G4endl;
   G4cout <<G4endl;
 
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus exp;
+  exp.Experimental("QGSP_BERT_TRV");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BIC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC.icc,v 1.5 2007/05/16 11:35:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC_EMY.hh,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC_EMY.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC_EMY.icc,v 1.1 2009/05/11 11:11:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BIC_HP.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC_HP.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC_HP.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC_HP.hh,v 1.1 2006/11/24 16:31:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_BIC_HP.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_BIC_HP.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_BIC_HP.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_BIC_HP.icc,v 1.5 2007/05/24 11:32:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_DIF.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_DIF.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_DIF.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: QGSP_DIF.hh,v 1.1 2007/11/13 10:20:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_DIF.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_DIF.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_DIF.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_DIF.icc,v 1.2 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_EMV.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMV.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMV.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_EMV.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_EMV.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMV.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMV.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_EMV.icc,v 1.6 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_EMV.icc,v 1.7 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -86,5 +86,5 @@
 
   G4WarnPLStatus obs;
-  obs.Unsupported("QGSP_EMV");
+  obs.Unsupported("QGSP_EMV", "QGSP_BERT_EMV");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_EMV_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMV_NQE.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_EMV_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_EMX.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMX.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMX.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_EMX.hh,v 1.1 2006/10/31 11:35:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_EMX.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_EMX.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_EMX.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_EMX.icc,v 1.7 2009/06/02 16:51:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_EMX.icc,v 1.8 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -80,5 +80,5 @@
 
   G4WarnPLStatus obs;
-  obs.Unsupported("QGSP_EMX","QGSP_BERT_EMX");
+  obs.Replaced("QGSP_EMX","QGSP_BERT_EMX");
   G4Exception(" Crash for usage of replaced physics list");
 
Index: trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_FTFP_BERT.hh,v 1.1 2009/04/23 19:04:18 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_FTFP_BERT.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_FTFP_BERT.icc,v 1.1 2009/04/23 19:04:18 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_FTFP_BERT.icc,v 1.2 2009/11/27 17:28:19 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -34,4 +34,5 @@
 //
 // Modified:
+// 27.11.2009 G.Folger: Mark as experimental
 //
 //----------------------------------------------------------------------------
@@ -62,4 +63,6 @@
 #include "HadronPhysicsQGSP_FTFP_BERT.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSP_FTFP_BERT<T>::TQGSP_FTFP_BERT(G4int ver):  T()
 {
@@ -71,4 +74,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus exp;
+  exp.Experimental("QGSP_FTFP_BERT");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_INCL_ABLA.hh,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_INCL_ABLA.icc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QGSP_INCL_ABLA.icc,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QGSP_INCL_ABLA.icc,v 1.3 2009/12/03 14:31:35 kaitanie Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -31,15 +31,9 @@
 // ClassName:   QGSP_INCL_ABLA
 //
-// Author: 2002 J.P. Wellisch
+// Author: 2009 Pekka Kaitaniemi
+//   Created as a copy of QGSP_BERT.icc
 //
 // Modified:
-// 25.11.2005 G.Folger: migration to non static particles
-// 30.11.2005 G.Folger: Register EmStandard first, split Em Standard and Extra
-// 02.12.2005 V.Ivanchenko: rename components
-// 08.06.2006 V.Ivanchenko: migration to CHIPS stopping
-// 15.06.2006 G.Folger: Migrate to HadronElasticPhysics using improved elastic
-// 20.11.2006 G.Folger: add Tracking Cut for neutrons
-// 26.04.2007 G.Folger: Enable quasielastic for QGS string model
-// 16.05.2007 V.Ivanchenko: rename EM builders
+// 27.11.2009 G.Folger: Mark as experimental
 //
 //----------------------------------------------------------------------------
@@ -70,4 +64,6 @@
 #include "HadronPhysicsQGSP_INCL_ABLA.hh"
 
+#include "G4WarnPLStatus.hh"
+
 template<class T> TQGSP_INCL_ABLA<T>::TQGSP_INCL_ABLA(G4int ver):  T()
 {
@@ -79,4 +75,7 @@
   this->defaultCutValue = 0.7*mm;  
   this->SetVerboseLevel(ver);
+
+  G4WarnPLStatus exp;
+  exp.Experimental("QGSP_INCL_ABLA");
 
   // EM Physics
Index: trunk/source/physics_lists/lists/include/QGSP_NQE.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_NQE.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_NQE.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: QGSP_NQE.hh,v 1.1 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_NQE.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_NQE.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_NQE.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_NQE.icc,v 1.3 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_QEL.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_QEL.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_QEL.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: QGSP_QEL.hh,v 1.1 2006/11/28 15:41:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGSP_QEL.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGSP_QEL.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGSP_QEL.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGSP_QEL.icc,v 1.4 2009/05/18 08:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGS_BIC.hh
===================================================================
--- trunk/source/physics_lists/lists/include/QGS_BIC.hh	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGS_BIC.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGS_BIC.hh,v 1.1 2007/11/13 10:23:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/include/QGS_BIC.icc
===================================================================
--- trunk/source/physics_lists/lists/include/QGS_BIC.icc	(revision 1227)
+++ trunk/source/physics_lists/lists/include/QGS_BIC.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: QGS_BIC.icc,v 1.2 2007/12/10 17:33:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/CVS/Entries
===================================================================
--- trunk/source/physics_lists/lists/src/CVS/Entries	(revision 1227)
+++ trunk/source/physics_lists/lists/src/CVS/Entries	(revision 1228)
@@ -1,35 +1,35 @@
-/G4HadronInelasticQBBC.cc/1.24/Wed Nov 25 18:55:56 2009//Tgeant4-09-03-cand-03
-/G4HadronInelasticQLHEP.cc/1.2/Mon May 19 10:21:34 2008//Tgeant4-09-03-cand-03
-/G4PhysListFactory.cc/1.12/Wed Nov 25 18:55:56 2009//Tgeant4-09-03-cand-03
-/G4VHadronPhysics.cc/1.3/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsCHIPS.cc/1.2/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFC.cc/1.2/Fri Jun  1 15:20:06 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP.cc/1.2/Fri Jun  1 15:20:06 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP_BERT.cc/1.1/Fri Oct 19 15:35:08 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsFTFP_BERT_TRV.cc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsFTF_BIC.cc/1.2/Fri Apr 25 14:53:34 2008//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP.cc/1.1/Tue Oct 31 11:35:10 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_BERT.cc/1.1/Tue Oct 31 11:35:10 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_BERT_HP.cc/1.1/Tue Oct 31 11:35:10 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_EMV.cc/1.1/Tue Oct 31 11:35:10 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsLHEP_PRECO_HP.cc/1.1/Tue Oct 31 11:35:11 2006//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC.cc/1.3/Thu Mar 12 12:19:44 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_BERT.cc/1.1/Thu Nov 15 16:58:16 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_CHIPS.cc/1.6/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_EFLOW.cc/1.2/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSC_QGSC.cc/1.4/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP.cc/1.4/Tue Nov 13 10:16:11 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT.cc/1.3/Mon Dec 10 17:34:44 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_HP.cc/1.2/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_NOLEP.cc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BERT_TRV.cc/1.1/Mon May  7 14:34:29 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BIC.cc/1.2/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_BIC_HP.cc/1.3/Thu Apr 26 14:47:11 2007//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_FTFP_BERT.cc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGSP_INCL_ABLA.cc/1.1/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/HadronPhysicsQGS_BIC.cc/1.1/Tue Nov 13 10:23:24 2007//Tgeant4-09-03-cand-03
-/MaxTimeCuts.cc/1.1/Tue Oct 31 11:35:11 2006//Tgeant4-09-03-cand-03
-/MinEkineCuts.cc/1.2/Wed Dec 20 13:49:49 2006//Tgeant4-09-03-cand-03
-/QBBC.cc/1.3/Fri Nov 27 15:32:12 2009//Tgeant4-09-03-cand-03
-/SpecialCuts.cc/1.1/Tue Oct 31 11:35:11 2006//Tgeant4-09-03-cand-03
+/G4HadronInelasticQBBC.cc/1.24/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4HadronInelasticQLHEP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4PhysListFactory.cc/1.12/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/G4VHadronPhysics.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsCHIPS.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTFP_BERT_TRV.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsFTF_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_BERT_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_EMV.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsLHEP_PRECO_HP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_CHIPS.cc/1.6/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_EFLOW.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSC_QGSC.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_HP.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_NOLEP.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BERT_TRV.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BIC.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_BIC_HP.cc/1.3/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_FTFP_BERT.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGSP_INCL_ABLA.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/HadronPhysicsQGS_BIC.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/MaxTimeCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/MinEkineCuts.cc/1.2/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/QBBC.cc/1.4/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
+/SpecialCuts.cc/1.1/Thu Jan  7 15:50:30 2010//Tgeant4-09-03
 D
Index: trunk/source/physics_lists/lists/src/CVS/Tag
===================================================================
--- trunk/source/physics_lists/lists/src/CVS/Tag	(revision 1227)
+++ trunk/source/physics_lists/lists/src/CVS/Tag	(revision 1228)
@@ -1,1 +1,1 @@
-Ngeant4-09-03-cand-03
+Ngeant4-09-03
Index: trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/G4HadronInelasticQBBC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronInelasticQBBC.cc,v 1.24 2009/11/25 18:55:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/G4HadronInelasticQLHEP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronInelasticQLHEP.cc,v 1.2 2008/05/19 10:21:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/G4PhysListFactory.cc
===================================================================
--- trunk/source/physics_lists/lists/src/G4PhysListFactory.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/G4PhysListFactory.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PhysListFactory.cc,v 1.12 2009/11/25 18:55:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/G4VHadronPhysics.cc
===================================================================
--- trunk/source/physics_lists/lists/src/G4VHadronPhysics.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/G4VHadronPhysics.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VHadronPhysics.cc,v 1.3 2009/11/25 19:33:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsCHIPS.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsCHIPS.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsCHIPS.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsCHIPS.cc,v 1.2 2009/11/20 10:24:28 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsFTFC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsFTFC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsFTFC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFC.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsFTFP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsFTFP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsFTFP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP.cc,v 1.2 2007/06/01 15:20:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP_BERT.cc,v 1.1 2007/10/19 15:35:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT_TRV.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT_TRV.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsFTFP_BERT_TRV.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTFP_BERT_TRV.cc,v 1.1 2009/06/02 16:51:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsFTF_BIC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsFTF_BIC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsFTF_BIC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsFTF_BIC.cc,v 1.2 2008/04/25 14:53:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsLHEP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsLHEP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsLHEP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_BERT.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_BERT_HP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_BERT_HP.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_EMV.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_EMV.cc,v 1.1 2006/10/31 11:35:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsLHEP_PRECO_HP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsLHEP_PRECO_HP.cc,v 1.1 2006/10/31 11:35:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC.cc,v 1.3 2009/03/12 12:19:44 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_BERT.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_BERT.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_BERT.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_BERT.cc,v 1.1 2007/11/15 16:58:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_CHIPS.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_CHIPS.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_CHIPS.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_CHIPS.cc,v 1.6 2009/04/17 15:29:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_EFLOW.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_EFLOW.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_QGSC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_QGSC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSC_QGSC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSC_QGSC.cc,v 1.4 2009/04/14 07:23:08 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: HadronPhysicsQGSP.cc,v 1.4 2007/11/13 10:16:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT.cc,v 1.3 2007/12/10 17:34:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_HP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT_HP.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_NOLEP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_NOLEP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_NOLEP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BERT_NOLEP.cc,v 1.1 2008/10/17 12:43:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_TRV.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_TRV.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BERT_TRV.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.1 2007/05/07 14:34:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: HadronPhysicsQGSP_BERT_TRV.cc,v 1.2 2009/11/27 17:27:38 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -35,4 +35,5 @@
 //
 // Modified:
+//    27 Nov 2009 G.Folger : change transition energies to reduce use of LEP
 //
 //----------------------------------------------------------------------------
@@ -58,29 +59,32 @@
   theNeutrons=new G4NeutronBuilder;
   theNeutrons->RegisterMe(theQGSPNeutron=new G4QGSPNeutronBuilder(QuasiElastic));
+  theQGSPNeutron->SetMinEnergy(10.0*GeV);
   theNeutrons->RegisterMe(theLEPNeutron=new G4LEPNeutronBuilder);
-  theLEPNeutron->SetMinInelasticEnergy(5.0*GeV);
-  theLEPNeutron->SetMaxInelasticEnergy(25*GeV);  
+  theLEPNeutron->SetMinInelasticEnergy(9.5*GeV);
+  theLEPNeutron->SetMaxInelasticEnergy(15*GeV);  
 
   theNeutrons->RegisterMe(theBertiniNeutron=new G4BertiniNeutronBuilder);
   theBertiniNeutron->SetMinEnergy(0.0*GeV);
-  theBertiniNeutron->SetMaxEnergy(5.4*GeV);
+  theBertiniNeutron->SetMaxEnergy(9.9*GeV);
 
   thePro=new G4ProtonBuilder;
   thePro->RegisterMe(theQGSPPro=new G4QGSPProtonBuilder(QuasiElastic));
+  theQGSPPro->SetMinEnergy(10.0*GeV);
   thePro->RegisterMe(theLEPPro=new G4LEPProtonBuilder);
-  theLEPPro->SetMinEnergy(5.0*GeV);
-  theLEPPro->SetMaxEnergy(25*GeV);
+  theLEPPro->SetMinEnergy(9.5*GeV);
+  theLEPPro->SetMaxEnergy(15*GeV);
 
   thePro->RegisterMe(theBertiniPro=new G4BertiniProtonBuilder);
-  theBertiniPro->SetMaxEnergy(5.4*GeV);
+  theBertiniPro->SetMaxEnergy(9.9*GeV);
   
   thePiK=new G4PiKBuilder;
   thePiK->RegisterMe(theQGSPPiK=new G4QGSPPiKBuilder(QuasiElastic));
+  theQGSPPiK->SetMinEnergy(10.0*GeV);
   thePiK->RegisterMe(theLEPPiK=new G4LEPPiKBuilder);
-  theLEPPiK->SetMaxEnergy(25*GeV);
-  theLEPPiK->SetMinEnergy(5.0*GeV);
+  theLEPPiK->SetMinEnergy(9.5*GeV);
+  theLEPPiK->SetMaxEnergy(15*GeV);
 
   thePiK->RegisterMe(theBertiniPiK=new G4BertiniPiKBuilder);
-  theBertiniPiK->SetMaxEnergy(5.4*GeV);
+  theBertiniPiK->SetMaxEnergy(9.9*GeV);
   
   theMiscLHEP=new G4MiscLHEPBuilder;
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BIC.cc,v 1.2 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_BIC_HP.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_BIC_HP.cc,v 1.3 2007/04/26 14:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_FTFP_BERT.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_FTFP_BERT.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_FTFP_BERT.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_FTFP_BERT.cc,v 1.1 2009/04/23 19:04:18 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_INCL_ABLA.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_INCL_ABLA.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGSP_INCL_ABLA.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGSP_INCL_ABLA.cc,v 1.1 2009/07/19 18:24:03 kaitanie Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/HadronPhysicsQGS_BIC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/HadronPhysicsQGS_BIC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/HadronPhysicsQGS_BIC.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: HadronPhysicsQGS_BIC.cc,v 1.1 2007/11/13 10:23:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/physics_lists/lists/src/MinEkineCuts.cc
===================================================================
--- trunk/source/physics_lists/lists/src/MinEkineCuts.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/MinEkineCuts.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/physics_lists/lists/src/QBBC.cc
===================================================================
--- trunk/source/physics_lists/lists/src/QBBC.cc	(revision 1227)
+++ trunk/source/physics_lists/lists/src/QBBC.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: QBBC.cc,v 1.3 2009/11/25 13:10:51 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-03 $
+// $Id: QBBC.cc,v 1.4 2009/11/28 17:35:01 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
@@ -78,5 +78,5 @@
 
    // Hadron Physics
-  RegisterPhysics( new G4HadronHElasticPhysics(ver,false));
+  RegisterPhysics( new G4HadronHElasticPhysics(ver,false,type));
   RegisterPhysics( new G4QStoppingPhysics("stopping",ver));
   RegisterPhysics( new G4IonBinaryCascadePhysics("ionBIC"));
Index: trunk/source/processes/biasing/include/G4GeometrySampler.hh
===================================================================
--- trunk/source/processes/biasing/include/G4GeometrySampler.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4GeometrySampler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometrySampler.hh,v 1.11 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4ImportanceConfigurator.hh
===================================================================
--- trunk/source/processes/biasing/include/G4ImportanceConfigurator.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4ImportanceConfigurator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceConfigurator.hh,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4ImportanceProcess.hh
===================================================================
--- trunk/source/processes/biasing/include/G4ImportanceProcess.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4ImportanceProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceProcess.hh,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4PlaceOfAction.hh
===================================================================
--- trunk/source/processes/biasing/include/G4PlaceOfAction.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4PlaceOfAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PlaceOfAction.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4ProcessPlacer.hh
===================================================================
--- trunk/source/processes/biasing/include/G4ProcessPlacer.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4ProcessPlacer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessPlacer.hh,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4SamplingPostStepAction.hh
===================================================================
--- trunk/source/processes/biasing/include/G4SamplingPostStepAction.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4SamplingPostStepAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SamplingPostStepAction.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4TrackTerminator.hh
===================================================================
--- trunk/source/processes/biasing/include/G4TrackTerminator.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4TrackTerminator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackTerminator.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4VProcessPlacer.hh
===================================================================
--- trunk/source/processes/biasing/include/G4VProcessPlacer.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4VProcessPlacer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VProcessPlacer.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4VSampler.hh
===================================================================
--- trunk/source/processes/biasing/include/G4VSampler.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4VSampler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSampler.hh,v 1.9 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4VSamplerConfigurator.hh
===================================================================
--- trunk/source/processes/biasing/include/G4VSamplerConfigurator.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4VSamplerConfigurator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSamplerConfigurator.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4WeightCutOffConfigurator.hh
===================================================================
--- trunk/source/processes/biasing/include/G4WeightCutOffConfigurator.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4WeightCutOffConfigurator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightCutOffConfigurator.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4WeightCutOffProcess.hh
===================================================================
--- trunk/source/processes/biasing/include/G4WeightCutOffProcess.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4WeightCutOffProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightCutOffProcess.hh,v 1.3 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4WeightWindowConfigurator.hh
===================================================================
--- trunk/source/processes/biasing/include/G4WeightWindowConfigurator.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4WeightWindowConfigurator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowConfigurator.hh,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/include/G4WeightWindowProcess.hh
===================================================================
--- trunk/source/processes/biasing/include/G4WeightWindowProcess.hh	(revision 1227)
+++ trunk/source/processes/biasing/include/G4WeightWindowProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowProcess.hh,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4GeometrySampler.cc
===================================================================
--- trunk/source/processes/biasing/src/G4GeometrySampler.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4GeometrySampler.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GeometrySampler.cc,v 1.10 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4ImportanceConfigurator.cc
===================================================================
--- trunk/source/processes/biasing/src/G4ImportanceConfigurator.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4ImportanceConfigurator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceConfigurator.cc,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4ImportanceProcess.cc
===================================================================
--- trunk/source/processes/biasing/src/G4ImportanceProcess.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4ImportanceProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ImportanceProcess.cc,v 1.4 2008/04/21 09:10:28 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4ProcessPlacer.cc
===================================================================
--- trunk/source/processes/biasing/src/G4ProcessPlacer.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4ProcessPlacer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessPlacer.cc,v 1.5 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4SamplingPostStepAction.cc
===================================================================
--- trunk/source/processes/biasing/src/G4SamplingPostStepAction.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4SamplingPostStepAction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SamplingPostStepAction.cc,v 1.3 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4VProcessPlacer.cc
===================================================================
--- trunk/source/processes/biasing/src/G4VProcessPlacer.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4VProcessPlacer.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VProcessPlacer.cc,v 1.2 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4VSampler.cc
===================================================================
--- trunk/source/processes/biasing/src/G4VSampler.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4VSampler.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSampler.cc,v 1.3 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4VSamplerConfigurator.cc
===================================================================
--- trunk/source/processes/biasing/src/G4VSamplerConfigurator.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4VSamplerConfigurator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSamplerConfigurator.cc,v 1.3 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4WeightCutOffConfigurator.cc
===================================================================
--- trunk/source/processes/biasing/src/G4WeightCutOffConfigurator.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4WeightCutOffConfigurator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightCutOffConfigurator.cc,v 1.3 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4WeightCutOffProcess.cc
===================================================================
--- trunk/source/processes/biasing/src/G4WeightCutOffProcess.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4WeightCutOffProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightCutOffProcess.cc,v 1.3 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4WeightWindowConfigurator.cc
===================================================================
--- trunk/source/processes/biasing/src/G4WeightWindowConfigurator.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4WeightWindowConfigurator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowConfigurator.cc,v 1.4 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/biasing/src/G4WeightWindowProcess.cc
===================================================================
--- trunk/source/processes/biasing/src/G4WeightWindowProcess.cc	(revision 1227)
+++ trunk/source/processes/biasing/src/G4WeightWindowProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WeightWindowProcess.cc,v 1.4 2008/04/21 09:10:29 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/cuts/include/G4MCCIndexConversionTable.hh
===================================================================
--- trunk/source/processes/cuts/include/G4MCCIndexConversionTable.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4MCCIndexConversionTable.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MCCIndexConversionTable.hh,v 1.3 2006/06/29 19:29:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4MaterialCutsCouple.hh
===================================================================
--- trunk/source/processes/cuts/include/G4MaterialCutsCouple.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4MaterialCutsCouple.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MaterialCutsCouple.hh,v 1.3 2006/06/29 19:29:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4PhysicsTableHelper.hh
===================================================================
--- trunk/source/processes/cuts/include/G4PhysicsTableHelper.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4PhysicsTableHelper.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhysicsTableHelper.hh,v 1.3 2006/06/29 19:29:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4ProductionCuts.hh
===================================================================
--- trunk/source/processes/cuts/include/G4ProductionCuts.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4ProductionCuts.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCuts.hh,v 1.5 2009/08/01 07:57:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4ProductionCutsTable.hh
===================================================================
--- trunk/source/processes/cuts/include/G4ProductionCutsTable.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4ProductionCutsTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCutsTable.hh,v 1.12 2009/11/11 03:20:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4ProductionCutsTableMessenger.hh
===================================================================
--- trunk/source/processes/cuts/include/G4ProductionCutsTableMessenger.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4ProductionCutsTableMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCutsTableMessenger.hh,v 1.2 2009/11/11 03:20:22 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/include/G4RToEConvForElectron.hh
===================================================================
--- trunk/source/processes/cuts/include/G4RToEConvForElectron.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4RToEConvForElectron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForElectron.hh,v 1.3 2009/09/11 15:21:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/include/G4RToEConvForGamma.hh
===================================================================
--- trunk/source/processes/cuts/include/G4RToEConvForGamma.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4RToEConvForGamma.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForGamma.hh,v 1.3 2009/09/11 15:21:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/include/G4RToEConvForPositron.hh
===================================================================
--- trunk/source/processes/cuts/include/G4RToEConvForPositron.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4RToEConvForPositron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForPositron.hh,v 1.3 2009/09/11 15:21:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/include/G4RToEConvForProton.hh
===================================================================
--- trunk/source/processes/cuts/include/G4RToEConvForProton.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4RToEConvForProton.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForProton.hh,v 1.5 2009/09/14 07:27:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/include/G4VRangeToEnergyConverter.hh
===================================================================
--- trunk/source/processes/cuts/include/G4VRangeToEnergyConverter.hh	(revision 1227)
+++ trunk/source/processes/cuts/include/G4VRangeToEnergyConverter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRangeToEnergyConverter.hh,v 1.8 2009/09/14 07:27:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4MCCIndexConversionTable.cc
===================================================================
--- trunk/source/processes/cuts/src/G4MCCIndexConversionTable.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4MCCIndexConversionTable.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MCCIndexConversionTable.cc,v 1.3 2006/06/29 19:30:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/src/G4MaterialCutsCouple.cc
===================================================================
--- trunk/source/processes/cuts/src/G4MaterialCutsCouple.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4MaterialCutsCouple.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MaterialCutsCouple.cc,v 1.3 2006/06/29 19:30:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4PhysicsTableHelper.cc
===================================================================
--- trunk/source/processes/cuts/src/G4PhysicsTableHelper.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4PhysicsTableHelper.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PhysicsTableHelper.cc,v 1.6 2009/08/01 07:57:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/src/G4ProductionCuts.cc
===================================================================
--- trunk/source/processes/cuts/src/G4ProductionCuts.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4ProductionCuts.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCuts.cc,v 1.6 2009/08/01 07:57:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4ProductionCutsTable.cc
===================================================================
--- trunk/source/processes/cuts/src/G4ProductionCutsTable.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4ProductionCutsTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCutsTable.cc,v 1.25 2009/11/11 03:20:22 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4ProductionCutsTableMessenger.cc
===================================================================
--- trunk/source/processes/cuts/src/G4ProductionCutsTableMessenger.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4ProductionCutsTableMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProductionCutsTableMessenger.cc,v 1.3 2009/11/12 00:20:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/cuts/src/G4RToEConvForElectron.cc
===================================================================
--- trunk/source/processes/cuts/src/G4RToEConvForElectron.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4RToEConvForElectron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForElectron.cc,v 1.7 2009/09/11 15:21:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4RToEConvForGamma.cc
===================================================================
--- trunk/source/processes/cuts/src/G4RToEConvForGamma.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4RToEConvForGamma.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForGamma.cc,v 1.6 2009/09/12 12:09:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4RToEConvForPositron.cc
===================================================================
--- trunk/source/processes/cuts/src/G4RToEConvForPositron.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4RToEConvForPositron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForPositron.cc,v 1.7 2009/09/11 15:21:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4RToEConvForProton.cc
===================================================================
--- trunk/source/processes/cuts/src/G4RToEConvForProton.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4RToEConvForProton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RToEConvForProton.cc,v 1.6 2009/09/14 07:27:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/cuts/src/G4VRangeToEnergyConverter.cc
===================================================================
--- trunk/source/processes/cuts/src/G4VRangeToEnergyConverter.cc	(revision 1227)
+++ trunk/source/processes/cuts/src/G4VRangeToEnergyConverter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRangeToEnergyConverter.cc,v 1.15 2009/09/14 07:27:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/decay/include/G4Decay.hh
===================================================================
--- trunk/source/processes/decay/include/G4Decay.hh	(revision 1227)
+++ trunk/source/processes/decay/include/G4Decay.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Decay.hh,v 1.20 2008/09/19 03:19:53 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/decay/include/G4DecayProcessType.hh
===================================================================
--- trunk/source/processes/decay/include/G4DecayProcessType.hh	(revision 1227)
+++ trunk/source/processes/decay/include/G4DecayProcessType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DecayProcessType.hh,v 1.2 2008/09/19 03:19:53 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/decay/include/G4UnknownDecay.hh
===================================================================
--- trunk/source/processes/decay/include/G4UnknownDecay.hh	(revision 1227)
+++ trunk/source/processes/decay/include/G4UnknownDecay.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnknownDecay.hh,v 1.3 2006/06/29 19:30:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/decay/include/G4VExtDecayer.hh
===================================================================
--- trunk/source/processes/decay/include/G4VExtDecayer.hh	(revision 1227)
+++ trunk/source/processes/decay/include/G4VExtDecayer.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VExtDecayer.hh,v 1.4 2006/06/29 19:31:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/decay/src/G4Decay.cc
===================================================================
--- trunk/source/processes/decay/src/G4Decay.cc	(revision 1227)
+++ trunk/source/processes/decay/src/G4Decay.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Decay.cc,v 1.30 2008/09/19 03:19:53 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/decay/src/G4UnknownDecay.cc
===================================================================
--- trunk/source/processes/decay/src/G4UnknownDecay.cc	(revision 1227)
+++ trunk/source/processes/decay/src/G4UnknownDecay.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnknownDecay.cc,v 1.6 2007/12/15 12:29:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/adjoint/History
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/History	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
+$Id: History,v 1.5 2009/11/23 09:02:35 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -18,7 +18,9 @@
      ----------------------------------------------------------
 
+23 Nov 2009: G.Cosmo (emadjoint-V09-02-02)
+- Corrected compilation error on Windows for G4AdjointAlongStepWeightCorrection.
+
 20 Nov 2009: L.Desorgher (emadjoint-V09-02-01)
--Replace C++ type by G4 type where needed and adding of G4disclaimer 
-
+- Replace C++ type by G4 type where needed and adding of G4 disclaimer.
 
 10 Nov 2009: L.Desorgher (emadjoint-V09-02-00)
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointAlongStepWeightCorrection.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointAlongStepWeightCorrection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointAlongStepWeightCorrection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointAlongStepWeightCorrection.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointBremsstrahlungModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSManager.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCSManager.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSMatrix.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSMatrix.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSMatrix.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCSMatrix.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointComptonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointComptonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointComptonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointComptonModel.hh,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointInterpolator.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointInterpolator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointInterpolator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointInterpolator.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointIonIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointIonIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointIonIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointIonIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointPhotoElectricModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointPhotoElectricModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointPhotoElectricModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointPhotoElectricModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointProcessEquivalentToDirectProcess.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointProcessEquivalentToDirectProcess.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointProcessEquivalentToDirectProcess.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointProcessEquivalentToDirectProcess.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointeIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointeIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointeIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointeIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointhIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhMultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhMultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhMultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointhMultipleScattering.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4ContinuousGainOfEnergy.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4ContinuousGainOfEnergy.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4ContinuousGainOfEnergy.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ContinuousGainOfEnergy.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4InversePEEffect.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4InversePEEffect.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4InversePEEffect.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4InversePEEffect.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4IonInverseIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4IonInverseIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4IonInverseIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonInverseIonisation.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4VAdjointReverseReaction.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4VAdjointReverseReaction.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4VAdjointReverseReaction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VAdjointReverseReaction.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4VEmAdjointModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4VEmAdjointModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4VEmAdjointModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmAdjointModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4eInverseBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4eInverseBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4eInverseBremsstrahlung.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseBremsstrahlung.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4eInverseCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4eInverseCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4eInverseCompton.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseCompton.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4eInverseIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4eInverseIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4eInverseIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseIonisation.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/include/G4hInverseIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/include/G4hInverseIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/include/G4hInverseIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hInverseIonisation.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointAlongStepWeightCorrection.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointAlongStepWeightCorrection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointAlongStepWeightCorrection.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4AdjointAlongStepWeightCorrection.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4AdjointAlongStepWeightCorrection.cc,v 1.5 2009/11/23 09:02:35 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointAlongStepWeightCorrection.hh"
@@ -32,8 +32,4 @@
 #include "G4VParticleChange.hh"
 #include "G4AdjointCSManager.hh"
-
-#ifdef WIN32
-#include <G4float .h>
-#endif
 
 ///////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointBremsstrahlungModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4AdjointBremsstrahlungModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4AdjointBremsstrahlungModel.cc,v 1.5 2009/12/16 17:50:01 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointBremsstrahlungModel.hh"
@@ -122,6 +122,6 @@
   const G4double a1 = 0.625 , a2 = 3.*a1 , d = 27. ;
 
-  if (9./(9.+d) > G4UniformRand()) u = - log(G4UniformRand()*G4UniformRand())/a1;
-     else                          u = - log(G4UniformRand()*G4UniformRand())/a2;
+  if (9./(9.+d) > G4UniformRand()) u = - std::log(G4UniformRand()*G4UniformRand())/a1;
+     else                          u = - std::log(G4UniformRand()*G4UniformRand())/a2;
 
   G4double theta = u*electron_mass_c2/projectileTotalEnergy;
@@ -183,5 +183,5 @@
         G4double Emin=  GetSecondAdjEnergyMinForProdToProjCase(adjointPrimKinEnergy);;
 	if (Emin>=Emax) return;
-	projectileKinEnergy=Emin*pow(Emax/Emin,G4UniformRand());
+	projectileKinEnergy=Emin*std::pow(Emax/Emin,G4UniformRand());
 	diffCSUsed=lastCZ/projectileKinEnergy;
  	
@@ -193,5 +193,5 @@
 	G4double f2=(Emax-adjointPrimKinEnergy)/Emax/f1;
 	//G4cout<<"f1 and f2 "<<f1<<'\t'<<f2<<G4endl;
-	projectileKinEnergy=adjointPrimKinEnergy/(1.-f1*pow(f2,G4UniformRand()));
+	projectileKinEnergy=adjointPrimKinEnergy/(1.-f1*std::pow(f2,G4UniformRand()));
 	gammaEnergy=projectileKinEnergy-adjointPrimKinEnergy;
 	diffCSUsed=lastCZ*adjointPrimKinEnergy/projectileKinEnergy/gammaEnergy;
@@ -232,6 +232,6 @@
   const G4double a1 = 0.625 , a2 = 3.*a1 , d = 27. ;
 
-  if (9./(9.+d) > G4UniformRand()) u = - log(G4UniformRand()*G4UniformRand())/a1;
-     else                          u = - log(G4UniformRand()*G4UniformRand())/a2;
+  if (9./(9.+d) > G4UniformRand()) u = - std::log(G4UniformRand()*G4UniformRand())/a1;
+     else                          u = - std::log(G4UniformRand()*G4UniformRand())/a2;
 
   G4double theta = u*electron_mass_c2/projectileTotalEnergy;
@@ -373,15 +373,15 @@
   DefineCurrentMaterial(aCouple);
   G4double Cross=0.;
-  lastCZ=theDirectEMModel->CrossSectionPerVolume(aCouple->GetMaterial(),theDirectPrimaryPartDef,100.*MeV,100.*MeV/exp(1.));//this give the constant above
+  lastCZ=theDirectEMModel->CrossSectionPerVolume(aCouple->GetMaterial(),theDirectPrimaryPartDef,100.*MeV,100.*MeV/std::exp(1.));//this give the constant above
   
   if (!IsScatProjToProjCase ){
   	G4double Emax_proj = GetSecondAdjEnergyMaxForProdToProjCase(primEnergy);
   	G4double Emin_proj = GetSecondAdjEnergyMinForProdToProjCase(primEnergy);
-	if (Emax_proj>Emin_proj && primEnergy > currentTcutForDirectSecond) Cross= lastCZ*log(Emax_proj/Emin_proj);
+	if (Emax_proj>Emin_proj && primEnergy > currentTcutForDirectSecond) Cross= lastCZ*std::log(Emax_proj/Emin_proj);
   }
   else {
   	G4double Emax_proj = GetSecondAdjEnergyMaxForScatProjToProjCase(primEnergy);
 	G4double Emin_proj = GetSecondAdjEnergyMinForScatProjToProjCase(primEnergy,currentTcutForDirectSecond);
-	if (Emax_proj>Emin_proj) Cross= lastCZ*log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy));
+	if (Emax_proj>Emin_proj) Cross= lastCZ*std::log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy));
   	
   }
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCSManager.cc,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointCSManager.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSMatrix.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSMatrix.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSMatrix.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCSMatrix.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointComptonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointComptonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointComptonModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4AdjointComptonModel.cc,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4AdjointComptonModel.cc,v 1.6 2009/12/16 17:50:03 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointComptonModel.hh"
@@ -181,7 +181,7 @@
 	G4double f1=(Emin-adjointPrimKinEnergy)/Emin;
 	G4double f2=(Emax-adjointPrimKinEnergy)/Emax/f1;
-	gammaE1=adjointPrimKinEnergy/(1.-f1*pow(f2,G4UniformRand()));;
+	gammaE1=adjointPrimKinEnergy/(1.-f1*std::pow(f2,G4UniformRand()));;
 	gammaE2=gammaE1-adjointPrimKinEnergy;
-	diffCSUsed= diffCSUsed*(1.+2.*log(1.+electron_mass_c2/adjointPrimKinEnergy))*adjointPrimKinEnergy/gammaE1/gammaE2;
+	diffCSUsed= diffCSUsed*(1.+2.*std::log(1.+electron_mass_c2/adjointPrimKinEnergy))*adjointPrimKinEnergy/gammaE1/gammaE2;
 	
  	
@@ -191,5 +191,5 @@
 	if (Emin>=Emax) return;
 	gammaE2 =adjointPrimKinEnergy;
-	gammaE1=Emin*pow(Emax/Emin,G4UniformRand());
+	gammaE1=Emin*std::pow(Emax/Emin,G4UniformRand());
 	diffCSUsed= diffCSUsed/gammaE1;
 	
@@ -388,6 +388,6 @@
   	Emin_proj = GetSecondAdjEnergyMinForProdToProjCase(primEnergy);
 	if (Emax_proj>Emin_proj ){
-		 Cross= log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy))
-		 						*(1.+2.*log(1.+electron_mass_c2/primEnergy));
+		 Cross= std::log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy))
+		 						*(1.+2.*std::log(1.+electron_mass_c2/primEnergy));
 	}	 
   }
@@ -396,5 +396,5 @@
 	Emin_proj = GetSecondAdjEnergyMinForScatProjToProjCase(primEnergy,0.);
 	if (Emax_proj>Emin_proj) {
-		Cross = log(Emax_proj/Emin_proj);
+		Cross = std::log(Emax_proj/Emin_proj);
 		//+0.5*primEnergy*primEnergy(1./(Emin_proj*Emin_proj) - 1./(Emax_proj*Emax_proj)); neglected at the moment
 	}
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointInterpolator.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointInterpolator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointInterpolator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointInterpolator.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointCSMatrix.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointIonIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointIonIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointIonIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointIonIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointIonIonisationModel.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointPhotoElectricModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointPhotoElectricModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointPhotoElectricModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4AdjointPhotoElectricModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4AdjointPhotoElectricModel.cc,v 1.5 2009/12/16 17:50:05 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointPhotoElectricModel.hh"
@@ -109,5 +109,5 @@
    G4double gamma   = 1. + electronEnergy/electron_mass_c2;
    if (gamma <= 5.) {
-  	G4double beta  = sqrt(gamma*gamma-1.)/gamma;
+  	G4double beta  = std::sqrt(gamma*gamma-1.)/gamma;
  	G4double b     = 0.5*gamma*(gamma-1.)*(gamma-2);
 
@@ -127,7 +127,7 @@
   
      
-  G4double sin_theta = sqrt(1.-cos_theta*cos_theta);
+  G4double sin_theta = std::sqrt(1.-cos_theta*cos_theta);
   G4double Phi     = twopi * G4UniformRand();
-  G4double dirx = sin_theta*cos(Phi),diry = sin_theta*sin(Phi),dirz = cos_theta;
+  G4double dirx = sin_theta*std::cos(Phi),diry = sin_theta*std::sin(Phi),dirz = cos_theta;
   G4ThreeVector adjoint_gammaDirection(dirx,diry,dirz);
   adjoint_gammaDirection.rotateUz(electronDirection);
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointProcessEquivalentToDirectProcess.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointProcessEquivalentToDirectProcess.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointProcessEquivalentToDirectProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AdjointProcessEquivalentToDirectProcess.cc,v 1.1 2009/11/11 00:31:19 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointeIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointeIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointeIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointeIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointeIonisationModel.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhIonisationModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4AdjointhIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4AdjointhIonisationModel.cc,v 1.3 2009/12/16 17:50:07 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4AdjointhIonisationModel.hh"
@@ -206,5 +206,5 @@
 	G4double f31=diff1/Emin;
 	G4double f32=diff2/Emax/f31;
-	G4double t3=2.*log(f32);
+	G4double t3=2.*std::log(f32);
 	G4double sum_t=t1+t2+t3;
 	newCS=newCS*sum_t/adjointPrimKinEnergy/adjointPrimKinEnergy;
@@ -220,5 +220,5 @@
 	}
 	else {	
-		projectileKinEnergy=adjointPrimKinEnergy/(1.-f31*pow(f32,G4UniformRand()));
+		projectileKinEnergy=adjointPrimKinEnergy/(1.-f31*std::pow(f32,G4UniformRand()));
 		
 	}
@@ -470,5 +470,5 @@
 	G4double diff2=Emax_proj-primEnergy;
 	G4double t1=(1./diff1+1./Emin_proj-1./diff2-1./Emax_proj)/primEnergy;
-	G4double t2=2.*log(diff2*Emin_proj/Emax_proj/diff1)/primEnergy/primEnergy;
+	G4double t2=2.*std::log(diff2*Emin_proj/Emax_proj/diff1)/primEnergy/primEnergy;
 	Cross*=(t1+t2);
 
Index: trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhMultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhMultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhMultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointhMultipleScattering.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/adjoint/src/G4ContinuousGainOfEnergy.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4ContinuousGainOfEnergy.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4ContinuousGainOfEnergy.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ContinuousGainOfEnergy.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4ContinuousGainOfEnergy.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4InversePEEffect.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4InversePEEffect.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4InversePEEffect.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4InversePEEffect.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4InversePEEffect.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4IonInverseIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4IonInverseIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4IonInverseIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonInverseIonisation.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ///////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/src/G4VAdjointReverseReaction.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4VAdjointReverseReaction.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4VAdjointReverseReaction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VAdjointReverseReaction.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4VAdjointReverseReaction.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4VEmAdjointModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4VEmAdjointModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4VEmAdjointModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4VEmAdjointModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4VEmAdjointModel.cc,v 1.5 2009/12/16 17:50:09 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4VEmAdjointModel.hh"
@@ -572,5 +572,5 @@
 	do {
         	q = G4UniformRand();
-        	x = pow(xmin, q);
+        	x = std::pow(xmin, q);
 		E=x*Emax;
 		greject = DiffCrossSectionPerAtomPrimToSecond( E,prim_energy ,1); 
Index: trunk/source/processes/electromagnetic/adjoint/src/G4eInverseBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4eInverseBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4eInverseBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseBremsstrahlung.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4eInverseBremsstrahlung.hh"
Index: trunk/source/processes/electromagnetic/adjoint/src/G4eInverseCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4eInverseCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4eInverseCompton.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseCompton.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ///////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/src/G4eInverseIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4eInverseIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4eInverseIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eInverseIonisation.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ///////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/adjoint/src/G4hInverseIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/adjoint/src/G4hInverseIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/adjoint/src/G4hInverseIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hInverseIonisation.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ///////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4AnnihiToMuPair.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AnnihiToMuPair.hh,v 1.3 2009/11/09 18:24:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //         ------------ G4AnnihiToMuPair physics process ------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4BetheBlochNoDeltaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BetheBlochNoDeltaModel.hh,v 1.8 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4BraggNoDeltaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BraggNoDeltaModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4GammaConversionToMuons.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaConversionToMuons.hh,v 1.2 2006/06/29 19:32:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //         ------------ G4GammaConversionToMuons physics process ------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4Vee2hadrons.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4Vee2hadrons.hh,v 1.4 2008/07/10 18:06:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4ee2KChargedModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4ee2KChargedModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4ee2KChargedModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ee2KChargedModel.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4ee2KNeutralModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4ee2KNeutralModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4ee2KNeutralModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ee2KNeutralModel.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeCrossSections.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeCrossSections.hh,v 1.3 2008/07/10 18:06:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeTo3PiModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeTo3PiModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeTo3PiModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeTo3PiModel.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadrons.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadrons.hh,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadronsModel.hh,v 1.7 2008/07/10 18:06:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeToHadronsMultiModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadronsMultiModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeToPGammaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeToPGammaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeToPGammaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToPGammaModel.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4eeToTwoPiModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToTwoPiModel.hh,v 1.5 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlung.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hBremsstrahlung.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4hBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hBremsstrahlungModel.hh,v 1.2 2008/07/22 16:15:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4hPairProduction.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4hPairProduction.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4hPairProduction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hPairProduction.hh,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4hPairProductionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4hPairProductionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4hPairProductionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hPairProductionModel.hh,v 1.2 2008/07/22 16:15:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4hhIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hhIonisation.hh,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4mplIonisation.hh,v 1.6 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/include/G4mplIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4mplIonisationModel.hh,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4AnnihiToMuPair.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AnnihiToMuPair.cc,v 1.6 2009/11/09 18:24:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //         ------------ G4AnnihiToMuPair physics process ------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4BetheBlochNoDeltaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BetheBlochNoDeltaModel.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4BraggNoDeltaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BraggNoDeltaModel.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4GammaConversionToMuons.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaConversionToMuons.cc,v 1.7 2008/10/16 14:29:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //         ------------ G4GammaConversionToMuons physics process ------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4ee2KChargedModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4ee2KChargedModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4ee2KChargedModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ee2KChargedModel.cc,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4ee2KNeutralModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4ee2KNeutralModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4ee2KNeutralModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ee2KNeutralModel.cc,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeCrossSections.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeCrossSections.cc,v 1.7 2008/07/10 18:06:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeTo3PiModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeTo3PiModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeTo3PiModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeTo3PiModel.cc,v 1.3 2009/11/11 17:13:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadrons.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadrons.cc,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadronsModel.cc,v 1.9 2008/07/10 18:06:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeToHadronsMultiModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToHadronsMultiModel.cc,v 1.8 2009/04/12 17:48:21 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeToPGammaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeToPGammaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeToPGammaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToPGammaModel.cc,v 1.2 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4eeToTwoPiModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToTwoPiModel.cc,v 1.7 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hBremsstrahlung.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4hBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hBremsstrahlungModel.cc,v 1.3 2008/07/22 16:15:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4hPairProduction.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4hPairProduction.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4hPairProduction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hPairProduction.cc,v 1.4 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4hPairProductionModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4hPairProductionModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4hPairProductionModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hPairProductionModel.cc,v 1.1 2008/03/06 11:47:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4hhIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hhIonisation.cc,v 1.9 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4mplIonisation.cc,v 1.8 2009/02/20 16:38:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/highenergy/src/G4mplIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4mplIonisationModel.cc,v 1.7 2009/04/12 17:35:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/History
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/History	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.403 2009/11/20 13:34:44 alechner Exp $
+$Id: History,v 1.407 2009/12/10 12:26:05 sincerti Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,21 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+10.12.2009, S. Incerti, tag emlowen-V09-02-68
+            - Added vapor water shell constants to G4DNARuddIonisationModel.cc 
+            as suggested by Ziad.
+
+24.11.2009, A. Lechner tag emlowen-V09-02-67
+            -G4IonParametrisedLossModel: Important bug fix to calculate ion
+             ranges correctly if the same materials appears multiple times
+             in tracking geometry with different production cuts (for example
+             in different regions). (added UpdateRangeCache function,
+             modified BuildRangeVector, ComputeLossForStep functions and
+             removed GetRange function).
+
+23.11.2009, A. Lechner tag emlowen-V09-02-66
+            -G4IonParametrisedLossModel: Changed energy loss limit to smaller
+             value (from 0.15 to 0.01) to avoid approximative loss description 
+             in case of large steps.
 
 20.11.2009, A. Lechner tag emlowen-V09-02-65
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicDeexcitation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AtomicTransitionManager.hh,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4AtomicTransitionManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AtomicTransitionManager.hh,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4AugerData.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AugerData.hh
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Alfonso Mantero (Alfonso.Mantero@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4BremsstrahlungParameters.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BremsstrahlungParameters.hh,v 1.10 2006/06/29 19:33:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CompositeEMDataSet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompositeEMDataSet.hh,v 1.13 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeDecrease.hh,v 1.2 2008/07/14 20:47:32 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONCHARGEDECREASE_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecreasePartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecreasePartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeDecreasePartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeDecreasePartial.hh,v 1.2 2008/07/14 20:47:32 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONCHARGEDECREASEPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeIncrease.hh,v 1.2 2008/07/14 20:47:33 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONCHARGEIncrease_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncreasePartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncreasePartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeIncreasePartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeIncreasePartial.hh,v 1.2 2008/07/14 20:47:33 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONCHARGEIncreasePARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferCH.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferCH.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferCH.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionChargeTransferCH.hh,v 1.3 2008/03/25 16:00:20 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferExp.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferExp.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionChargeTransferExp.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionChargeTransferExp.hh,v 1.2 2008/03/25 16:00:20 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticChampion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticChampion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticChampion.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticChampion.hh,v 1.1 2008/07/15 19:56:50 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherford.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherford.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherford.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherford.hh,v 1.1 2007/10/12 23:07:10 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordHE.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordHE.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordHE.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherfordHE.hh,v 1.1 2008/06/27 20:09:54 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONELASTICSCREENEDRUTHERFORDHE_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordLE.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordLE.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionElasticScreenedRutherfordLE.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherfordLE.hh,v 1.2 2008/07/14 20:47:33 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONELASTICSCREENEDRUTHERFORDLE_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBorn.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBorn.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBorn.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationBorn.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONEXCITATIONBORN_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBornPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBornPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationBornPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationBornPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONEXCITATIONBORNPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglou.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglou.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglou.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationEmfietzoglou.hh,v 1.3 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONEXCITATIONEMFIETZOGLOU_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglouPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglouPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationEmfietzoglouPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationEmfietzoglouPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONEXCITATIONEMFIETZOGLOUPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationMillerGreenPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationMillerGreenPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionExcitationMillerGreenPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationMillerGreenPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONEXCITATIONMILLERGREENPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionHandler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionHandler.hh,v 1.9 2006/06/29 19:33:10 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBorn.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBorn.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBorn.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionIonisationBorn.hh,v 1.3 2008/12/18 13:01:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONIONISATIONBORN_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornElectron.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornElectron.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornElectron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionIonisationBornElectron.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationBornPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONIONISATIONBORNPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartialElectron.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartialElectron.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationBornPartialElectron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionIonisationBornPartialElectron.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRudd.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRudd.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRudd.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationRudd.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONIONISATIONRUDD_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRuddPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRuddPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionIonisationRuddPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationRuddPartial.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4CROSSSECTIONIONISATIONRuddPARTIAL_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionKill.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionKill.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionKill.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionKill.hh,v 1.1 2007/11/09 20:26:47 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampion.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionPsCreationChampion.hh,v 1.1 2008/07/16 19:01:07 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampionPartial.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampionPartial.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4CrossSectionPsCreationChampionPartial.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionPsCreationChampionPartial.hh,v 1.1 2008/07/16 19:01:07 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornExcitationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNABornExcitationModel.hh,v 1.1 2009/01/12 14:26:02 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNABornIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNABornIonisationModel.hh,v 1.3 2009/06/26 10:15:19 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChampionElasticModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChampionElasticModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChampionElasticModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChampionElasticModel.hh,v 1.1 2009/01/12 14:26:02 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeDecrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChargeDecrease.hh,v 1.2 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAChargeIncrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChargeIncrease.hh,v 1.2 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNACrossSectionDataSet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DNACrossSectionDataSet.hh,v 1.7 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Riccardo Capra <capra@ge.infn.it>
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeDecreaseModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeDecreaseModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeDecreaseModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNADingfelderChargeDecreaseModel.hh,v 1.1 2009/01/12 14:26:02 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeIncreaseModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeIncreaseModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNADingfelderChargeIncreaseModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNADingfelderChargeIncreaseModel.hh,v 1.1 2009/01/12 14:26:02 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAElastic.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAElastic.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAElastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAElastic.hh,v 1.2 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAEmfietzoglouExcitationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAEmfietzoglouExcitationModel.hh,v 1.1 2009/01/12 14:26:02 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAExcitation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAExcitation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAExcitation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAExcitation.hh,v 1.2 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAGenericIonsManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DNAGenericIonsManager.hh,v 1.4 2009/06/10 13:32:58 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef   G4DNAGENERICIONSMANAGER_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAIonisation.hh,v 1.3 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAMillerGreenExcitationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAMillerGreenExcitationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAMillerGreenExcitationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAMillerGreenExcitationModel.hh,v 1.1 2009/01/12 14:26:03 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DNAProcess.hh,v 1.5 2007/11/09 16:20:04 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author:  Maria Grazia Pia (Maria.Grazia.Pia@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.icc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.icc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAProcess.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DNAProcess.icc,v 1.12 2009/01/20 07:50:28 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNARuddIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNARuddIonisationModel.hh,v 1.3 2009/06/26 09:42:32 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DNAScreenedRutherfordElasticModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DNAScreenedRutherfordElasticModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DNAScreenedRutherfordElasticModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAScreenedRutherfordElasticModel.hh,v 1.1 2009/01/12 14:26:03 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DopplerProfile.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DopplerProfile.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DopplerProfile.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DopplerProfile.hh,v 1.2 2008/03/17 13:45:25 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4DummyFinalState.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4DummyFinalState.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4DummyFinalState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DummyFinalState.hh,v 1.2 2007/10/07 12:52:18 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4EMDataSet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EMDataSet.hh,v 1.13 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeDecrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeDecrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeDecrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateChargeDecrease.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATECHARGEDECREASE_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeIncrease.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeIncrease.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeIncrease.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateChargeIncrease.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATECHARGEIncrease_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeTransferProton.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeTransferProton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateChargeTransferProton.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateChargeTransferProton.hh,v 1.2 2008/03/25 16:00:20 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticBrennerZaider.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticBrennerZaider.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticBrennerZaider.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticBrennerZaider.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEELASTICBRENNERZAIDER_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticChampion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticChampion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticChampion.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticChampion.hh,v 1.1 2008/07/15 19:56:50 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticScreenedRutherford.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticScreenedRutherford.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateElasticScreenedRutherford.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticScreenedRutherford.hh,v 1.3 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEELASTICSCREENEDRUTHERFORD_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationBorn.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationBorn.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationBorn.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationBorn.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEEXCITATIONBORN_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationEmfietzoglou.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationEmfietzoglou.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationEmfietzoglou.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationEmfietzoglou.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEEXCITATIONEMFIETZOGLOU_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationMillerGreen.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationMillerGreen.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateExcitationMillerGreen.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationMillerGreen.hh,v 1.2 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEEXCITATIONMILLERGREEN_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationBorn.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationBorn.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationBorn.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateIonisationBorn.hh,v 1.4 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4FINALSTATEIONISATIONBORN_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationRudd.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationRudd.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateIonisationRudd.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateIonisationRudd.hh,v 1.4 2008/07/14 20:47:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateKill.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateKill.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateKill.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateKill.hh,v 1.1 2007/11/09 20:26:47 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateProduct.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateProduct.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStateProduct.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateProduct.hh,v 1.5 2009/01/20 07:50:28 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStatePsCreationChampion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStatePsCreationChampion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FinalStatePsCreationChampion.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStatePsCreationChampion.hh,v 1.1 2008/07/16 19:01:07 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4FluoTransition.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FluoTransition.hh,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.hh	(revision 1228)
@@ -45,4 +45,11 @@
 //                               of heavy ions from ICRU 73 data
 //                20. 11. 2009 - Added set-method for energy loss limit (AL)
+//                24. 11. 2009 - Bug fix: Range calculation corrected if same 
+//                               materials appears with different cuts in diff.
+//                               regions (added UpdateRangeCache function and
+//                               modified BuildRangeVector, ComputeLossForStep
+//                               functions accordingly, added new cache param.,
+//                               changed typdef of IonMatCouple).
+//                             - Removed GetRange function (AL)  
 //
 // Class description:
@@ -75,7 +82,9 @@
 class G4VIonDEDXScalingAlgorithm;
 class G4LPhysicsFreeVector;
+class G4MaterialCutsCouple;
 
 typedef std::list<G4IonDEDXHandler*> LossTableList;
-typedef std::pair<const G4ParticleDefinition*, const G4Material*> IonMatCouple;
+typedef std::pair<const G4ParticleDefinition*, 
+                  const G4MaterialCutsCouple*> IonMatCouple;
 
 
@@ -121,8 +130,7 @@
    // range vs energy (and energy vs range) tables  
    G4double ComputeLossForStep(
-                                 const G4Material*, // Target material
+                                 const G4MaterialCutsCouple*, // Mat-cuts couple
 				 const G4ParticleDefinition*, // Projectile
 				 G4double,  // Kinetic energy of projectile
-                                 G4double,  // Energy cut for secondary prod.
 				 G4double); // Length of current step
 
@@ -157,8 +165,4 @@
 				 G4double&, 
 				 G4double); // Length of current step
-
-   G4double GetRange(const G4ParticleDefinition*, // Projectile
-		     const G4Material*,           // Target Material
-	             G4double);                   // Kinetic energy
 
    // Function which allows to add additional stopping power tables
@@ -219,4 +223,11 @@
                   G4double cutEnergy);           // Energy cut
 
+   // Function which updates parameters concerning the range calculation
+   // (the parameters are only updated if the particle, the material or 
+   // the associated energy cut has changed)
+   void UpdateRangeCache(
+                  const G4ParticleDefinition*,   // Projectile (ion) 
+                  const G4MaterialCutsCouple*);  // Target material
+
    // Function, which updates parameters concering particle properties
    void UpdateCache(
@@ -227,6 +238,5 @@
    void BuildRangeVector(
                   const G4ParticleDefinition*,   // Projectile (ion) 
-                  const G4Material*,             // Target material
-                  G4double);                     // Energy cut
+                  const G4MaterialCutsCouple*);  // Material cuts couple
 
    // Assignment operator and copy constructor are hidden:
@@ -329,4 +339,10 @@
    G4double cacheChargeSquare;                // Charge squared
 
+   // Cached parameters needed during range computations:
+   const G4ParticleDefinition* rangeCacheParticle; // Key: 1) Current ion,
+   const G4MaterialCutsCouple* rangeCacheMatCutsCouple; // 2) Mat-cuts-couple
+   G4PhysicsVector* rangeCacheEnergyRange;         // Energy vs range vector
+   G4PhysicsVector* rangeCacheRangeEnergy;         // Range vs energy vector
+
    // Cached parameters needed during dE/dx computations:
    const G4ParticleDefinition* dedxCacheParticle; // Key: 1) Current ion,
@@ -334,6 +350,4 @@
    G4double dedxCacheEnergyCut;                   //      3) cut energy 
    LossTableList::iterator dedxCacheIter;         // Responsible dE/dx table
-   G4PhysicsVector* dedxCacheEnergyRange;         // Energy vs range vector
-   G4PhysicsVector* dedxCacheRangeEnergy;         // Range vs energy vector
    G4double dedxCacheTransitionEnergy;      // Transition energy between
                                             // parameterization and 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LinInterpolation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LinInterpolation.hh,v 1.4 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreBremsstrahlungModel.hh,v 1.2 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreComptonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreComptonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreComptonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreComptonModel.hh,v 1.3 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreGammaConversionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreGammaConversionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreGammaConversionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreGammaConversionModel.hh,v 1.3 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreIonisationModel.hh,v 1.3 2009/10/23 09:28:37 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePhotoElectricModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePhotoElectricModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePhotoElectricModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePhotoElectricModel.hh,v 1.3 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedComptonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedComptonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedComptonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedComptonModel.hh,v 1.3 2009/05/02 15:20:52 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedGammaConversionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedGammaConversionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedGammaConversionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedGammaConversionModel.hh,v 1.1 2009/10/30 14:52:05 flongo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedPhotoElectricModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedPhotoElectricModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedPhotoElectricModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedPhotoElectricModel.hh,v 1.1 2009/10/30 14:52:05 flongo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedRayleighModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedRayleighModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermorePolarizedRayleighModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedRayleighModel.hh,v 1.3 2009/05/02 15:20:52 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreRayleighModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreRayleighModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LivermoreRayleighModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreRayleighModel.hh,v 1.3 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LogLogInterpolation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogLogInterpolation.hh,v 1.7 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh	(revision 1228)
@@ -27,5 +27,5 @@
 // -------------------------------------------------------------------
 // $Id: G4LowEnergyBremsstrahlung.hh,v 1.37 2006/06/29 19:35:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyCompton.hh,v 1.24 2008/11/04 10:14:00 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyGammaConversion.hh,v 1.15 2006/06/29 19:35:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 // -------------------------------------------------------------------
 // $Id: G4LowEnergyIonisation.hh,v 1.41 2006/06/29 19:36:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyPhotoElectric.hh,v 1.28 2006/06/29 19:36:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyPolarizedCompton.hh,v 1.10 2008/05/02 13:04:41 flongo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedRayleigh.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyPolarizedRayleigh.hh,v 1.5 2006/06/29 19:36:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyRayleigh.hh,v 1.16 2006/06/29 19:36:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PaulKCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PaulKCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PaulKCrossSection.hh	(revision 1228)
@@ -25,16 +25,4 @@
 //
 // 
-// History:
-// -----------
-//  21 Apr 2008   H. Abdelohauwed - 1st implementation
-//  29 Apr 2009   ALF  Major Design Revision
-//
-// -------------------------------------------------------------------
-
-// Class description:
-// Low Energy Electromagnetic Physics, Cross section, p ionisation, K shell
-// Further documentation available from http://www.ge.infn.it/geant4/lowE
-
-// -------------------------------------------------------------------
 
 
@@ -42,10 +30,6 @@
 #define G4PAULKCROSSSECTION_HH 1
 
-//#include "G4VDataSetAlgorithm.hh"
 #include "globals.hh"
-#include <map>
 
-class G4VDataSetAlgorithm;
-class G4VEMDataSet;
 
 class G4PaulKCrossSection 
@@ -58,7 +42,10 @@
   virtual ~G4PaulKCrossSection();
 			     
-  G4double CalculateKCrossSection(G4int zTarget,G4double massIncident, G4double energyIncident);
+  G4double CalculateKCrossSection(G4int zTarget,G4int zIncident, G4double energyIncident);
 				    
  
+
+   
+
 private:
 
@@ -67,11 +54,4 @@
   G4PaulKCrossSection & operator = (const G4PaulKCrossSection &right);
 
-  G4VDataSetAlgorithm* interpolation;
-
-  std::map< G4int , G4VEMDataSet* > protonDataSetMap;
-
-  std::map< G4int , G4VEMDataSet* > alphaDataSetMap;
-  
-
 };
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeAnnihilationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeAnnihilationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeAnnihilationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeAnnihilationModel.hh,v 1.1 2008/11/04 10:14:56 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlung.hh	(revision 1228)
@@ -27,5 +27,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PenelopeBremsstrahlung.hh,v 1.8 2006/06/29 19:36:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L.Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungAngular.hh	(revision 1228)
@@ -27,5 +27,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PenelopeBremsstrahlungAngular.hh,v 1.3 2006/06/29 19:36:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L.Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungContinuous.hh	(revision 1228)
@@ -27,5 +27,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PenelopeBremsstrahlungContinuous.hh,v 1.4 2008/12/09 15:04:05 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L.Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeBremsstrahlungModel.hh,v 1.2 2009/04/17 10:29:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeCompton.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeCompton.hh,v 1.11 2008/03/26 15:30:19 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeComptonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeComptonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeComptonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeComptonModel.hh,v 1.3 2009/10/21 14:56:47 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PenelopeGammaConversion.hh,v 1.2 2006/06/29 19:36:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L. Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeGammaConversionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeGammaConversionModel.hh,v 1.1 2008/10/28 08:50:21 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PenelopeIonisation.hh,v 1.5 2006/06/29 19:36:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L. Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeIonisationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeIonisationModel.hh,v 1.3 2009/10/21 14:56:47 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectric.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PenelopePhotoElectric.hh,v 1.4 2006/06/29 19:36:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L.Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectricModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectricModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopePhotoElectricModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopePhotoElectricModel.hh,v 1.2 2009/10/21 10:47:02 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleigh.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PenelopeRayleigh.hh,v 1.5 2006/06/29 19:36:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleighModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleighModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4PenelopeRayleighModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeRayleighModel.hh,v 1.1 2008/10/28 08:50:21 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4RangeNoTest.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RangeNoTest.hh,v 1.4 2006/06/29 19:36:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4RangeTest.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RangeTest.hh,v 1.4 2006/06/29 19:36:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4RayleighScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4RayleighScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4RayleighScattering.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RayleighScattering.hh,v 1.2 2009/03/18 13:45:51 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //------------------ G4RayleighScattering physics process -----------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4SemiLogInterpolation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SemiLogInterpolation.hh,v 1.5 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4ShellData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ShellData.hh,v 1.7 2008/03/17 13:45:25 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4ShellEMDataSet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ShellEMDataSet.hh,v 1.13 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VCrossSectionHandler.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCrossSectionHandler.hh,v 1.15 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VDataSetAlgorithm.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDataSetAlgorithm.hh,v 1.8 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VEMDataSet.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEMDataSet.hh,v 1.13 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyDiscretePhotonProcess.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VLowEnergyDiscretePhotonProcess.hh,v 1.4 2006/06/29 19:37:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyTestableDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VLowEnergyTestableDiscreteProcess.hh,v 1.3 2006/06/29 19:37:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VRangeTest.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRangeTest.hh,v 1.3 2006/06/29 19:37:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VeLowEnergyLoss.hh,v 1.9 2006/06/29 19:37:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 3.4.2000 Veronique Lefebure:
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4WaterExcitationStructure.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4WaterExcitationStructure.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4WaterExcitationStructure.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WaterExcitationStructure.hh,v 1.1 2007/10/15 08:33:25 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4WaterIonisationStructure.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4WaterIonisationStructure.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4WaterIonisationStructure.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WaterIonisationStructure.hh,v 1.1 2007/11/08 20:38:40 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eBremsstrahlungSpectrum.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungSpectrum.hh,v 1.8 2006/06/29 19:37:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionExcitationEmfietzoglou.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionExcitationEmfietzoglou.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionExcitationEmfietzoglou.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eCrossSectionExcitationEmfietzoglou.hh,v 1.1 2007/05/02 17:18:48 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionScreenedRutherford.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionScreenedRutherford.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eCrossSectionScreenedRutherford.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eCrossSectionScreenedRutherford.hh,v 1.2 2007/10/12 12:26:34 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationCrossSectionHandler.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisationCrossSectionHandler.hh,v 1.7 2009/01/29 08:13:27 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationParameters.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eIonisationParameters.hh,v 1.8 2006/06/29 19:37:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eIonisationSpectrum.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisationSpectrum.hh,v 1.7 2006/06/29 19:37:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eLowEnergyLoss.hh,v 1.14 2006/06/29 19:37:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eLowEnergyLoss.icc,v 1.8 2006/06/29 19:37:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh	(revision 1228)
@@ -50,5 +50,4 @@
 // 26 Feb    2002 V.Ivanchenko Add initialMass for GenericIons
 // 21 Jan    2003 V.Ivanchenko Cut per region
-// 03 Oct    2009 ALF added SelectShellIonisationCS 
 // ------------------------------------------------------------
  
@@ -176,7 +175,4 @@
   // This method switch on/off simulation of the fluorescence of the media.
 
-  void SelectShellIonisationCS(G4String);
-
-
   G4VParticleChange* AlongStepDoIt(const G4Track& trackData ,
                                    const G4Step& stepData ) ;
@@ -264,5 +260,4 @@
 					          G4double hMass,
 					          G4double eLoss);
-
 
   G4int SelectRandomAtom(const G4MaterialCutsCouple* couple,
@@ -319,4 +314,5 @@
   std::vector<G4VEMDataSet*> zFluoDataVector;
   G4bool theFluo;
+  G4bool expFlag;
 };
 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4hLowEnergyLoss.hh,v 1.17 2006/06/29 19:37:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4hLowEnergyLoss.icc,v 1.3 2006/06/29 19:38:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id:
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExp.hh	(revision 1228)
@@ -45,5 +45,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionDoubleExp.hh,v 1.3 2006/06/29 19:38:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4HSHELLCROSSSECTIONDOUBLEEXP_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionDoubleExpData.hh	(revision 1228)
@@ -40,5 +40,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionDoubleExpData.hh,v 1.3 2006/06/29 19:38:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4hShellCrossSectionDoubleExpData_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExp.hh	(revision 1228)
@@ -45,5 +45,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionExp.hh,v 1.3 2006/06/29 19:38:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4HSHELLCROSSSECTIONEXP_HH
Index: trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/include/G4hShellCrossSectionExpData.hh	(revision 1228)
@@ -38,5 +38,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionExpData.hh,v 1.3 2006/06/29 19:38:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4hShellCrossSectionExpData_HH
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AtomicDeexcitation.cc,v 1.11 
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AtomicTransitionManager.cc,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BremsstrahlungCrossSectionHandler.cc,v 1.12 2009/09/27 10:47:42 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4BremsstrahlungParameters.cc,v 1.20 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompositeEMDataSet.cc,v 1.15 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeDecrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionChargeDecrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecreasePartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecreasePartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecreasePartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeDecreasePartial.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionChargeDecreasePartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeIncrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionChargeIncrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncreasePartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncreasePartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncreasePartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionChargeIncreasePartial.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionChargeIncreasePartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferCH.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferCH.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferCH.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionChargeTransferCH.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferExp.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferExp.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferExp.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionChargeTransferExp.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticChampion.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticChampion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticChampion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticChampion.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherford.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherford.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherford.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherford.cc,v 1.1 2007/10/12 23:11:41 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordHE.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordHE.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordHE.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherfordHE.cc,v 1.5 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionElasticScreenedRutherfordHE.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordLE.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordLE.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordLE.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionElasticScreenedRutherfordLE.cc,v 1.5 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionElasticScreenedRutherfordLE.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBorn.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBorn.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBorn.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationBorn.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationBorn.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBornPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBornPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBornPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationBornPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationBornPartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglou.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglou.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglou.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationEmfietzoglou.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationEmfietzoglou.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglouPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglouPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglouPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationEmfietzoglouPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationEmfietzoglouPartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationMillerGreen.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreenPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreenPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreenPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionExcitationMillerGreenPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionExcitationMillerGreenPartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionHandler.cc,v 1.21 2009/09/27 10:47:42 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBorn.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBorn.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBorn.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationBorn.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionIonisationBorn.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornElectron.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornElectron.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornElectron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionIonisationBornElectron.cc,v 1.2 2007/11/08 18:51:34 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationBornPartial.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionIonisationBornPartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartialElectron.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartialElectron.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartialElectron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionIonisationBornPartialElectron.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRudd.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRudd.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRudd.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationRudd.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionIonisationRudd.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRuddPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRuddPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRuddPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionIonisationRuddPartial.cc,v 1.5 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4CrossSectionIonisationRuddPartial.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionKill.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionKill.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionKill.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CrossSectionKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampion.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionPsCreationChampion.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampionPartial.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampionPartial.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampionPartial.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionPsCreationChampionPartial.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornExcitationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornExcitationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornExcitationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNABornExcitationModel.cc,v 1.7 2009/08/31 14:03:29 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNABornIonisationModel.cc,v 1.14 2009/11/12 03:08:58 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChampionElasticModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChampionElasticModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChampionElasticModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChampionElasticModel.cc,v 1.10 2009/11/03 15:04:25 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeDecrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeDecrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeDecrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChargeDecrease.cc,v 1.3 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAChargeDecrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeIncrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeIncrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeIncrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAChargeIncrease.cc,v 1.3 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAChargeIncrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc	(revision 1228)
@@ -27,5 +27,5 @@
 
 // $Id: G4DNACrossSectionDataSet.cc,v 1.11 2009/11/12 10:05:30 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Riccardo Capra <capra@ge.infn.it>
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeDecreaseModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeDecreaseModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeDecreaseModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNADingfelderChargeDecreaseModel.cc,v 1.6 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeIncreaseModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeIncreaseModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeIncreaseModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNADingfelderChargeIncreaseModel.cc,v 1.6 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAElastic.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAElastic.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAElastic.cc,v 1.3 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAElastic.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouExcitationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouExcitationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouExcitationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAEmfietzoglouExcitationModel.cc,v 1.8 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAExcitation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAExcitation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAExcitation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAExcitation.cc,v 1.3 2009/03/04 13:28:49 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAExcitation.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAGenericIonsManager.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAGenericIonsManager.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAIonisation.cc,v 1.4 2009/11/02 17:00:11 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4DNAIonisation.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAMillerGreenExcitationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAMillerGreenExcitationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAMillerGreenExcitationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAMillerGreenExcitationModel.cc,v 1.6 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNARuddIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNARuddIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNARuddIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNARuddIonisationModel.cc,v 1.10 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DNAScreenedRutherfordElasticModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DNAScreenedRutherfordElasticModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DNAScreenedRutherfordElasticModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DNAScreenedRutherfordElasticModel.cc,v 1.9 2009/08/13 11:32:47 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DopplerProfile.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DopplerProfile.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DopplerProfile.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DopplerProfile.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4DummyFinalState.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4DummyFinalState.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4DummyFinalState.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DummyFinalState.cc,v 1.2 2007/10/15 08:36:35 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EMDataSet.cc,v 1.20 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeDecrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeDecrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeDecrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateChargeDecrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateChargeDecrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeIncrease.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeIncrease.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeIncrease.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateChargeIncrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateChargeIncrease.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeTransferProton.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeTransferProton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeTransferProton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateChargeTransferProton.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticBrennerZaider.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticBrennerZaider.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticBrennerZaider.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticBrennerZaider.cc,v 1.11 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateElasticBrennerZaider.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticChampion.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticChampion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticChampion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticChampion.cc,v 1.10 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticScreenedRutherford.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticScreenedRutherford.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticScreenedRutherford.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateElasticScreenedRutherford.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateElasticScreenedRutherford.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationBorn.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationBorn.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationBorn.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationBorn.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateExcitationBorn.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationEmfietzoglou.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationEmfietzoglou.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationEmfietzoglou.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationEmfietzoglou.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateExcitationEmfietzoglou.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationMillerGreen.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationMillerGreen.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationMillerGreen.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateExcitationMillerGreen.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateExcitationMillerGreen.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationBorn.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationBorn.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationBorn.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateIonisationBorn.cc,v 1.19 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateIonisationBorn.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationRudd.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationRudd.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationRudd.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateIonisationRudd.cc,v 1.11 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4FinalStateIonisationRudd.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateKill.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateKill.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateKill.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateProduct.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateProduct.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateProduct.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FinalStateProduct.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStatePsCreationChampion.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStatePsCreationChampion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStatePsCreationChampion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStatePsCreationChampion.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4FluoTransition.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4FluoTransition.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4FluoTransition.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FluoTransition.cc,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4IonParametrisedLossModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4IonParametrisedLossModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4IonParametrisedLossModel.cc	(revision 1228)
@@ -56,4 +56,12 @@
 //                             - Minor fix in ComputeLossForStep function  
 //                             - Minor fix in ComputeDEDXPerVolume (AL)
+//                23. 11. 2009 - Changed energy loss limit from 0.15 to 0.01
+//                               to improve accuracy for large steps (AL)
+//                24. 11. 2009 - Bug fix: Range calculation corrected if same 
+//                               materials appears with different cuts in diff.
+//                               regions (added UpdateRangeCache function and
+//                               modified BuildRangeVector, ComputeLossForStep
+//                               functions accordingly, added new cache param.)
+//                             - Removed GetRange function (AL)  
 //
 //
@@ -102,5 +110,5 @@
     corrections(0),
     corrFactor(1.0),
-    energyLossLimit(0.15),
+    energyLossLimit(0.01),
     cutEnergies(0) {
 
@@ -124,5 +132,5 @@
   upperEnergyEdgeIntegr = betheBlochModel -> HighEnergyLimit();
 
-  // Cached parameters are reset
+  // Cache parameters are set
   cacheParticle = 0;
   cacheMass = 0;
@@ -130,5 +138,11 @@
   cacheChargeSquare = 0;
 
-  // Cached parameters are reset
+  // Cache parameters are set
+  rangeCacheParticle = 0; 
+  rangeCacheMatCutsCouple = 0; 
+  rangeCacheEnergyRange = 0; 
+  rangeCacheRangeEnergy = 0;
+
+  // Cache parameters are set
   dedxCacheParticle = 0;
   dedxCacheMaterial = 0;
@@ -192,4 +206,10 @@
   cacheChargeSquare = 0;
   
+  // Cached parameters are reset
+  rangeCacheParticle = 0; 
+  rangeCacheMatCutsCouple = 0; 
+  rangeCacheEnergyRange = 0; 
+  rangeCacheRangeEnergy = 0;
+
   // Cached parameters are reset
   dedxCacheParticle = 0;
@@ -723,4 +743,43 @@
 // #########################################################################
 
+void G4IonParametrisedLossModel::UpdateRangeCache(
+                     const G4ParticleDefinition* particle,
+                     const G4MaterialCutsCouple* matCutsCouple) {
+
+  // ############## Caching ##################################################
+  // If the ion-material-cut combination is covered by any native ion data
+  // parameterisation (for low energies), range vectors are computed 
+
+  if(particle == rangeCacheParticle && 
+     matCutsCouple == rangeCacheMatCutsCouple) {
+  }
+  else{
+     rangeCacheParticle = particle;
+     rangeCacheMatCutsCouple = matCutsCouple;
+
+     const G4Material* material = matCutsCouple -> GetMaterial();
+     LossTableList::iterator iter = IsApplicable(particle, material);
+
+     // If any table is applicable, the transition factor is computed:
+     if(iter != lossTableList.end()) {
+
+        // Build range-energy and energy-range vectors if they don't exist
+        IonMatCouple ionMatCouple = std::make_pair(particle, matCutsCouple);
+        RangeEnergyTable::iterator iterRange = r.find(ionMatCouple);
+
+        if(iterRange == r.end()) BuildRangeVector(particle, matCutsCouple);
+
+        rangeCacheEnergyRange = E[ionMatCouple];    
+        rangeCacheRangeEnergy = r[ionMatCouple];
+     }
+     else {
+        rangeCacheEnergyRange = 0;    
+        rangeCacheRangeEnergy = 0;
+     }
+  }
+}
+
+// #########################################################################
+
 void G4IonParametrisedLossModel::UpdateDEDXCache(
                      const G4ParticleDefinition* particle,
@@ -793,14 +852,4 @@
                   	 (dEdxParam - dEdxBetheBloch)/dEdxBetheBloch
                              * transitionEnergy; 
-
-        // Build range-energy and energy-range vectors if they don't exist
-        IonMatCouple ionMatCouple = std::make_pair(particle, material);
-        RangeEnergyTable::iterator iterRange = r.find(ionMatCouple);
-
-        if(iterRange == r.end()) BuildRangeVector(particle, material, 
-                                                  cutEnergy);
-
-        dedxCacheEnergyRange = E[ionMatCouple];    
-        dedxCacheRangeEnergy = r[ionMatCouple];
      }
      else {
@@ -815,6 +864,4 @@
         dedxCacheTransitionEnergy = 0.0;
         dedxCacheTransitionFactor = 0.0;
-        dedxCacheEnergyRange = 0;    
-        dedxCacheRangeEnergy = 0;
      }
   }
@@ -899,6 +946,6 @@
      if(eloss > energyLossLimit * kineticEnergy) {
 
-        eloss = ComputeLossForStep(material, particle, 
-                                   kineticEnergy, cutEnergy,length);
+        eloss = ComputeLossForStep(couple, particle, 
+                                   kineticEnergy,length);
 
 #ifdef PRINT_DEBUG
@@ -972,6 +1019,11 @@
 void G4IonParametrisedLossModel::BuildRangeVector(
                      const G4ParticleDefinition* particle,
-                     const G4Material* material,
-                     G4double cutEnergy) {
+                     const G4MaterialCutsCouple* matCutsCouple) {
+
+  G4double cutEnergy = DBL_MAX;
+  size_t cutIndex = matCutsCouple -> GetIndex();
+  cutEnergy = cutEnergies[cutIndex];
+
+  const G4Material* material = matCutsCouple -> GetMaterial();
 
   G4double massRatio = genericIonPDGMass / particle -> GetPDGMass();
@@ -1077,5 +1129,5 @@
 #endif 
 
-  IonMatCouple ionMatCouple = std::make_pair(particle, material); 
+  IonMatCouple ionMatCouple = std::make_pair(particle, matCutsCouple); 
 
   E[ionMatCouple] = energyRangeVector;
@@ -1085,65 +1137,16 @@
 // #########################################################################
 
-G4double G4IonParametrisedLossModel::GetRange(
-                  const G4ParticleDefinition* particle, // Projectile
-		  const G4Material* material,           // Target Material
-	          G4double kineticEnergy) {
-
-  G4double range = 0.0;
-
-  IonMatCouple couple = std::make_pair(particle, material);
-
-  EnergyRangeTable::iterator iter = E.find(couple);
-
-  if(iter == E.end()) {
-     G4cerr << "G4IonParametrisedLossModel::GetRange() No range vector found."
-            << G4endl;
-
-     G4cout << "   Ion-material pair: " << particle ->GetParticleName()
-            << "  " << material -> GetName()
-            << G4endl
-            << "   Available couples:"
-            << G4endl;
-
-     EnergyRangeTable::iterator iter_beg = E.begin();
-     EnergyRangeTable::iterator iter_end = E.end();
-
-     for(;iter_beg != iter_end; iter_beg++) {
-         IonMatCouple key = (*iter_beg).first; 
- 
-         G4cout << "           " << (key.first) -> GetParticleName()
-                << "  " << (key.second) -> GetName()
-                << G4endl;
-     }
-  }
-  else {
-     G4PhysicsVector* energyRange = (*iter).second;
-
-     if(energyRange != 0) {
-        G4bool b;
-
-        // Computing range for kinetic energy:
-        range = energyRange -> GetValue(kineticEnergy, b);
-     }
-  }
-
-  return range;
-}
-
-// #########################################################################
-
 G4double G4IonParametrisedLossModel::ComputeLossForStep(
-                     const G4Material* material,
+                     const G4MaterialCutsCouple* matCutsCouple,
                      const G4ParticleDefinition* particle,
                      G4double kineticEnergy,
-                     G4double cutEnergy,
                      G4double stepLength) {
 
   G4double loss = 0.0;
 
-  UpdateDEDXCache(particle, material, cutEnergy);
-
-  G4PhysicsVector* energyRange = dedxCacheEnergyRange;
-  G4PhysicsVector* rangeEnergy = dedxCacheRangeEnergy;
+  UpdateRangeCache(particle, matCutsCouple);
+
+  G4PhysicsVector* energyRange = rangeCacheEnergyRange;
+  G4PhysicsVector* rangeEnergy = rangeCacheRangeEnergy;
 
   if(energyRange != 0 && rangeEnergy != 0) {
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LinInterpolation.cc,v 1.5 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreBremsstrahlungModel.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreComptonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreComptonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreComptonModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreComptonModel.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversionModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversionModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversionModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreGammaConversionModel.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreIonisationModel.cc,v 1.7 2009/10/23 09:30:08 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePhotoElectricModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePhotoElectricModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePhotoElectricModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePhotoElectricModel.cc,v 1.9 2009/10/23 09:31:03 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedComptonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedComptonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedComptonModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedComptonModel.cc,v 1.6 2009/05/03 08:29:55 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // History:
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedRayleighModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedRayleighModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedRayleighModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermorePolarizedRayleighModel.cc,v 1.5 2009/05/02 15:20:53 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // History:
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreRayleighModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreRayleighModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreRayleighModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LivermoreRayleighModel.cc,v 1.8 2009/09/23 16:54:06 flongo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Sebastien Inserti
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LogLogInterpolation.cc,v 1.16 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyBremsstrahlung.cc,v 1.74 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyCompton.cc,v 1.50 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc	(revision 1228)
@@ -27,5 +27,5 @@
 ///
 // $Id: G4LowEnergyGammaConversion.cc,v 1.39 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyIonisation.cc,v 1.106 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyPhotoElectric.cc,v 1.59 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEnergyPolarizedCompton.cc,v 1.28 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedRayleigh.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedRayleigh.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedRayleigh.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LowEnergyPolarizedRayleigh.cc,v 1.10 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4LowEnergyRayleigh.cc,v 1.40 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: A. Forti
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PaulKCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PaulKCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PaulKCrossSection.cc	(revision 1228)
@@ -25,17 +25,4 @@
 //
 //
-// History:
-// -----------
-//  21 Apr 2008   H. Abdelohauwed - 1st implementation
-//  29 Apr 2009   ALF  Major Design Revision
-//  11 Nov 2009   ALF update and code cleaning for the Dec Release 
-//
-// -------------------------------------------------------------------
-
-// Class description:
-// Low Energy Electromagnetic Physics, Cross section, p ionisation, K shell
-// Further documentation available from http://www.ge.infn.it/geant4/lowE
-
-// -------------------------------------------------------------------
 
 #include "globals.hh"
@@ -43,84 +30,45 @@
 #include <fstream>
 #include <iomanip>
-//#include "G4CompositeEMDataSet.hh"
-//#include "G4ShellEMDataSet.hh"
+#include "G4CompositeEMDataSet.hh"
+#include "G4ShellEMDataSet.hh"
 #include "G4EMDataSet.hh"
-//#include "G4VEMDataSet.hh"
-//#include "G4VDataSetAlgorithm.hh"
+#include "G4VEMDataSet.hh"
+#include "G4VDataSetAlgorithm.hh"
 #include "G4LogLogInterpolation.hh"
 #include "G4PaulKCrossSection.hh"
-#include "G4Proton.hh"
-#include "G4Alpha.hh"
-
 
 G4PaulKCrossSection::G4PaulKCrossSection()
-{ 
+{ }
+
+G4PaulKCrossSection::~G4PaulKCrossSection()
+{ }
+
+G4double G4PaulKCrossSection::CalculateKCrossSection(G4int zTarget,G4int zIncident, G4double energyIncident)
+{
+  
+ G4String fileName;
+
+ if (zIncident == 1)
+   { fileName = "kcsPaul/kcs-";} 
+  else
+    {
+      if (zIncident == 2)
+	{ fileName = "kacsPaul/kacs-";}
+	
+    }
 
   
-  interpolation = new G4LogLogInterpolation();
+  G4VDataSetAlgorithm* interpolation = new G4LogLogInterpolation();
 
-  /*
-    G4String path = getenv("G4LEDATA");
- 
-    if (!path)
-    G4Exception("G4paulKCrossSection::G4paulKCrossSection: G4LEDATA environment variable not set");
-    G4cout << path + "/kcsPaul/kcs-" << G4endl;
-  */
+  G4VEMDataSet* dataSet;
 
+  dataSet = new G4EMDataSet(zTarget,interpolation);
+  
+  dataSet->LoadData(fileName);
+   
 
-    for (G4int i=4; i<93; i++) {
-      protonDataSetMap[i] = new G4EMDataSet(i,interpolation);
-      protonDataSetMap[i]->LoadData("pixe/kpcsPaul/kcs-");
-    }
-    for (G4int i=6; i<93; i++) {
-      alphaDataSetMap[i] = new G4EMDataSet(i,interpolation);
-      alphaDataSetMap[i]->LoadData("pixe/kacsPaul/kacs-");
-    }
+          G4double sigma = dataSet->FindValue(energyIncident/MeV) / barn;
 
-
-
-
-}
-
-G4PaulKCrossSection::~G4PaulKCrossSection()
-{ 
-
-  protonDataSetMap.clear();
-  alphaDataSetMap.clear();
-
-}
-
-G4double G4PaulKCrossSection::CalculateKCrossSection(G4int zTarget,G4double massIncident, G4double energyIncident)
-{
-  
-  G4Proton* aProtone = G4Proton::Proton();
-  G4Alpha* aAlpha = G4Alpha::Alpha();
-  
-  G4double sigma = 0;
-
-  if (massIncident == aProtone->GetPDGMass() )
-    {
-      
-      sigma = protonDataSetMap[zTarget]->FindValue(energyIncident/MeV) / barn; 
-      
-    }
-  else
-    {
-      if (massIncident == aAlpha->GetPDGMass())
-	{
-	  
-          sigma = alphaDataSetMap[zTarget]->FindValue(energyIncident/MeV) / barn; 
-	  
-	}
-      else
-	{ 
-	  G4cout << "we can treat only Proton or Alpha incident particles " << G4endl;
-	  sigma = 0.;
-	}
-    }
-  
-  
-  
-  return sigma;
+	  return sigma;
 }
 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeAnnihilationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeAnnihilationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeAnnihilationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeAnnihilationModel.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeBremsstrahlung.cc,v 1.21 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeBremsstrahlungAngular.cc,v 1.8 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungContinuous.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungContinuous.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungContinuous.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeBremsstrahlungContinuous.cc,v 1.12 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeBremsstrahlungModel.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCompton.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeCompton.cc,v 1.36 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeComptonModel.cc,v 1.8 2009/10/23 09:29:24 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeGammaConversionModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeGammaConversionModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeGammaConversionModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeGammaConversionModel.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeIonisation.cc,v 1.22 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeIonisationModel.cc,v 1.10 2009/10/23 09:29:24 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectric.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectric.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectric.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PenelopePhotoElectric.cc,v 1.16 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L. Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectricModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectricModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectricModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopePhotoElectricModel.cc,v 1.10 2009/10/23 09:29:24 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleigh.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleigh.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleigh.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4PenelopeRayleigh.cc,v 1.19 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: L. Pandola (luciano.pandola@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PenelopeRayleighModel.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Luciano Pandola
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4RangeTest.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4RangeTest.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4RangeTest.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RangeTest.cc,v 1.9 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4RayleighScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4RayleighScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4RayleighScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RayleighScattering.cc,v 1.2 2009/03/18 13:45:51 pandola Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4SemiLogInterpolation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4SemiLogInterpolation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4SemiLogInterpolation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SemiLogInterpolation.cc,v 1.8 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4ShellData.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4ShellData.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4ShellData.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ShellData.cc,v 1.11 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ShellEMDataSet.cc,v 1.18 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCrossSectionHandler.cc,v 1.19 2009/09/25 07:41:34 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyDiscretePhotonProcess.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyDiscretePhotonProcess.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyDiscretePhotonProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VLowEnergyDiscretePhotonProcess.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VeLowEnergyLoss.cc,v 1.27 2009/07/23 09:15:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4WaterExcitationStructure.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4WaterExcitationStructure.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4WaterExcitationStructure.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WaterExcitationStructure.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4WaterIonisationStructure.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4WaterIonisationStructure.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4WaterIonisationStructure.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WaterIonisationStructure.cc,v 1.1 2007/11/08 20:39:35 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eBremsstrahlungSpectrum.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eBremsstrahlungSpectrum.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eBremsstrahlungSpectrum.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungSpectrum.cc,v 1.16 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionExcitationEmfietzoglou.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionExcitationEmfietzoglou.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionExcitationEmfietzoglou.cc	(revision 1228)
@@ -26,9 +26,9 @@
 //
 // $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
 // $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionScreenedRutherford.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionScreenedRutherford.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionScreenedRutherford.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eCrossSectionScreenedRutherford.cc,v 1.3 2007/10/12 12:27:19 pia Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationCrossSectionHandler.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationCrossSectionHandler.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationCrossSectionHandler.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisationCrossSectionHandler.cc,v 1.15 2009/09/27 10:47:42 sincerti Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eIonisationParameters.cc,v 1.25 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisationSpectrum.cc,v 1.27 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4eLowEnergyLoss.cc,v 1.37 2009/07/23 09:15:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //  
 // -----------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc	(revision 1228)
@@ -100,7 +100,6 @@
 //               parametrised proton model: min(user value, model limit)
 // 26 Jan   2005 S. Chauvie added PrintInfoDefinition() for antiproton
-// 30 Sep   2009 ALF Removed dependencies to old shell Ionisation XS models
-// 11 Nov   2009 ALF Code cleaning for the Dec release
-//
+
+
 // -----------------------------------------------------------------------
 
@@ -122,4 +121,7 @@
 #include "G4ShellVacancy.hh"
 #include "G4VhShellCrossSection.hh"
+#include "G4hShellCrossSection.hh"
+#include "G4hShellCrossSectionExp.hh"
+#include "G4hShellCrossSectionDoubleExp.hh"
 #include "G4VEMDataSet.hh"
 #include "G4EMDataSet.hh"
@@ -130,6 +132,5 @@
 #include "G4ProcessManager.hh"
 #include "G4ProductionCutsTable.hh"
-#include "G4teoCrossSection.hh"
-#include "G4empCrossSection.hh"
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -152,5 +153,6 @@
     shellVacancy(0),
     shellCS(0),
-    theFluo(false)
+    theFluo(false),
+    expFlag(false)
 { 
   InitializeMe();
@@ -173,6 +175,16 @@
   verboseLevel         = 0;
 
-  shellCS = new G4teoCrossSection("analytical");
-
+//****************************************************************************
+// By default the method of cross section's calculation is swiched on an 
+// 2nd implementation empirical model (G4hShellCrossSectionDoubleExp), 
+// if you want to use Gryzinski's model (G4hShellCrossSection()) or the
+// 1st empiric one (G4hShellCrossSectionExp), you must change the 
+// selection below and switching expFlag to FALSE
+//****************************************************************************
+
+  //shellCS = new G4hShellCrossSection();
+  //shellCS = new G4hShellCrossSectionExp();
+  shellCS = new G4hShellCrossSectionDoubleExp();
+  expFlag=true;
 }
 
@@ -1268,58 +1280,61 @@
   //   G4cout << "Fluorescence is switched :" << theFluo << G4endl; 
 
-  // Fluorescence data start from element 6
   if(theFluo && Z > 5) {
 
 
 
-    // Atom total cross section     
+    // Atom total cross section for the Empiric Model    
+    if (expFlag) {    
     shellCS->SetTotalCS(totalCrossSectionMap[Z]);    
-
+    }
     G4int shell = shellCS->SelectRandomShell(Z, KineticEnergy,ParticleMass,DeltaKineticEnergy);
 
-    if (shell!=-1) {        
-      
-      const G4AtomicShell* atomicShell =
-	(G4AtomicTransitionManager::Instance())->Shell(Z, shell);
-      G4double bindingEnergy = atomicShell->BindingEnergy();
-      
-      if(verboseLevel > 1) {
-	G4cout << "PostStep Z= " << Z << " shell= " << shell
-	       << " bindingE(keV)= " << bindingEnergy/keV
-	       << " finalE(keV)= " << finalKineticEnergy/keV
-	       << G4endl;
-      }
-      
-      
-      
-      if (finalKineticEnergy >= bindingEnergy
-	  && (bindingEnergy >= minGammaEnergy
-	      ||  bindingEnergy >= minElectronEnergy) ) {
-	
-	G4int shellId = atomicShell->ShellId();
-	secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
-	
-	if (secondaryVector != 0) {
-	  
-	  nSecondaries = secondaryVector->size();
-	  for (size_t i = 0; i<nSecondaries; i++) {
-	    
-	    aSecondary = (*secondaryVector)[i];
-	    if (aSecondary) {
-	      
-	      G4double e = aSecondary->GetKineticEnergy();
-	      type = aSecondary->GetDefinition();
-	      if (e < finalKineticEnergy &&
-		  ((type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
-		   (type == G4Electron::Electron() && e > minElectronEnergy ))) {
-		
-		finalKineticEnergy -= e;
-		totalNumber++;
-		
-	      } else {
-		
-		delete aSecondary;
-		(*secondaryVector)[i] = 0;
-	      }
+    if (expFlag && shell==1) {        
+      aParticleChange.ProposeLocalEnergyDeposit (KineticEnergy);
+      aParticleChange.ProposeEnergy(0);      
+    }
+
+
+    const G4AtomicShell* atomicShell =
+                (G4AtomicTransitionManager::Instance())->Shell(Z, shell);
+    G4double bindingEnergy = atomicShell->BindingEnergy();
+
+    if(verboseLevel > 1) {
+      G4cout << "PostStep Z= " << Z << " shell= " << shell
+             << " bindingE(keV)= " << bindingEnergy/keV
+             << " finalE(keV)= " << finalKineticEnergy/keV
+             << G4endl;
+    }
+
+    // Fluorescence data start from element 6
+
+    if (finalKineticEnergy >= bindingEnergy
+         && (bindingEnergy >= minGammaEnergy
+         ||  bindingEnergy >= minElectronEnergy) ) {
+
+      G4int shellId = atomicShell->ShellId();
+      secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
+
+      if (secondaryVector != 0) {
+
+        nSecondaries = secondaryVector->size();
+        for (size_t i = 0; i<nSecondaries; i++) {
+
+          aSecondary = (*secondaryVector)[i];
+          if (aSecondary) {
+
+            G4double e = aSecondary->GetKineticEnergy();
+            type = aSecondary->GetDefinition();
+            if (e < finalKineticEnergy &&
+                 ((type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
+                  (type == G4Electron::Electron() && e > minElectronEnergy ))) {
+
+              finalKineticEnergy -= e;
+              totalNumber++;
+
+	    } else {
+
+              delete aSecondary;
+              (*secondaryVector)[i] = 0;
 	    }
 	  }
@@ -1328,5 +1343,5 @@
     }
   }
-  
+
   // Save delta-electrons
 
@@ -1386,24 +1401,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-
-
-void G4hLowEnergyIonisation::SelectShellIonisationCS(G4String val) {
-
-  if (shellCS) delete shellCS;
-
-  if (val == "empirical") {
-    shellCS = new G4empCrossSection();
-  }
- else {
-    shellCS = new G4teoCrossSection(val);
-  }
-}
-
-
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-
-std::vector<G4DynamicParticle*>* G4hLowEnergyIonisation::DeexciteAtom(const G4MaterialCutsCouple* couple,
+std::vector<G4DynamicParticle*>*
+G4hLowEnergyIonisation::DeexciteAtom(const G4MaterialCutsCouple* couple,
 				           G4double incidentEnergy,
 				           G4double hMass,
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4hLowEnergyLoss.cc,v 1.30 2009/07/23 09:15:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExp.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExp.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExp.cc	(revision 1228)
@@ -42,5 +42,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionDoubleExp.cc,v 1.10 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "globals.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc	(revision 1228)
@@ -34,5 +34,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionDoubleExpData.cc,v 1.5 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4hShellCrossSectionDoubleExpData.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc	(revision 1228)
@@ -42,5 +42,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionExp.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "globals.hh"
Index: trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc
===================================================================
--- trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc	(revision 1228)
@@ -34,5 +34,5 @@
 // -------------------------------------------------------------------
 // $Id: G4hShellCrossSectionExpData.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #include "G4hShellCrossSectionExpData.hh"
Index: trunk/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EnergyLossForExtrapolator.hh,v 1.12 2008/11/13 14:14:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBetheBlochModel.hh,v 1.18 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBremsstrahlung.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBremsstrahlungModel.hh,v 1.22 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuIonisation.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuMultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuMultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuMultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuMultipleScattering.hh,v 1.4 2009/10/30 18:37:06 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuPairProduction.hh,v 1.31 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuPairProductionModel.hh,v 1.28 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4EnergyLossForExtrapolator.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EnergyLossForExtrapolator.cc,v 1.19 2009/07/09 17:04:55 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBetheBlochModel.cc,v 1.27 2009/11/09 19:18:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBremsstrahlung.cc,v 1.42 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuBremsstrahlungModel.cc,v 1.35 2009/04/12 17:48:45 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuIonisation.cc,v 1.59 2009/02/26 11:04:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuMultipleScattering.cc,v 1.14 2009/10/30 18:37:06 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuPairProduction.cc,v 1.52 2009/02/20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuPairProductionModel.cc,v 1.44 2009/08/11 16:50:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationHelper.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizationHelper.hh,v 1.2 2007/11/01 17:30:25 schaelic Exp $
-// tag $Name: geant4-09-03-cand-01 $
+// tag $Name: geant4-09-03 $
 //
 // GEANT4 Class header file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationManager.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizationManager.hh,v 1.1 2006/09/21 21:35:10 vnivanch Exp $
-// tag $Name: geant4-09-03-cand-01 $
+// tag $Name: geant4-09-03 $
 //
 // GEANT4 Class header file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizationMessenger.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4PolarizationMessenger.hh,v 1.2 2006/12/13 15:44:33 gunter Exp $
-// tag $Name: geant4-09-03-cand-01 $
+// tag $Name: geant4-09-03 $
 //
 // GEANT4 Class header file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PolarizedAnnihilationCrossSection.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedAnnihilationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedAnnihilationModel.hh,v 1.3 2007/07/10 09:38:17 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBhabhaCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedBhabhaCrossSection.hh,v 1.2 2006/11/17 14:14:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedBremsstrahlungCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedBremsstrahlungCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedComptonCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedComptonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedComptonModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedGammaConversion.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedGammaConversionModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedGammaConversionModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerBhabhaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedMollerBhabhaModel.hh,v 1.3 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedMollerCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedMollerCrossSection.hh,v 1.3 2006/12/13 15:44:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPEEffectCrossSection.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPEEffectModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPEEffectModel.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPairProductionCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPairProductionCrossSection.hh,v 1.3 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPhotoElectricEffect.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPhotoElectricEffect.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4PolarizedPhotoElectricEffect.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedPhotoElectricEffect.hh,v 1.1 2007/11/01 17:29:09 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4StokesVector.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StokesVector.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class header file
Index: trunk/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4VPolarizedCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VPolarizedCrossSection.hh,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // File name:     G4VPolarizedCrossSection
Index: trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlung.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ePolarizedBremsstrahlung.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ePolarizedBremsstrahlungModel.hh,v 1.2 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4ePolarizedIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ePolarizedIonisation.hh,v 1.3 2007/06/11 13:37:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/include/G4eplusPolarizedAnnihilation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eplusPolarizedAnnihilation.hh,v 1.3 2007/06/11 13:37:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationHelper.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizationHelper.cc,v 1.5 2009/11/12 12:57:15 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizationManager.cc,v 1.1 2006/09/21 21:35:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationMessenger.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationMessenger.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizationMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizationMessenger.cc,v 1.1 2006/09/21 21:35:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 // -------------------------------------------------------------------
 // $Id: G4PolarizedAnnihilationCrossSection.cc,v 1.6 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedAnnihilationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedAnnihilationModel.cc,v 1.9 2009/11/12 12:57:15 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBhabhaCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedBhabhaCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedBremsstrahlungCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedBremsstrahlungCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedCompton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedCompton.cc,v 1.9 2008/10/30 22:34:23 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedComptonCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedComptonModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedComptonModel.cc,v 1.4 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversion.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedGammaConversion.cc,v 1.5 2008/10/30 22:34:23 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedGammaConversionModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedGammaConversionModel.cc,v 1.6 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerBhabhaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedMollerBhabhaModel.cc,v 1.4 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedMollerCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedMollerCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPEEffectCrossSection.cc,v 1.1 2007/11/01 17:29:09 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPEEffectModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPEEffectModel.cc,v 1.1 2007/11/01 17:29:09 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPairProductionCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPairProductionCrossSection.cc,v 1.5 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPhotoElectricEffect.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPhotoElectricEffect.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4PolarizedPhotoElectricEffect.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PolarizedPhotoElectricEffect.cc,v 1.3 2008/10/30 22:34:23 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4StokesVector.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4StokesVector.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4StokesVector.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StokesVector.cc,v 1.4 2009/11/12 12:57:15 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 Class file
Index: trunk/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4VPolarizedCrossSection.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VPolarizedCrossSection.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // File name:     G4VPolarizedCrossSection
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ePolarizedBremsstrahlung.cc,v 1.3 2007/05/23 08:52:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ePolarizedBremsstrahlungModel.cc,v 1.4 2007/11/01 17:32:34 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4ePolarizedIonisation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ePolarizedIonisation.cc,v 1.7 2008/10/30 22:34:23 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // -------------------------------------------------------------------
 //
Index: trunk/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc
===================================================================
--- trunk/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/polarisation/src/G4eplusPolarizedAnnihilation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eplusPolarizedAnnihilation.cc,v 1.8 2008/10/30 22:34:23 schaelic Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/History
===================================================================
--- trunk/source/processes/electromagnetic/standard/History	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.476 2009/11/11 23:22:27 vnivanch Exp $
+$Id: History,v 1.480 2009/12/03 17:28:28 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+03 December 09:  V.Ivant (emstand-V09-02-36)
+- G4BetheBlochModel - (A.Lechner) return back commented out CorrectionAlongStep
+                      method, returning back to normal ion ranges
+
+03 December 09:  V.Ivant (emstand-V09-02-35)
+- G4CoulombScatteringModel - (C.Consaldi) fixed relativistic formula
+
+27 November 09:  V.Ivant (emstand-V09-02-34)
+- G4ionIonisation - set linLossLimit 0.02 
+
+25 November 09:  V.Ivant (emstand-V09-02-33)
+- G4LindhardPartition - moved back to TestEm7 
 
 10 November 09:  V.Ivant (emstand-V09-02-32)
Index: trunk/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ASTARStopping.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ASTARStopping.hh,v 1.6 2008/11/13 12:04:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4ASTARStopping_h
Index: trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BetheBlochModel.hh,v 1.20 2009/04/23 17:44:43 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BetheHeitlerModel.hh,v 1.6 2007/05/22 17:34:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BohrFluctuations.hh,v 1.4 2009/02/19 19:17:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4BraggIonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BraggIonModel.hh,v 1.12 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4BraggModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BraggModel.hh,v 1.14 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ComptonScattering.hh,v 1.21 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //------------------ G4ComptonScattering physics process -----------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ComptonScattering52.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ComptonScattering52.hh,v 1.4 2007/05/16 14:00:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //------------------ G4ComptonScattering52 physics process -----------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4CoulombScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CoulombScattering.hh,v 1.13 2009/05/07 18:41:45 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4CoulombScatteringModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CoulombScatteringModel.hh,v 1.15 2008/07/31 13:11:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4GammaConversion.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4GammaConversion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaConversion.hh,v 1.23 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GoudsmitSaundersonMscModel.hh,v 1.2 2009/06/04 13:45:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonTable.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonTable.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonTable.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GoudsmitSaundersonTable.hh,v 1.3 2009/06/18 18:43:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4HeatedKleinNishinaCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4HeatedKleinNishinaCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4HeatedKleinNishinaCompton.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HeatedKleinNishinaCompton.hh,v 1.2 2009/04/11 13:05:03 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4ICRU49NuclearStoppingModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ICRU49NuclearStoppingModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ICRU49NuclearStoppingModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ICRU49NuclearStoppingModel.hh,v 1.2 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4InitXscPAI.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InitXscPAI.hh,v 1.8 2006/06/29 19:50:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4IonFluctuations.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonFluctuations.hh,v 1.9 2009/02/19 19:17:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4KleinNishinaCompton.hh,v 1.9 2007/05/22 17:34:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MollerBhabhaModel.hh,v 1.20 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4MscModel71.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4MscModel71.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4MscModel71.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MscModel71.hh,v 1.6 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MultipleScattering.hh,v 1.36 2008/03/10 10:39:21 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4MultipleScattering71.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -59,5 +59,5 @@
 //
 // $Id: G4MultipleScattering71.hh,v 1.6 2008/07/16 11:27:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 // class description
Index: trunk/source/processes/electromagnetic/standard/include/G4NuclearStopping.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4NuclearStopping.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4NuclearStopping.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NuclearStopping.hh,v 1.2 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4PAIModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PAIModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PAIModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PAIModel.hh,v 1.22 2009/02/19 19:17:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4PAIPhotonModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PAIPhotonModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PAIPhotonModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PAIPhotonModel.hh,v 1.12 2009/02/19 19:17:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PAIxSection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PAIxSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PAIxSection.hh,v 1.15 2008/05/30 16:04:40 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/include/G4PAIySection.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PAIySection.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PAIySection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PAIySection.hh,v 1.1 2007/10/01 17:45:14 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PEEffectModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PEEffectModel.hh,v 1.7 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PSTARStopping.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PSTARStopping.hh,v 1.5 2008/11/13 12:04:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4PSTARStopping_h
Index: trunk/source/processes/electromagnetic/standard/include/G4PairProductionRelModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PairProductionRelModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PairProductionRelModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PairProductionRelModel.hh,v 1.3 2009/06/04 13:45:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PhotoElectricEffect.hh,v 1.25 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedComptonScattering.hh,v 1.9 2006/06/29 19:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------- G4PolarizedComptonScattering physics process ----------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UniversalFluctuation.hh,v 1.10 2009/03/19 14:15:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel.hh,v 1.35 2009/04/29 13:30:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel2.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel2.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel2.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel2.hh,v 1.17 2009/05/15 09:26:42 urban Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel90.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel90.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel90.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel90.hh,v 1.6 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel92.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel92.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel92.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel92.hh,v 1.1 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel93.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel93.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4UrbanMscModel93.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel93.hh,v 1.1 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4WaterStopping.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4WaterStopping.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4WaterStopping.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4WaterStopping.hh,v 1.7 2009/06/19 10:39:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4WaterStopping_h
Index: trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4WentzelVIModel.hh,v 1.21 2009/10/10 15:16:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4alphaIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4alphaIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4alphaIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4alphaIonisation.hh,v 1.1 2009/11/10 11:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlung.hh,v 1.37 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungModel.hh,v 1.26 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungRelModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungRelModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eBremsstrahlungRelModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungRelModel.hh,v 1.11 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eCoulombScatteringModel.hh,v 1.49 2009/10/10 15:16:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisation.hh,v 1.36 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eMultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eMultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eMultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eMultipleScattering.hh,v 1.3 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToTwoGammaModel.hh,v 1.14 2007/05/23 08:47:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eplusAnnihilation.hh,v 1.24 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4hIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4hIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4hIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hIonisation.hh,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hMultipleScattering.hh,v 1.8 2009/11/01 13:04:12 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4ionGasIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ionGasIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ionGasIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ionGasIonisation.hh,v 1.4 2008/09/12 16:26:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/include/G4ionIonisation.hh
===================================================================
--- trunk/source/processes/electromagnetic/standard/include/G4ionIonisation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/include/G4ionIonisation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ionIonisation.hh,v 1.57 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ASTARStopping.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ASTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //---------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4BetheBlochModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BetheBlochModel.cc,v 1.34 2009/11/11 23:22:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BetheBlochModel.cc,v 1.36 2009/12/03 17:26:40 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -277,4 +277,12 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+/*
+void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple*,
+					     const G4DynamicParticle*,
+					     G4double&,
+					     G4double&,
+					     G4double)
+{}
+*/
 
 void G4BetheBlochModel::CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
@@ -293,27 +301,12 @@
     G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,e);
     GetModelOfFluctuations()->SetParticleAndCharge(p, q2);
-    eloss *= q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor; 
-    eloss += length*corr->IonHighOrderCorrections(p,couple,e);
-  }
-  /*
-  if(nuclearStopping && preKinEnergy*proton_mass_c2/mass < chargeSquare*100.*MeV) {
-
-    G4double nloss = length*corr->NuclearDEDX(p,mat,e,false);
-
-    // too big energy loss
-    if(eloss + nloss > preKinEnergy) {
-      nloss *= (preKinEnergy/(eloss + nloss));
-      eloss = preKinEnergy;
-    } else {
-      eloss += nloss;
-    }
-    
-    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
-    	   << " de= " << eloss << " NIEL= " << nloss 
-	   << " dynQ= " << dp->GetCharge()/eplus << G4endl;
-    
-    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
-  }
-  */
+    G4double qfactor = q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor;
+    G4double highOrder = length*corr->IonHighOrderCorrections(p,couple,e);
+    eloss *= qfactor; 
+    eloss += highOrder;
+    //G4cout << "G4BetheBlochModel::CorrectionsAlongStep: e= " << preKinEnergy
+    //	   << " qfactor= " << qfactor 
+    //	   << " highOrder= " << highOrder << " (" << highOrder/eloss << ")" << G4endl;    
+  }
 }
 
Index: trunk/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4BetheHeitlerModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BetheHeitlerModel.cc,v 1.13 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4BohrFluctuations.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BohrFluctuations.cc,v 1.8 2009/09/29 11:33:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4BraggIonModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BraggIonModel.cc,v 1.26 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BraggIonModel.cc,v 1.27 2009/11/22 18:00:23 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -263,30 +263,11 @@
   if(e < 0.0) e = preKinEnergy*0.5;
 
-  //G4cout << "G4BraggIonModel::CorrectionsAlongStep e= " <<  e << G4endl;
-
   G4double q2 = corr->EffectiveChargeSquareRatio(p,mat,e);
   GetModelOfFluctuations()->SetParticleAndCharge(p, q2);
-  eloss *= q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor; 
-  /*
-  if(nuclearStopping) {
-
-    G4double nloss = length*corr->NuclearDEDX(p,mat,e,false);
-
-    // too big energy loss
-    if(eloss + nloss > preKinEnergy) {
-      nloss *= (preKinEnergy/(eloss + nloss));
-      eloss = preKinEnergy;
-    } else {
-      eloss += nloss;
-    }
-    
-    G4cout << "G4ionIonisation::CorrectionsAlongStep: e= " << preKinEnergy
-    	   << " de= " << eloss << " NIEL= " << nloss 
-	   << " dynQ= " << dp->GetCharge()/eplus << G4endl;
-    
-    fParticleChange->ProposeNonIonizingEnergyDeposit(nloss);
-  }
-  */
-  //G4cout << "G4BraggIonModel::CorrectionsAlongStep end" << G4endl;
+  G4double qfactor = q2*corr->EffectiveChargeCorrection(p,mat,e)/corrFactor; 
+  eloss *= qfactor; 
+
+  //G4cout << "G4BraggIonModel::CorrectionsAlongStep e= " <<  e 
+  //	 << " qfactor= " << qfactor << " " << p->GetParticleName() <<G4endl;
 }
 
Index: trunk/source/processes/electromagnetic/standard/src/G4BraggModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4BraggModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4BraggModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BraggModel.cc,v 1.23 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ComptonScattering.cc,v 1.31 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ComptonScattering52.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ComptonScattering52.cc,v 1.7 2008/10/15 17:53:44 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4CoulombScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CoulombScattering.cc,v 1.25 2009/10/28 10:14:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4CoulombScatteringModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4CoulombScatteringModel.cc,v 1.43 2009/10/28 10:14:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CoulombScatteringModel.cc,v 1.44 2009/12/03 09:59:07 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -108,7 +108,12 @@
 
   //invbeta2 = 1.0 +  m12/mom2;
- 
-  G4double fm = m2/(mass + m2);
-  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  //  G4double fm = m2/(mass + m2);  
+
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2; 
+  //
 
   SetupTarget(Z, tkin);
@@ -158,6 +163,13 @@
 
   // a correction for heavy projectile
-  G4double fm = m2/(mass + m2);
-  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+  //  G4double fm = m2/(mass + m2);
+  //  invbeta2 = 1.0 +  m12*fm*fm/mom2;
+
+  // 03.09.2009 C.Consaldi
+  G4double Ecm=sqrt(m12 + m2*m2 + 2.0*etot*m2);
+  G4double mu_rel=mass*m2/Ecm;
+
+  invbeta2 = 1.0 +  mu_rel*mu_rel/mom2;
+  //
 
   // sample scattering angle in CM system
@@ -181,7 +193,7 @@
   fParticleChange->ProposeMomentumDirection(newDirection);   
 
-  //  G4double elab = gam*(eCM + bet*pzCM);
-
-  G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
+ //   G4double elab = gam*(eCM + bet*pzCM);
+
+ // G4double Ecm  = sqrt(mass*mass + m2*m2 + 2.0*etot*m2);
   G4double elab = etot - m2*(ptot/Ecm)*(ptot/Ecm)*(1.-cost) ;
 
@@ -211,3 +223,2 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-
Index: trunk/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4GammaConversion.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4GammaConversion.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GammaConversion.cc,v 1.31 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonMscModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonMscModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonMscModel.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4GoudsmitSaundersonMscModel.cc,v 1.19 2009/11/09 18:40:25 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4GoudsmitSaundersonMscModel.cc,v 1.20 2009/12/16 17:50:11 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonTable.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonTable.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4GoudsmitSaundersonTable.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4GoudsmitSaundersonTable.cc,v 1.4 2009/08/28 16:36:52 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4HeatedKleinNishinaCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4HeatedKleinNishinaCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4HeatedKleinNishinaCompton.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HeatedKleinNishinaCompton.cc,v 1.5 2009/04/12 17:09:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4ICRU49NuclearStoppingModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ICRU49NuclearStoppingModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ICRU49NuclearStoppingModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ICRU49NuclearStoppingModel.cc,v 1.2 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4InitXscPAI.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InitXscPAI.cc,v 1.9 2006/06/29 19:53:00 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4IonFluctuations.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4IonFluctuations.cc,v 1.26 2009/03/31 13:24:40 toshito Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4KleinNishinaCompton.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4KleinNishinaCompton.cc,v 1.10 2009/05/15 17:12:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4MollerBhabhaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MollerBhabhaModel.cc,v 1.35 2009/11/09 19:16:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4MscModel71.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4MscModel71.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4MscModel71.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MscModel71.cc,v 1.8 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MultipleScattering.cc,v 1.77 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering71.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MultipleScattering71.cc,v 1.5 2008/07/16 11:27:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4NuclearStopping.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4NuclearStopping.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4NuclearStopping.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NuclearStopping.cc,v 1.2 2009/11/10 19:25:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PAIModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PAIModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PAIModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PAIModel.cc,v 1.51 2009/08/12 21:28:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PAIPhotonModel.cc,v 1.23 2009/07/26 15:51:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PAIxSection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PAIxSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PAIxSection.cc,v 1.24 2008/05/30 16:04:40 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4PAIySection.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PAIySection.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PAIySection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PAIySection.cc,v 1.4 2009/07/26 15:51:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/standard/src/G4PEEffectModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PEEffectModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PEEffectModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PEEffectModel.cc,v 1.8 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PSTARStopping.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PSTARStopping.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PSTARStopping.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PSTARStopping.cc,v 1.8 2008/11/24 18:28:09 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //---------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PairProductionRelModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PairProductionRelModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PairProductionRelModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PairProductionRelModel.cc,v 1.3 2009/05/15 17:12:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PhotoElectricEffect.cc,v 1.42 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PolarizedComptonScattering.cc,v 1.18 2008/10/15 17:53:44 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UniversalFluctuation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UniversalFluctuation.cc,v 1.22 2009/03/20 18:11:23 urban Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UrbanMscModel.cc,v 1.91 2009/07/20 18:41:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel2.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel2.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel2.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UrbanMscModel2.cc,v 1.27 2009/07/20 18:41:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel90.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel90.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel90.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UrbanMscModel90.cc,v 1.13 2009/04/10 18:10:58 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel92.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel92.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel92.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UrbanMscModel92.cc,v 1.1 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel93.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel93.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel93.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UrbanMscModel93.cc,v 1.1 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4WaterStopping.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4WaterStopping.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4WaterStopping.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4WaterStopping.cc,v 1.18 2009/06/19 10:39:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //---------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4WentzelVIModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4WentzelVIModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4WentzelVIModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4WentzelVIModel.cc,v 1.37 2009/10/28 10:14:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4alphaIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4alphaIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4alphaIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4alphaIonisation.cc,v 1.1 2009/11/10 11:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlung.cc,v 1.56 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungModel.cc,v 1.44 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungRelModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungRelModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eBremsstrahlungRelModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eBremsstrahlungRelModel.cc,v 1.14 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eCoulombScatteringModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eCoulombScatteringModel.cc,v 1.78 2009/10/28 10:14:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eIonisation.cc,v 1.57 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eMultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eMultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eMultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eMultipleScattering.cc,v 1.10 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eeToTwoGammaModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eeToTwoGammaModel.cc,v 1.15 2009/04/09 18:41:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4eplusAnnihilation.cc,v 1.30 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4hIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hIonisation.cc,v 1.82 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4hMultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4hMultipleScattering.cc,v 1.16 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4ionGasIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ionGasIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ionGasIonisation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ionGasIonisation.cc,v 1.15 2009/11/10 11:50:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/standard/src/G4ionIonisation.cc
===================================================================
--- trunk/source/processes/electromagnetic/standard/src/G4ionIonisation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/standard/src/G4ionIonisation.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4ionIonisation.cc,v 1.66 2009/02/20 12:06:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4ionIonisation.cc,v 1.70 2009/11/27 20:06:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -89,5 +89,5 @@
     nuclearStopping(true)
 {
-  SetLinearLossLimit(0.15);
+  SetLinearLossLimit(0.02);
   SetStepFunction(0.1, 0.1*mm);
   SetIntegral(true);
Index: trunk/source/processes/electromagnetic/utils/History
===================================================================
--- trunk/source/processes/electromagnetic/utils/History	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.398 2009/11/11 23:59:48 vnivanch Exp $
+$Id: History,v 1.400 2009/11/22 19:48:30 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,10 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+23 November 09: V.Ivant (emutils-V09-02-24)
+G4EmConfigurator - fixed bug in selection of models
+
+22 November 09: V.Ivant (emutils-V09-02-23)
+G4EmCalculator - take into account CorrectionAlongStep for ions
 
 10 November 09: V.Ivant (emutils-V09-02-22)
Index: trunk/source/processes/electromagnetic/utils/include/G4AtomicShell.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4AtomicShell.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4AtomicShell.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AtomicShell.hh,v 1.1 2009/07/24 17:22:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4DummyModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4DummyModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4DummyModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DummyModel.hh,v 1.4 2009/04/07 18:39:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4ElectronIonPair.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ElectronIonPair.hh,v 1.2 2008/10/17 14:46:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4EmCalculator.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmCalculator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmCalculator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmCalculator.hh,v 1.19 2009/11/11 23:59:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4EmConfigurator.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmConfigurator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmConfigurator.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmConfigurator.hh,v 1.2 2008/11/21 12:30:29 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmCorrections.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmCorrections.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmCorrections.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmCorrections.hh,v 1.24 2008/09/12 14:44:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmElementSelector.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmElementSelector.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmElementSelector.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmElementSelector.hh,v 1.6 2009/09/29 11:31:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmModelManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmModelManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmModelManager.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmModelManager.hh,v 1.34 2009/08/11 10:29:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmMultiModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmMultiModel.hh,v 1.6 2007/05/22 17:31:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmProcessOptions.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmProcessOptions.hh,v 1.16 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4EmProcessSubType.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmProcessSubType.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmProcessSubType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmProcessSubType.hh,v 1.9 2008/12/18 13:01:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EmSaturation.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmSaturation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmSaturation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmSaturation.hh,v 1.7 2009/09/25 09:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4EmTableType.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EmTableType.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EmTableType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EmTableType.hh,v 1.4 2008/10/13 14:56:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyLossMessenger.hh,v 1.24 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyLossTables.hh,v 1.19 2006/06/29 19:54:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id:
Index: trunk/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4LossTableBuilder.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LossTableBuilder.hh,v 1.8 2008/07/22 15:55:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4LossTableManager.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4LossTableManager.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4LossTableManager.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LossTableManager.hh,v 1.55 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4MscStepLimitType.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4MscStepLimitType.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4MscStepLimitType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MscStepLimitType.hh,v 1.2 2007/06/11 14:56:51 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VAtomDeexcitation.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VAtomDeexcitation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VAtomDeexcitation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VAtomDeexcitation.hh,v 1.1 2009/07/09 11:42:52 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VEmFluctuationModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmFluctuationModel.hh,v 1.12 2009/02/19 11:25:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VEmModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmModel.hh,v 1.72 2009/09/23 14:42:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VEmProcess.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VEmProcess.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VEmProcess.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmProcess.hh,v 1.55 2009/09/23 14:42:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEnergyLoss.hh,v 1.18 2006/06/29 19:54:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VMscModel.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VMscModel.hh,v 1.9 2009/04/07 18:39:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4VMultipleScattering.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4VMultipleScattering.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4VMultipleScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VMultipleScattering.hh,v 1.62 2009/10/29 17:56:04 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh
===================================================================
--- trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ionEffectiveCharge.hh,v 1.12 2008/09/20 19:39:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4AtomicShell.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4AtomicShell.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4AtomicShell.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AtomicShell.cc,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
Index: trunk/source/processes/electromagnetic/utils/src/G4DummyModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4DummyModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4DummyModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DummyModel.cc,v 1.4 2009/04/07 18:39:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4ElectronIonPair.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4ElectronIonPair.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4ElectronIonPair.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ElectronIonPair.cc,v 1.2 2008/10/17 14:46:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmCalculator.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmCalculator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmCalculator.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4EmCalculator.cc,v 1.48 2009/11/11 23:59:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4EmCalculator.cc,v 1.49 2009/11/22 17:58:39 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -127,19 +127,21 @@
   if(couple && UpdateParticle(p, kinEnergy) ) {
     res = manager->GetDEDX(p, kinEnergy, couple);
-    /*
+    
     if(isIon) {
       if(FindEmModel(p, currentProcessName, kinEnergy)) {
-	G4double length = 1.*um;
-	G4cout << "### GetDEDX: E= " << kinEnergy << " res= " << res; 
+	G4double length = CLHEP::nm;
 	G4double eloss = res*length;
+	//G4cout << "### GetDEDX: E= " << kinEnergy << " dedx0= " << res 
+	//       << " de= " << eloss << G4endl;; 
 	G4double niel  = 0.0;
+        dynParticle.SetKineticEnergy(kinEnergy);
+        currentModel->GetChargeSquareRatio(p, mat, kinEnergy);
 	currentModel->CorrectionsAlongStep(couple,&dynParticle,eloss,niel,length);
 	res = eloss/length; 
-     
-	//G4cout << "### GetDEDX: E= " << kinEnergy << " res= " << res;  
-	G4cout << " res1= " << res << G4endl;;
+     	//G4cout << " de1= " << eloss << " res1= " << res 
+	//       << " " << p->GetParticleName() <<G4endl;;
       }
     } 
-    */
+    
     if(verbose>0) {
       G4cout << "G4EmCalculator::GetDEDX: E(MeV)= " << kinEnergy/MeV
@@ -466,11 +468,12 @@
 
       // low energy correction for ions
-      /*
       if(isIon) {
-        G4double length = 1.*nm;
+        G4double length = CLHEP::nm;
 	const G4Region* r = 0;
 	const G4MaterialCutsCouple* couple = FindCouple(mat, r);
         G4double eloss = res*length;
         G4double niel  = 0.0;
+        dynParticle.SetKineticEnergy(kinEnergy);
+        currentModel->GetChargeSquareRatio(p, mat, kinEnergy);
         currentModel->CorrectionsAlongStep(couple,&dynParticle,eloss,niel,length);
         res = eloss/length; 
@@ -482,5 +485,4 @@
 	}
       }
-      */
     }
       
@@ -971,9 +973,9 @@
 	  	 		         G4double kinEnergy)
 {
-  G4bool res = false;
+  isApplicable = false;
   if(!p) {
     G4cout << "G4EmCalculator::FindEmModel WARNING: no particle defined" 
 	   << G4endl;
-    return res;
+    return isApplicable;
   }
   G4String partname =  p->GetParticleName();
@@ -985,5 +987,5 @@
     G4cout << "G4EmCalculator::FindEmModel for " << partname
            << " (type= " << p->GetParticleType()
-           << ") and " << processName << " at e(MeV)= " << scaledEnergy;
+           << ") and " << processName << " at E(MeV)= " << scaledEnergy;
     if(p != part) G4cout << "  GenericIon is the base particle";       
     G4cout << G4endl;
@@ -1019,8 +1021,7 @@
   }
   if(elproc) {
-    isApplicable = true;
     currentModel = elproc->SelectModelForMaterial(scaledEnergy, idx);
     G4double eth = currentModel->LowEnergyLimit();
-    if(eth > 0.0) { loweModel = elproc->SelectModelForMaterial(eth-keV, idx); }       
+    loweModel = elproc->SelectModelForMaterial(eth - CLHEP::eV, idx);
   }
 
@@ -1035,6 +1036,5 @@
         currentModel = (vem[i])->SelectModelForMaterial(kinEnergy, idx);
 	G4double eth = currentModel->LowEnergyLimit();
-	if(eth > 0.0) { loweModel = (vem[i])->SelectModelForMaterial(eth-keV, idx); }       
-	isApplicable    = true;
+	loweModel = (vem[i])->SelectModelForMaterial(eth - CLHEP::eV, idx);
         break;
       }
@@ -1053,12 +1053,22 @@
         currentModel = (vmsc[i])->SelectModelForMaterial(kinEnergy, idx);
 	G4double eth = currentModel->LowEnergyLimit();
-	if(eth > 0.0) { loweModel = (vmsc[i])->SelectModelForMaterial(eth-keV, idx); }       
-	isApplicable    = true;
+	loweModel = (vmsc[i])->SelectModelForMaterial(eth - CLHEP::eV, idx);  
         break;
       }
     }
   }
-  if(currentModel) res = true;
-  return res;
+  if(currentModel) {
+    if(loweModel == currentModel) { loweModel = 0; }
+    isApplicable = true;
+    if(verbose > 1) {
+      G4cout << "Model <" << currentModel->GetName() 
+	     << "> Emin(MeV)= " << currentModel->LowEnergyLimit()/MeV;
+      if(loweModel) { 
+	G4cout << " LowEnergy model <" << loweModel->GetName() << ">"; 
+      }
+      G4cout << G4endl;
+    } 
+  }
+  return isApplicable;
 }
 
Index: trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmConfigurator.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4EmConfigurator.cc,v 1.5 2009/07/20 17:06:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4EmConfigurator.cc,v 1.6 2009/11/22 19:48:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -67,5 +67,5 @@
 G4EmConfigurator::G4EmConfigurator()
 {
-  index = 1;
+  index = -10;
 }
 
@@ -156,5 +156,5 @@
 
   // new set
-  index--;
+  --index;
 
   G4ParticleTable::G4PTblDicIterator* theParticleIterator = 
@@ -258,5 +258,5 @@
 	  mod->SetHighEnergyLimit(e2);
 
-	  //G4cout << "e1= " << e1 << " e2= " << e2 << G4endl;
+	  //G4cout << "index= " << index << " e1= " << e1 << " e2= " << e2 << G4endl;
 
 	  // added model
@@ -270,4 +270,6 @@
 	    p->AddEmModel(index,mod,reg);
 	  } else if(ptype == msc) {
+	    //G4cout << "### Added msc model order= " << index << " for " 
+	    //	   << particleName << " and " << processName << "  " << mod << G4endl;
 	    G4VMultipleScattering* p = static_cast<G4VMultipleScattering*>(proc);
 	    p->AddEmModel(index,mod,reg);
Index: trunk/source/processes/electromagnetic/utils/src/G4EmCorrections.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmCorrections.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmCorrections.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmCorrections.cc,v 1.54 2009/10/29 17:56:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmElementSelector.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmElementSelector.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmElementSelector.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmElementSelector.cc,v 1.11 2009/09/29 11:31:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmModelManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmModelManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmModelManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmModelManager.cc,v 1.58 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmMultiModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmMultiModel.cc,v 1.6 2007/05/22 17:31:58 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmProcessOptions.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmProcessOptions.cc,v 1.27 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EmSaturation.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EmSaturation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EmSaturation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EmSaturation.cc,v 1.10 2009/09/25 09:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyLossMessenger.cc,v 1.38 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyLossTables.cc,v 1.34 2008/07/08 10:57:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4LossTableBuilder.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LossTableBuilder.cc,v 1.32 2009/08/11 17:24:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4LossTableManager.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4LossTableManager.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4LossTableManager.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LossTableManager.cc,v 1.97 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VEmFluctuationModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmFluctuationModel.cc,v 1.4 2009/02/19 11:25:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VEmModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmModel.cc,v 1.30 2009/09/23 14:42:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEmProcess.cc,v 1.79 2009/11/10 20:30:55 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEnergyLoss.cc,v 1.46 2006/06/29 19:55:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VEnergyLossProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VEnergyLossProcess.cc,v 1.158 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VMscModel.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VMscModel.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VMscModel.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VMscModel.cc,v 1.13 2009/07/20 17:32:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VMultipleScattering.cc,v 1.77 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc
===================================================================
--- trunk/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/utils/src/G4ionEffectiveCharge.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ionEffectiveCharge.cc,v 1.25 2009/10/29 16:57:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Cerenkov.hh,v 1.11 2009/07/29 23:45:02 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ForwardXrayTR.hh,v 1.14 2006/06/29 19:55:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4ForwardXrayTR -- header file
Index: trunk/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4GammaXTRadiator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaXTRadiator.hh,v 1.4 2006/06/29 19:55:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4RegularXTRadiator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularXTRadiator.hh,v 1.3 2006/06/29 19:55:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4Scintillation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4Scintillation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Scintillation.hh,v 1.16 2009/07/29 23:45:20 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4StrawTubeXTRadiator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StrawTubeXTRadiator.hh,v 1.4 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SynchrotronRadiation.hh,v 1.4 2006/06/29 19:55:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4SynchrotronRadiationInMat.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SynchrotronRadiationInMat.hh,v 1.2 2006/06/29 19:55:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransitionRadiation.hh,v 1.9 2006/06/29 19:55:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4TransitionRadiation  -- header file
Index: trunk/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4TransparentRegXTRadiator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransparentRegXTRadiator.hh,v 1.2 2006/06/29 19:55:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/include/G4VTRModel.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4VTRModel.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4VTRModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTRModel.hh,v 1.3 2006/06/29 19:55:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VTRModel  -- header file
Index: trunk/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4VTransitionRadiation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTransitionRadiation.hh,v 1.3 2006/06/29 19:55:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VTransitionRadiation  -- header file
Index: trunk/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh
===================================================================
--- trunk/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/include/G4VXTRenergyLoss.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VXTRenergyLoss.hh,v 1.24 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Cerenkov.cc,v 1.26 2008/11/14 20:16:51 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ForwardXrayTR.cc,v 1.14 2007/05/11 14:23:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4ForwardXrayTR class -- implementation file
Index: trunk/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4GammaXTRadiator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaXTRadiator.cc,v 1.5 2006/06/29 19:56:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4RegularXTRadiator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RegularXTRadiator.cc,v 1.9 2006/06/29 19:56:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4Scintillation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4Scintillation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Scintillation.cc,v 1.30 2008/10/22 01:19:11 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4StrawTubeXTRadiator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StrawTubeXTRadiator.cc,v 1.6 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SynchrotronRadiation.cc,v 1.5 2006/06/29 19:56:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4SynchrotronRadiationInMat.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SynchrotronRadiationInMat.cc,v 1.2 2006/06/29 19:56:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransitionRadiation.cc,v 1.7 2006/06/29 19:56:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4TransitionRadiation class -- implementation file
Index: trunk/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4TransparentRegXTRadiator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TransparentRegXTRadiator.cc,v 1.11 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4VTransitionRadiation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTransitionRadiation.cc,v 1.5 2006/06/29 19:56:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VTransitionRadiation class -- implementation file
Index: trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc
===================================================================
--- trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc	(revision 1227)
+++ trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VXTRenergyLoss.cc,v 1.44 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // History:
Index: trunk/source/processes/hadronic/cross_sections/History
===================================================================
--- trunk/source/processes/hadronic/cross_sections/History	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/History	(revision 1228)
@@ -14,4 +14,25 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+9 Dec 2009 Gunter Folger       (hadr-cross-V09-02-18)
+------------------------------------------------------------
+- G4TripathiLightCrossSection.cc modified by Macrus Mendenhall:
+   - re-enable low energy check code, but without creating new instances of 
+      G4TripathiLightCrossSection
+
+2 Dec 2009 Vladimir Ivanchenko (hadr-cross-V09-02-17)
+------------------------------------------------------------
+- G4CrossSectionDataSetRegistry - more accurate cross section deletion
+
+25 Nov 2009 Gunter Folger       (hadr-cross-V09-02-16)
+------------------------------------------------------------
+- modify upper limit of validity to 100 TeV in 
+  G4NeutronInelasticCrossSection, G4ProtonInelasticCrossSection,
+  and G4PiNuclearCrossSection
+  Use constant cross section above original range
+
+23 Nov 2009 Vladimir Ivanchenko (hadr-cross-V09-02-15)
+------------------------------------------------------------
+- fixed mistake in previous tag
 
 20 Nov 2009 Vladimir Ivanchenko (hadr-cross-V09-02-14)
Index: trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonElasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonElasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonElasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BGGNucleonElasticXS.hh,v 1.5 2009/11/19 11:41:30 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonInelasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonInelasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4BGGNucleonInelasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BGGNucleonInelasticXS.hh,v 1.6 2009/11/19 11:44:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4BGGPionElasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4BGGPionElasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4BGGPionElasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BGGPionElasticXS.hh,v 1.5 2009/11/19 11:46:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4BGGPionInelasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4BGGPionInelasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4BGGPionInelasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4BGGPionInelasticXS.hh,v 1.5 2009/11/19 11:47:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataSetRegistry.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataSetRegistry.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataSetRegistry.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionDataSetRegistry.hh,v 1.3 2009/08/08 16:21:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionDataStore.hh,v 1.14 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4ElectroNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/include/G4GGNuclNuclCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4GGNuclNuclCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4GGNuclNuclCrossSection.hh	(revision 1228)
@@ -92,20 +92,8 @@
   G4double GetHadronNucleonXscPDG(const G4DynamicParticle*, G4double At, G4double Zt);
 
-
-
-
   // G4double GetHadronNucleonXscNS(const G4DynamicParticle*, const G4Element*);
   // G4double GetHadronNucleonXscNS(const G4DynamicParticle*,G4double At, G4double Zt);
 
-
-
-
   G4double GetHadronNucleonXscNS(G4ParticleDefinition*,G4double pTkin, G4ParticleDefinition*);
-
-
-
-
-
-
 
   // G4double GetHNinelasticXsc(const G4DynamicParticle*, const G4Element*);
@@ -113,7 +101,4 @@
 
   G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4double At, G4double Zt);
-
-  G4double GetHadronNucleonXscMK(G4ParticleDefinition* pParticle, G4double pTkin, 
-				 G4ParticleDefinition* nucleon  ); 
 
   G4double CalculateEcmValue ( const G4double , const G4double , const G4double ); 
Index: trunk/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4GlauberGribovCrossSection.hh	(revision 1228)
@@ -98,6 +98,4 @@
   G4double GetHNinelasticXsc(const G4DynamicParticle*, G4double At, G4double Zt);
   G4double GetHNinelasticXscVU(const G4DynamicParticle*, G4double At, G4double Zt);
-  G4double GetHadronNucleonXscMK(const G4DynamicParticle* aParticle, 
-				 const G4ParticleDefinition* nucleon  ); 
 
   G4double CalculateEcmValue ( const G4double , const G4double , const G4double ); 
Index: trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/include/G4HadronNucleonXsc.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4HadronNucleonXsc.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4HadronNucleonXsc.hh	(revision 1228)
@@ -61,7 +61,4 @@
   G4bool IsZAApplicable(const G4DynamicParticle* aDP, G4double Z, G4double A);
 
-
-
-
   virtual
   void DumpPhysicsTable(const G4ParticleDefinition&) 
@@ -77,6 +74,4 @@
 
   G4double GetHadronNucleonXscVU(const G4DynamicParticle*, const G4ParticleDefinition*);
-
-  G4double GetHadronNucleonXscMK(const G4DynamicParticle*, const G4ParticleDefinition*);
 
   // kinematics and set/get
Index: trunk/source/processes/hadronic/cross_sections/include/G4NeutronCaptureXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4NeutronCaptureXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4NeutronCaptureXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronCaptureXS.hh,v 1.1 2009/11/12 00:36:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4NeutronElasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4NeutronElasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4NeutronElasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronElasticXS.hh,v 1.3 2009/11/19 11:51:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh	(revision 1228)
@@ -26,4 +26,5 @@
 // by JPW, working, but to be cleaned up. @@@@
 // D. Wright, 23-Dec-2006 Added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
@@ -51,5 +52,5 @@
      G4bool result = false;
      if(( aPart->GetDefinition()==G4Neutron::Neutron()) &&
-        ( aPart->GetKineticEnergy()<20*GeV) &&
+        ( aPart->GetKineticEnergy()<100*TeV) &&
           aPart->GetKineticEnergy()>19.9*MeV) result = true;
      if(aEle->GetZ()<2) result = false;
@@ -62,5 +63,5 @@
      G4bool result = false;
      if(( aPart->GetDefinition() == G4Neutron::Neutron()) &&
-        ( aPart->GetKineticEnergy() < 20*GeV) &&
+        ( aPart->GetKineticEnergy() < 100*TeV) &&
           aPart->GetKineticEnergy() > 19.9*MeV) result = true;
      if(ZZ < 2) result = false;
Index: trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticXS.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticXS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4NeutronInelasticXS.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronInelasticXS.hh,v 1.3 2009/11/19 11:52:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/include/G4PhotoNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4PhotoNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4PhotoNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/include/G4PiNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4PiNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4PiNuclearCrossSection.hh	(revision 1228)
@@ -48,5 +48,5 @@
     if(aParticle->GetDefinition() == G4PionPlus::PionPlus())   result=true;
     if(G4lrint(anElement->GetZ()) == 1) result = false;
-    if(aParticle->GetKineticEnergy() > 999.9*GeV) result=false;
+    if(aParticle->GetKineticEnergy() > 99.9*TeV) result=false;
     return result;
   }
@@ -59,5 +59,5 @@
     if(particle->GetDefinition() == G4PionPlus::PionPlus())   result=true;
     if(G4lrint(ZZ) == 1) result = false;
-    if(particle->GetKineticEnergy() > 999.9*GeV) result=false;
+    if(particle->GetKineticEnergy() > 99.9*TeV) result=false;
     return result;
   }
Index: trunk/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh	(revision 1228)
@@ -27,4 +27,5 @@
 // G.Folger, 29-sept-2006: extend to 1TeV, using a constant above 20GeV
 // D. Wright, 23-Dec-2006: added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
@@ -56,5 +57,5 @@
      G4bool result = false;
      if(( aPart->GetDefinition()==G4Proton::Proton()) &&
-        ( aPart->GetKineticEnergy()<1*TeV) ) result = true;
+        ( aPart->GetKineticEnergy()<100*TeV) ) result = true;
      if(aEle->GetZ()<3) result = false;
      return result;
@@ -66,5 +67,5 @@
      G4bool result = false;
      if (( aParticle->GetDefinition() == G4Proton::Proton()) &&
-         ( aParticle->GetKineticEnergy() < 1*TeV) ) result = true;
+         ( aParticle->GetKineticEnergy() < 100*TeV) ) result = true;
      if (ZZ < 3) result = false;
      return result;
Index: trunk/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
===================================================================
--- trunk/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VCrossSectionDataSet.hh,v 1.13 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonElasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonElasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonElasticXS.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BGGNucleonElasticXS.cc,v 1.5 2009/11/19 12:30:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BGGNucleonElasticXS.cc,v 1.7 2009/11/19 19:40:45 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -93,13 +93,10 @@
   } else if(iz == 1) {
     if( A < 1.5) {
-      //fHadron->GetHadronNucleonXscPDG(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscEL(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetElasticHadronNucleonXsc();
     } else {
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetElasticHadronNucleonXsc();
-      fHadron->GetHadronNucleonXscMK(dp, G4Neutron::Neutron());
+      fHadron->GetHadronNucleonXscNS(dp, G4Neutron::Neutron());
       cross += fHadron->GetElasticHadronNucleonXsc();
     }
@@ -180,5 +177,5 @@
   }
   dp.SetKineticEnergy(fLowEnergy);
-  fHadron->GetHadronNucleonXscMK(&dp, G4Proton::Proton());
+  fHadron->GetHadronNucleonXscNS(&dp, G4Proton::Proton());
   theCoulombFac[1] = fHadron->GetElasticHadronNucleonXsc();
   if(isProton) { theCoulombFac[1] /= CoulombFactor(fLowEnergy, 1.0); }
Index: trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonInelasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonInelasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4BGGNucleonInelasticXS.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BGGNucleonInelasticXS.cc,v 1.5 2009/11/19 12:28:56 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BGGNucleonInelasticXS.cc,v 1.7 2009/11/19 19:40:45 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -91,14 +91,10 @@
   } else if(iz == 1) {
     if( A < 1.5) {
-      //fHadron->GetHadronNucleonXscPDG(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscEL(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscVU(dp, G4Proton::Proton());
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetInelasticHadronNucleonXsc();
     } else {
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetInelasticHadronNucleonXsc();
-      fHadron->GetHadronNucleonXscMK(dp, G4Neutron::Neutron());
+      fHadron->GetHadronNucleonXscNS(dp, G4Neutron::Neutron());
       cross += fHadron->GetInelasticHadronNucleonXsc();
     }
@@ -180,5 +176,5 @@
   }
   dp.SetKineticEnergy(fLowEnergy);
-  fHadron->GetHadronNucleonXscMK(&dp, G4Proton::Proton());
+  fHadron->GetHadronNucleonXscNS(&dp, G4Proton::Proton());
   theCoulombFac[1] = 
     fHadron->GetInelasticHadronNucleonXsc()/CoulombFactor(fLowEnergy,1.0);
Index: trunk/source/processes/hadronic/cross_sections/src/G4BGGPionElasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4BGGPionElasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4BGGPionElasticXS.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BGGPionElasticXS.cc,v 1.5 2009/11/19 12:27:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BGGPionElasticXS.cc,v 1.7 2009/11/19 19:40:45 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -93,9 +93,5 @@
   } else if(iz == 1) {
     if( A < 1.5) {
-      //fHadron->GetHadronNucleonXscPDG(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscEL(dp, G4Proton::Proton());
       fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscVU(dp, G4Proton::Proton());
-      //fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
       cross = fHadron->GetElasticHadronNucleonXsc();
     } else {
Index: trunk/source/processes/hadronic/cross_sections/src/G4BGGPionInelasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4BGGPionInelasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4BGGPionInelasticXS.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4BGGPionInelasticXS.cc,v 1.6 2009/11/19 12:24:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4BGGPionInelasticXS.cc,v 1.8 2009/11/19 19:40:45 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -94,10 +94,10 @@
 
     if( A < 1.5) {
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetInelasticHadronNucleonXsc();
     } else {
-      fHadron->GetHadronNucleonXscMK(dp, G4Proton::Proton());
+      fHadron->GetHadronNucleonXscNS(dp, G4Proton::Proton());
       cross = fHadron->GetInelasticHadronNucleonXsc();
-      fHadron->GetHadronNucleonXscMK(dp, G4Neutron::Neutron());
+      fHadron->GetHadronNucleonXscNS(dp, G4Neutron::Neutron());
       cross += fHadron->GetInelasticHadronNucleonXsc();
     }
Index: trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataSetRegistry.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataSetRegistry.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataSetRegistry.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CrossSectionDataSetRegistry.cc,v 1.5 2009/08/12 20:25:10 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CrossSectionDataSetRegistry.cc,v 1.6 2009/12/02 15:59:59 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -67,5 +67,9 @@
   if(n > 0) {
     for (size_t i=0; i<n; ++i) {
-      if(xSections[i]) delete xSections[i];
+      if(xSections[i]) {
+	G4VCrossSectionDataSet* p = xSections[i];
+	xSections[i] = 0;
+	delete p;
+      }
     }
     xSections.clear();
@@ -79,5 +83,5 @@
   if(n > 0) {
     for (size_t i=0; i<n; ++i) {
-      if(xSections[i] == p) return;
+      if(xSections[i] == p) { return; }
     }
   }
@@ -93,5 +97,5 @@
       if(xSections[i] == p) {
         xSections[i] = 0;
-	if(i == n-1) xSections.pop_back();
+	if(i == n-1) { xSections.pop_back(); }
 	return;
       }
Index: trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CrossSectionDataStore.cc,v 1.16 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElectroNuclearCrossSection.cc,v 1.29 2008/10/24 19:15:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4GGNuclNuclCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4GGNuclNuclCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4GGNuclNuclCrossSection.cc	(revision 1228)
@@ -164,6 +164,9 @@
     // production to be checked !!! edit MK xsc
 
-    sigma = (pZ*tZ+pN*tN)*GetHadronNucleonXscMK(theProton, pTkin, theProton) +
-          (pZ*tN+pN*tZ)*GetHadronNucleonXscMK(theProton, pTkin, theNeutron);
+    //sigma = (pZ*tZ+pN*tN)*GetHadronNucleonXscMK(theProton, pTkin, theProton) +
+    //      (pZ*tN+pN*tZ)*GetHadronNucleonXscMK(theProton, pTkin, theNeutron);
+
+    sigma = (pZ*tZ+pN*tN)*GetHadronNucleonXscNS(theProton, pTkin, theProton) +
+          (pZ*tN+pN*tZ)*GetHadronNucleonXscNS(theProton, pTkin, theNeutron);
  
     ratio = sigma/nucleusSquare;
@@ -588,6 +591,6 @@
   if(Nt < 0.) Nt = 0.;
   
-  sumInelastic  = Zt*GetHadronNucleonXscMK(aParticle, theProton);
-  sumInelastic += Nt*GetHadronNucleonXscMK(aParticle, theNeutron);    
+  sumInelastic  = Zt*GetHadronNucleonXscNS(aParticle, theProton);
+  sumInelastic += Nt*GetHadronNucleonXscNS(aParticle, theNeutron);    
  
   return sumInelastic;
@@ -652,134 +655,4 @@
 
   return Xinelastic*= millibarn;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-//
-// Returns hadron-nucleon cross-section based on Mikhail Kossov CHIPS parametrisation of
-// data from G4QuasiFreeRatios class
-
-G4double 
-G4GGNuclNuclCrossSection::GetHadronNucleonXscMK(G4ParticleDefinition* pParticle, G4double pTkin,
-                                                G4ParticleDefinition* nucleon  )
-{
-  G4int I = -1;
-  G4int PDG = pParticle->GetPDGEncoding();
-  G4double totalXsc = 0;
-  G4double elasticXsc = 0;
-  G4double inelasticXsc;
-  // G4int absPDG = std::abs(PDG);
-
-  G4double pM = pParticle->GetPDGMass();
-  G4double p  = std::sqrt(pTkin*(pTkin+2*pM))/GeV;
-
-  G4bool F = false;            
-  if(nucleon == theProton)       F = true;
-  else if(nucleon == theNeutron) F = false;
-  else
-  {
-    G4cout << "nucleon is not proton or neutron, return xsc for proton" << G4endl;
-    F = true;
-  }
-
-  G4bool kfl = true;                             // Flag of K0/aK0 oscillation
-  G4bool kf  = false;
-
-  if( PDG == 130 || PDG == 310 )
-  {
-    kf = true;
-    if( G4UniformRand() > .5 ) kfl = false;
-  }
-  if     ( (PDG == 2212 && F) || (PDG == 2112 && !F) ) I = 0; // pp/nn
-  else if( (PDG == 2112 && F) || (PDG == 2212 && !F) ) I = 1; // np/pn
-  else
-  {
-    G4cout<<"MK PDG = "<<PDG
-          <<", while it is defined only for p,n,hyperons,anti-baryons,pi,K/antiK"<<G4endl;
-    G4Exception("G4QuasiFreeRatio::FetchElTot:","22",FatalException,"CHIPScrash");
-  }
-
-  // Each parameter set can have not more than nPoints = 128 parameters
-
-  static const G4double lmi = 3.5;       // min of (lnP-lmi)^2 parabola
-  static const G4double pbe = .0557;     // elastic (lnP-lmi)^2 parabola coefficient
-  static const G4double pbt = .3;        // total (lnP-lmi)^2 parabola coefficient
-  static const G4double pmi = .1;        // Below that fast LE calculation is made
-  static const G4double pma = 1000.;     // Above that fast HE calculation is made
-                  
-  if( p <= 0.)
-  {
-    G4cout<<" p = "<<p<<" is zero or negative"<<G4endl;
-
-    elasticXsc   = 0.;
-    inelasticXsc = 0.;
-    totalXsc     = 0.;
-
-    return totalXsc;
-  }
-  if (!I)                          // pp/nn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      elasticXsc          = 1./(.00012 + p2*.2);
-      totalXsc          = elasticXsc;
-    }
-    else if(p>pma)
-    {
-      G4double lp  = std::log(p)-lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = pbe*lp2 + 6.72;
-      totalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*.2);
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      elasticXsc  = LE + ( pbe*lp2 + 6.72+32.6/p)/( 1. + rp2/p);
-      totalXsc    = LE + ( pbt*lp2 + 38.2+52.7*rp2)/( 1. + 2.72*rp2*rp2);
-    }
-  }
-  else if( I==1 )                        // np/pn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      elasticXsc = 1./( .00012 + p2*( .051 + .1*p2));
-      totalXsc   = elasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = pbe*lp2 + 6.72;
-      totalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*( .051 + .1*p2 ) );
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      elasticXsc  = LE + (pbe*lp2 + 6.72 + 30./p)/( 1. + .49*rp2/p);
-      totalXsc    = LE + (pbt*lp2 + 38.2)/( 1. + .54*rp2*rp2);
-    }
-  }
-  else
-  {
-    G4cout<<"PDG incoding = "<<I<<" is not defined (0-1)"<<G4endl;
-  
-  }
-  if( elasticXsc > totalXsc ) elasticXsc = totalXsc;
-
-  totalXsc   *= millibarn;
-  elasticXsc *= millibarn;
-  inelasticXsc   = totalXsc - elasticXsc;
-  if (inelasticXsc < 0.) inelasticXsc = 0.;
-
-  return inelasticXsc;
 }
 
@@ -940,12 +813,5 @@
   }
   return R;
-
-
-
-}
-
-
-
-
+}
 
 
Index: trunk/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4GlauberGribovCrossSection.cc	(revision 1228)
@@ -355,5 +355,5 @@
   else
   {
-    sigma        = GetHadronNucleonXscPDG(aParticle, A, Z);
+    sigma        = GetHadronNucleonXscNS(aParticle, A, Z);
     cofInelastic = 2.2;
     cofTotal     = 2.0;
@@ -418,5 +418,5 @@
   else
   {
-    sigma        = GetHadronNucleonXscPDG(aParticle, A, Z);
+    sigma        = GetHadronNucleonXscNS(aParticle, A, Z);
     cofInelastic = 2.2;
     cofTotal     = 2.0;
@@ -460,5 +460,5 @@
   else
   {
-    sigma        = GetHadronNucleonXscPDG(aParticle, A, Z);
+    sigma        = GetHadronNucleonXscNS(aParticle, A, Z);
     cofInelastic = 2.2;
     cofTotal     = 2.0;
@@ -1070,6 +1070,8 @@
   else
   {
-    sumInelastic  = Zt*GetHadronNucleonXscMK(aParticle, theProton);
-    sumInelastic += Nt*GetHadronNucleonXscMK(aParticle, theNeutron);    
+    //sumInelastic  = Zt*GetHadronNucleonXscMK(aParticle, theProton);
+    // sumInelastic += Nt*GetHadronNucleonXscMK(aParticle, theNeutron);    
+    sumInelastic  = Zt*GetHadronNucleonXscNS(aParticle, 1.0, 1.0);
+    sumInelastic += Nt*GetHadronNucleonXscNS(aParticle, 1.0, 0.0);    
   } 
   return sumInelastic;
@@ -1289,322 +1291,4 @@
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-//
-// Returns hadron-nucleon cross-section based on Mikhail Kossov CHIPS parametrisation of
-// data from G4QuasiFreeRatios class
-
-G4double 
-G4GlauberGribovCrossSection::GetHadronNucleonXscMK(const G4DynamicParticle* aParticle, 
-                                          const G4ParticleDefinition* nucleon  )
-{
-  G4int I = -1;
-  G4int PDG = aParticle->GetDefinition()->GetPDGEncoding();
-  G4double totalXsc = 0;
-  G4double elasticXsc = 0;
-  G4double inelasticXsc;
-  // G4int absPDG = std::abs(PDG);
-
-  G4double p = aParticle->GetMomentum().mag()/GeV;
-
-  G4bool F = false;            
-  if(nucleon == theProton)       F = true;
-  else if(nucleon == theNeutron) F = false;
-  else
-  {
-    G4cout << "nucleon is not proton or neutron, return xsc for proton" << G4endl;
-    F = true;
-  }
-
-  G4bool kfl = true;                             // Flag of K0/aK0 oscillation
-  G4bool kf  = false;
-
-  if( PDG == 130 || PDG == 310 )
-  {
-    kf = true;
-    if( G4UniformRand() > .5 ) kfl = false;
-  }
-  if     ( (PDG == 2212 && F) || (PDG == 2112 && !F) ) I = 0; // pp/nn
-  else if( (PDG == 2112 && F) || (PDG == 2212 && !F) ) I = 1; // np/pn
-
-  else if( (PDG == -211 && F) || (PDG == 211  && !F) ) I = 2; // pimp/pipn
-  else if( (PDG == 211  && F) || (PDG ==-211  && !F) ) I = 3; // pipp/pimn
-
-  else if( PDG == -321 || PDG == -311 || ( kf && !kfl ) ) I = 4; // KmN/K0N
-  else if( PDG == 321  || PDG == 311  || ( kf && kfl  ) ) I = 5; // KpN/aK0N
-
-  else if( PDG > 3000 && PDG < 3335)   I = 6;        // @@ for all hyperons - take Lambda
-  else if( PDG < -2000 && PDG > -3335) I = 7;        // @@ for all anti-baryons - anti-p/anti-n
-  else
-  {
-    G4cout<<"MK PDG = "<<PDG
-          <<", while it is defined only for p,n,hyperons,anti-baryons,pi,K/antiK"<<G4endl;
-    G4Exception("G4QuasiFreeRatio::FetchElTot:","22",FatalException,"CHIPScrash");
-  }
-
-  // Each parameter set can have not more than nPoints = 128 parameters
-
-  static const G4double lmi = 3.5;       // min of (lnP-lmi)^2 parabola
-  static const G4double pbe = .0557;     // elastic (lnP-lmi)^2 parabola coefficient
-  static const G4double pbt = .3;        // total (lnP-lmi)^2 parabola coefficient
-  static const G4double pmi = .1;        // Below that fast LE calculation is made
-  static const G4double pma = 1000.;     // Above that fast HE calculation is made
-                  
-  if( p <= 0.)
-  {
-    G4cout<<" p = "<<p<<" is zero or negative"<<G4endl;
-
-    elasticXsc   = 0.;
-    inelasticXsc = 0.;
-    totalXsc     = 0.;
-
-    return totalXsc;
-  }
-  if (!I)                          // pp/nn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      elasticXsc          = 1./(.00012 + p2*.2);
-      totalXsc          = elasticXsc;
-    }
-    else if(p>pma)
-    {
-      G4double lp  = std::log(p)-lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = pbe*lp2 + 6.72;
-      totalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*.2);
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      elasticXsc  = LE + ( pbe*lp2 + 6.72+32.6/p)/( 1. + rp2/p);
-      totalXsc    = LE + ( pbt*lp2 + 38.2+52.7*rp2)/( 1. + 2.72*rp2*rp2);
-    }
-  }
-  else if( I==1 )                        // np/pn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      elasticXsc = 1./( .00012 + p2*( .051 + .1*p2));
-      totalXsc   = elasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = pbe*lp2 + 6.72;
-      totalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*( .051 + .1*p2 ) );
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      elasticXsc  = LE + (pbe*lp2 + 6.72 + 30./p)/( 1. + .49*rp2/p);
-      totalXsc    = LE + (pbt*lp2 + 38.2)/( 1. + .54*rp2*rp2);
-    }
-  }
-  else if( I == 2 )                        // pimp/pipn
-  {
-    G4double lp = std::log(p);
-
-    if(p<pmi)
-    {
-      G4double lr = lp + 1.27;
-      elasticXsc          = 1.53/( lr*lr + .0676);
-      totalXsc          = elasticXsc*3;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      elasticXsc  = pbe*ld2 + 2.4 + 7./sp;
-      totalXsc    = pbt*ld2 + 22.3 + 12./sp;
-    }
-    else
-    {
-      G4double lr  = lp + 1.27;
-      G4double LE  = 1.53/( lr*lr + .0676);
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      G4double lm  = lp + .36;
-      G4double md  = lm*lm + .04;
-      G4double lh  = lp - .017;
-      G4double hd  = lh*lh + .0025;
-      elasticXsc  = LE + (pbe*ld2 + 2.4 + 7./sp)/( 1. + .7/p4) + .6/md + .05/hd;
-      totalXsc    = LE*3 + (pbt*ld2 + 22.3 + 12./sp)/(1. + .4/p4) + 1./md + .06/hd;
-    }
-  }
-  else if( I == 3 )                        // pipp/pimn
-  {
-    G4double lp = std::log(p);
-
-    if( p < pmi )
-    {
-      G4double lr  = lp + 1.27;
-      G4double lr2 = lr*lr;
-      elasticXsc  = 13./( lr2 + lr2*lr2 + .0676);
-      totalXsc    = elasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      elasticXsc  = pbe*ld2 + 2.4 + 6./sp;
-      totalXsc    = pbt*ld2 + 22.3 + 5./sp;
-    }
-    else
-    {
-      G4double lr  = lp + 1.27;
-      G4double lr2 = lr*lr;
-      G4double LE  = 13./(lr2 + lr2*lr2 + .0676);
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      G4double lm  = lp - .32;
-      G4double md  = lm*lm + .0576;
-      elasticXsc  = LE + (pbe*ld2 + 2.4 + 6./sp)/(1. + 3./p4) + .7/md;
-      totalXsc    = LE + (pbt*ld2 + 22.3 + 5./sp)/(1. + 1./p4) + .8/md;
-    }
-  }
-  else if( I == 4 )                        // Kmp/Kmn/K0p/K0n
-  {
-    if( p < pmi)
-    {
-      G4double psp = p*std::sqrt(p);
-      elasticXsc  = 5.2/psp;
-      totalXsc    = 14./psp;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      elasticXsc           = pbe*ld2 + 2.23;
-      totalXsc           = pbt*ld2 + 19.5;
-    }
-    else
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      G4double psp = p*sp;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double lm  = p - .39;
-      G4double md  = lm*lm + .000156;
-      G4double lh  = p - 1.;
-      G4double hd  = lh*lh + .0156;
-      elasticXsc  = 5.2/psp + (pbe*ld2 + 2.23)/(1. - .7/sp + .075/p4) + .004/md + .15/hd;
-      totalXsc    = 14./psp + (pbt*ld2 + 19.5)/(1. - .21/sp + .52/p4) + .006/md + .30/hd;
-    }
-  }
-  else if( I == 5 )                        // Kpp/Kpn/aKp/aKn
-  {
-    if( p < pmi )
-    {
-      G4double lr = p - .38;
-      G4double lm = p - 1.;
-      G4double md = lm*lm + .372;   
-      elasticXsc = .7/(lr*lr + .0676) + 2./md;
-      totalXsc   = elasticXsc + .6/md;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      elasticXsc           = pbe*ld2 + 2.23;
-      totalXsc           = pbt*ld2 + 19.5;
-    }
-    else
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      G4double lr  = p - .38;
-      G4double LE  = .7/(lr*lr + .0676);
-      G4double sp  = std::sqrt(p);
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double lm  = p - 1.;
-      G4double md  = lm*lm + .372;
-      elasticXsc  = LE + (pbe*ld2 + 2.23)/(1. - .7/sp + .1/p4) + 2./md;
-      totalXsc    = LE + (pbt*ld2 + 19.5)/(1. + .46/sp + 1.6/p4) + 2.6/md;
-    }
-  }
-  else if( I == 6 )                        // hyperon-N
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      elasticXsc = 1./(.002 + p2*(.12 + p2));
-      totalXsc   = elasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double sp  = std::sqrt(p);
-      elasticXsc  = (pbe*lp2 + 6.72)/(1. + 2./sp);
-      totalXsc    = (pbt*lp2 + 38.2 + 900./sp)/(1. + 27./sp);
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./(.002 + p2*(.12 + p2));
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      elasticXsc  = LE + (pbe*lp2 + 6.72 + 99./p2)/(1. + 2./sp + 2./p4);
-      totalXsc    = LE + (pbt*lp2 + 38.2 + 900./sp)/(1. + 27./sp + 3./p4);
-    }
-  }
-  else if( I == 7 )                        // antibaryon-N
-  {
-    if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = pbe*lp2 + 6.72;
-      totalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double ye  = std::pow(p, 1.25);
-      G4double yt  = std::pow(p, .35);
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      elasticXsc  = 80./(ye + 1.) + pbe*lp2 + 6.72;
-      totalXsc    = (80./yt + .3)/yt +pbt*lp2 + 38.2;
-    }
-  }
-  else
-  {
-    G4cout<<"PDG incoding = "<<I<<" is not defined (0-7)"<<G4endl;
-  
-  }
-  if( elasticXsc > totalXsc ) elasticXsc = totalXsc;
-
-  totalXsc   *= millibarn;
-  elasticXsc *= millibarn;
-  inelasticXsc   = totalXsc - elasticXsc;
-  if (inelasticXsc < 0.) inelasticXsc = 0.;
-
-  return inelasticXsc;
-}
-
 ////////////////////////////////////////////////////////////////////////////////////
 //
@@ -1618,5 +1302,4 @@
   G4double oneThird = 1.0/3.0;
   G4double cubicrAt = std::pow (At, oneThird); 
-
 
   G4double R;  // = fRadiusConst*cubicrAt;
@@ -1638,8 +1321,4 @@
   R = fRadiusConst*cubicrAt;
 
-  // return R;  // !!!!
-
-
-  
   G4double meanA  = 21.;
 
@@ -1679,5 +1358,4 @@
   G4double cubicrAt = std::pow (At, oneThird); 
 
-
   G4double R;  // = fRadiusConst*cubicrAt;
 
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronCaptureDataSet.cc,v 1.8 2006/06/29 19:57:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronElasticDataSet.cc,v 1.8 2006/06/29 19:57:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronFissionDataSet.cc,v 1.8 2006/06/29 19:57:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronInelasticDataSet.cc,v 1.8 2006/06/29 19:57:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc	(revision 1228)
@@ -883,325 +883,4 @@
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-//
-// Returns hadron-nucleon cross-section based on Mikhail Kossov parametrisation of
-// data from G4QuasiFreeRatios class
-
-G4double 
-G4HadronNucleonXsc::GetHadronNucleonXscMK(const G4DynamicParticle* aParticle, 
-                                          const G4ParticleDefinition* nucleon  )
-{
-  G4int I = -1;
-  G4int PDG = aParticle->GetDefinition()->GetPDGEncoding();
-
-  // G4int absPDG = std::abs(PDG);
-
-  G4double p = aParticle->GetMomentum().mag()/GeV;
-
-  G4bool F = false;            
-  if(nucleon == theProton)       F = true;
-  else if(nucleon == theNeutron) F = false;
-  else
-  {
-    G4cout << "nucleon is not proton or neutron, return xsc for proton" << G4endl;
-    F = true;
-  }
-
-  G4bool kfl = true;                             // Flag of K0/aK0 oscillation
-  G4bool kf  = false;
-
-  if( PDG == 130 || PDG == 310 )
-  {
-    kf = true;
-    if( G4UniformRand() > .5 ) kfl = false;
-  }
-  if     ( (PDG == 2212 && F) || (PDG == 2112 && !F) ) I = 0; // pp/nn
-  else if( (PDG == 2112 && F) || (PDG == 2212 && !F) ) I = 1; // np/pn
-
-  else if( (PDG == -211 && F) || (PDG == 211  && !F) ) I = 2; // pimp/pipn
-  else if( (PDG == 211  && F) || (PDG ==-211  && !F) ) I = 3; // pipp/pimn
-
-  else if( PDG == -321 || PDG == -311 || ( kf && !kfl ) ) I = 4; // KmN/K0N
-  else if( PDG == 321  || PDG == 311  || ( kf && kfl  ) ) I = 5; // KpN/aK0N
-
-  else if( PDG > 3000 && PDG < 3335)   I = 6;        // @@ for all hyperons - take Lambda
-  else if( PDG < -2000 && PDG > -3335) I = 7;        // @@ for all anti-baryons - anti-p/anti-n
-  else
-  {
-    G4cout<<"MK PDG = "<<PDG
-          <<", while it is defined only for p,n,hyperons,anti-baryons,pi,K/antiK"<<G4endl;
-    G4Exception("G4QuasiFreeRatio::FetchElTot:","22",FatalException,"CHIPScrash");
-  }
-
-  // Each parameter set can have not more than nPoints = 128 parameters
-
-  static const G4double lmi = 3.5;       // min of (lnP-lmi)^2 parabola
-  static const G4double pbe = .0557;     // elastic (lnP-lmi)^2 parabola coefficient
-  static const G4double pbt = .3;        // total (lnP-lmi)^2 parabola coefficient
-  static const G4double pmi = .1;        // Below that fast LE calculation is made
-  static const G4double pma = 1000.;     // Above that fast HE calculation is made
-                  
-  if( p <= 0.)
-  {
-    G4cout<<" p = "<<p<<" is zero or negative"<<G4endl;
-
-    fElasticXsc   = 0.;
-    fInelasticXsc = 0.;
-    fTotalXsc     = 0.;
-
-    return fTotalXsc;
-  }
-  if (!I)                          // pp/nn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      fElasticXsc          = 1./(.00012 + p2*.2);
-      fTotalXsc          = fElasticXsc;
-    }
-    else if(p>pma)
-    {
-      G4double lp  = std::log(p)-lmi;
-      G4double lp2 = lp*lp;
-      fElasticXsc  = pbe*lp2 + 6.72;
-      fTotalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*.2);
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      fElasticXsc  = LE + ( pbe*lp2 + 6.72+32.6/p)/( 1. + rp2/p);
-      fTotalXsc    = LE + ( pbt*lp2 + 38.2+52.7*rp2)/( 1. + 2.72*rp2*rp2);
-    }
-  }
-  else if( I==1 )                        // np/pn
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      fElasticXsc = 1./( .00012 + p2*( .051 + .1*p2));
-      fTotalXsc   = fElasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      fElasticXsc  = pbe*lp2 + 6.72;
-      fTotalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./( .00012 + p2*( .051 + .1*p2 ) );
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double rp2 = 1./p2;
-      fElasticXsc  = LE + (pbe*lp2 + 6.72 + 30./p)/( 1. + .49*rp2/p);
-      fTotalXsc    = LE + (pbt*lp2 + 38.2)/( 1. + .54*rp2*rp2);
-    }
-  }
-  else if( I == 2 )                        // pimp/pipn
-  {
-    G4double lp = std::log(p);
-
-    if(p<pmi)
-    {
-      G4double lr = lp + 1.27;
-      fElasticXsc          = 1.53/( lr*lr + .0676);
-      fTotalXsc          = fElasticXsc*3;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      fElasticXsc  = pbe*ld2 + 2.4 + 7./sp;
-      fTotalXsc    = pbt*ld2 + 22.3 + 12./sp;
-    }
-    else
-    {
-      G4double lr  = lp + 1.27;
-      G4double LE  = 1.53/( lr*lr + .0676);
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      G4double lm  = lp + .36;
-      G4double md  = lm*lm + .04;
-      G4double lh  = lp - .017;
-      G4double hd  = lh*lh + .0025;
-      fElasticXsc  = LE + (pbe*ld2 + 2.4 + 7./sp)/( 1. + .7/p4) + .6/md + .05/hd;
-      fTotalXsc    = LE*3 + (pbt*ld2 + 22.3 + 12./sp)/(1. + .4/p4) + 1./md + .06/hd;
-    }
-  }
-  else if( I == 3 )                        // pipp/pimn
-  {
-    G4double lp = std::log(p);
-
-    if( p < pmi )
-    {
-      G4double lr  = lp + 1.27;
-      G4double lr2 = lr*lr;
-      fElasticXsc  = 13./( lr2 + lr2*lr2 + .0676);
-      fTotalXsc    = fElasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      fElasticXsc  = pbe*ld2 + 2.4 + 6./sp;
-      fTotalXsc    = pbt*ld2 + 22.3 + 5./sp;
-    }
-    else
-    {
-      G4double lr  = lp + 1.27;
-      G4double lr2 = lr*lr;
-      G4double LE  = 13./(lr2 + lr2*lr2 + .0676);
-      G4double ld  = lp - lmi;
-      G4double ld2 = ld*ld;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      G4double lm  = lp - .32;
-      G4double md  = lm*lm + .0576;
-      fElasticXsc  = LE + (pbe*ld2 + 2.4 + 6./sp)/(1. + 3./p4) + .7/md;
-      fTotalXsc    = LE + (pbt*ld2 + 22.3 + 5./sp)/(1. + 1./p4) + .8/md;
-    }
-  }
-  else if( I == 4 )                        // Kmp/Kmn/K0p/K0n
-  {
-    if( p < pmi)
-    {
-      G4double psp = p*std::sqrt(p);
-      fElasticXsc  = 5.2/psp;
-      fTotalXsc    = 14./psp;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      fElasticXsc           = pbe*ld2 + 2.23;
-      fTotalXsc           = pbt*ld2 + 19.5;
-    }
-    else
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      G4double sp  = std::sqrt(p);
-      G4double psp = p*sp;
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double lm  = p - .39;
-      G4double md  = lm*lm + .000156;
-      G4double lh  = p - 1.;
-      G4double hd  = lh*lh + .0156;
-      fElasticXsc  = 5.2/psp + (pbe*ld2 + 2.23)/(1. - .7/sp + .075/p4) + .004/md + .15/hd;
-      fTotalXsc    = 14./psp + (pbt*ld2 + 19.5)/(1. - .21/sp + .52/p4) + .006/md + .30/hd;
-    }
-  }
-  else if( I == 5 )                        // Kpp/Kpn/aKp/aKn
-  {
-    if( p < pmi )
-    {
-      G4double lr = p - .38;
-      G4double lm = p - 1.;
-      G4double md = lm*lm + .372;   
-      fElasticXsc = .7/(lr*lr + .0676) + 2./md;
-      fTotalXsc   = fElasticXsc + .6/md;
-    }
-    else if( p > pma )
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      fElasticXsc           = pbe*ld2 + 2.23;
-      fTotalXsc           = pbt*ld2 + 19.5;
-    }
-    else
-    {
-      G4double ld  = std::log(p) - lmi;
-      G4double ld2 = ld*ld;
-      G4double lr  = p - .38;
-      G4double LE  = .7/(lr*lr + .0676);
-      G4double sp  = std::sqrt(p);
-      G4double p2  = p*p;
-      G4double p4  = p2*p2;
-      G4double lm  = p - 1.;
-      G4double md  = lm*lm + .372;
-      fElasticXsc  = LE + (pbe*ld2 + 2.23)/(1. - .7/sp + .1/p4) + 2./md;
-      fTotalXsc    = LE + (pbt*ld2 + 19.5)/(1. + .46/sp + 1.6/p4) + 2.6/md;
-    }
-  }
-  else if( I == 6 )                        // hyperon-N
-  {
-    if( p < pmi )
-    {
-      G4double p2 = p*p;
-      fElasticXsc = 1./(.002 + p2*(.12 + p2));
-      fTotalXsc   = fElasticXsc;
-    }
-    else if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double sp  = std::sqrt(p);
-      fElasticXsc  = (pbe*lp2 + 6.72)/(1. + 2./sp);
-      fTotalXsc    = (pbt*lp2 + 38.2 + 900./sp)/(1. + 27./sp);
-    }
-    else
-    {
-      G4double p2  = p*p;
-      G4double LE  = 1./(.002 + p2*(.12 + p2));
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      G4double p4  = p2*p2;
-      G4double sp  = std::sqrt(p);
-      fElasticXsc  = LE + (pbe*lp2 + 6.72 + 99./p2)/(1. + 2./sp + 2./p4);
-      fTotalXsc    = LE + (pbt*lp2 + 38.2 + 900./sp)/(1. + 27./sp + 3./p4);
-    }
-  }
-  else if( I == 7 )                        // antibaryon-N
-  {
-    if( p > pma )
-    {
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      fElasticXsc  = pbe*lp2 + 6.72;
-      fTotalXsc    = pbt*lp2 + 38.2;
-    }
-    else
-    {
-      G4double ye  = std::pow(p, 1.25);
-      G4double yt  = std::pow(p, .35);
-      G4double lp  = std::log(p) - lmi;
-      G4double lp2 = lp*lp;
-      fElasticXsc  = 80./(ye + 1.) + pbe*lp2 + 6.72;
-      fTotalXsc    = (80./yt + .3)/yt +pbt*lp2 + 38.2;
-    }
-  }
-  else
-  {
-    G4cout<<"PDG incoding = "<<I<<" is not defined (0-7)"<<G4endl;
-  
-  }
-  if( fElasticXsc > fTotalXsc ) fElasticXsc = fTotalXsc;
-
-  fTotalXsc   *= millibarn;
-  fElasticXsc *= millibarn;
-  fInelasticXsc   = fTotalXsc - fElasticXsc;
-  if (fInelasticXsc < 0.) fInelasticXsc = 0.;
-
-
-  return fTotalXsc;
-}
-
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////////
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4NeutronCaptureXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4NeutronCaptureXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4NeutronCaptureXS.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronCaptureXS.cc,v 1.2 2009/11/19 12:36:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4NeutronElasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4NeutronElasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4NeutronElasticXS.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronElasticXS.cc,v 1.3 2009/11/19 12:01:54 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc	(revision 1228)
@@ -26,4 +26,5 @@
 // By JPW, working, but to be cleaned up. @@@
 // 22 Dec 2006 - DHW added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
@@ -64,4 +65,8 @@
 GetCrossSection(G4double anEnergy, G4double atomicNumber, G4double nOfProtons)
 {
+  if (anEnergy > 19.9*GeV ) 
+  { // constant cross section above ~20GeV.
+    return  GetCrossSection(19.8*GeV,atomicNumber,nOfProtons);
+  } 
   G4double kineticEnergy = std::log10(DBL_MIN/MeV);
   if (anEnergy > DBL_MIN/MeV) kineticEnergy = std::log10(anEnergy/MeV);
Index: trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticXS.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticXS.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4NeutronInelasticXS.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronInelasticXS.cc,v 1.3 2009/11/19 12:00:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4PhotoNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/cross_sections/src/G4PiData.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4PiData.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4PiData.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc	(revision 1228)
@@ -43,5 +43,5 @@
   .02, .04, .06, .08,  .1, .12, .13, .14, .15, .16, .17, .18, .19, .20, 
   .22, .24, .26, .28, .30, .35, .40, .45,  0.5, 0.55, 0.6, 0.7,  0.8,  0.9,
-   1,   2,   3,   5,  10,   20,   50,  100,  500, 1000};
+   1,   2,   3,   5,  10,   20,   50,  100,  500, 100000};
 
  const G4double G4PiNuclearCrossSection::he_t[38] = { 
@@ -76,5 +76,5 @@
   .02, .04, .06, .08, .10, .11, .12, .13, .14,  .15, .16, .17, .18, .20, .22,
   .24, .26, .28, .30, .35, .40, .45, .50, .55, .575, .60, .70, .80, .90,   1,   
-    2,   3,   5,  10,  20,  50, 100, 500, 1000};
+    2,   3,   5,  10,  20,  50, 100, 500, 100000};
 
  const G4double G4PiNuclearCrossSection::c_m_t[39] = {
@@ -117,5 +117,5 @@
   .02, .04, .06, .08, .10, .12, .14, .16, .18, .20, .22, .25, .30, .35, .40, 
   .45, .50, .60, .70, .80, .90,   1,   2,   3,   5,  10,  20,  50, 100, 500, 
-  1000};
+  100000};
 
  const G4double G4PiNuclearCrossSection::o_m_t[31] = {
@@ -158,5 +158,5 @@
   0.02, 0.04, 0.06, 0.08, 0.10, 0.12, 0.14, 0.16, 0.18, 0.20, 0.22, 0.25, 0.30, 0.35, 0.40,
   0.45, 0.50, 0.60, 0.70, 0.80, 0.90,    1,    2,    3,    5,   10,   20,   50,  100,  500,
-  1000};
+  100000};
 
  const G4double G4PiNuclearCrossSection::al_m_t[31] = { 
@@ -200,5 +200,5 @@
   0.02, 0.04, 0.06, 0.08, 0.10, 0.12, 0.14, 0.16, 0.18, 0.20, 0.22, 0.25, 0.30, 0.35, 0.40, 
   0.45, 0.50, 0.55, 0.60, 0.70, 0.80, 0.90,    1,    2,    3,    5,   10,   20,   50,  100,
-   500, 1000};
+   500, 100000};
 
  const G4double G4PiNuclearCrossSection::fe_m_t[32] = {1175, 1363, 1670, 1950, 2050, 2040, 1975, 1886, 1834, 1773, 1720, 1635, 1474, 1380, 1269, 1225, 1182, 1162, 1159, 1162, 1178, 1190, 1197, 1102, 1135,  975,  945,  925,  905,  905,  905,  905};
@@ -214,5 +214,5 @@
   0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.10, 0.12, 0.14, 0.16, 0.18, 0.20, 0.22, 0.25,
   0.30, 0.35, 0.40, 0.45, 0.50, 0.60, 0.70, 0.80, 0.90,    1,    2,    3,    5,   10,   20,
-    50,  100,  500, 1000};
+    50,  100,  500, 100000};
 
  const G4double G4PiNuclearCrossSection::mo_m_t[34] = {2430, 2610, 2710, 2790, 2880, 2940, 2965, 2970, 2970, 2920, 2840, 2720, 2570, 2500, 2365, 2200, 2050, 1926, 1825, 1768, 1749, 1750, 1778, 1789, 1808, 1690, 1645, 1530, 1492, 1450, 1425, 1425, 1425, 1425};
@@ -228,5 +228,5 @@
   0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.10, 0.12, 0.14, 0.16, 0.18, 0.20, 0.22, 0.25,  
   0.30, 0.35, 0.40, 0.45, 0.50, 0.55, 0.60, 0.70, 0.80, 0.90,    1,    2,    3,    5,   10,   
-    20,   50,  100,  500, 1000};
+    20,   50,  100,  500, 100000};
 
  const G4double G4PiNuclearCrossSection::sn_m_t[35] =  {3000, 3180, 3250, 3300, 3300, 3410, 3470, 3450, 3410, 3350, 3280, 3200, 3120, 3050, 2900, 2630, 2500, 2325, 2190, 2100, 2060, 2055, 2055, 2055, 2067, 2085, 2000, 1900, 1835, 1770, 1720, 1700, 1695, 1695, 1695};
@@ -242,5 +242,5 @@
   0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.10, 0.12, 0.14, 0.16, 0.18, 0.20, 0.22, 0.25, 
   0.30, 0.35, 0.40, 0.45, 0.50, 0.55, 0.60, 0.70, 0.80, 0.90,    1,    2,    3,    5,   10,
-    20,   50,  100,  500, 1000};
+    20,   50,  100,  500, 100000};
 
  const G4double G4PiNuclearCrossSection::pb_m_t[35] = {
Index: trunk/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc	(revision 1228)
@@ -27,4 +27,5 @@
 // G.Folger, 29-sept-2006: extend to 1TeV, using a constant above 20GeV
 // 22 Dec 2006 - DHW added isotope dependence
+// G.Folger, 25-Nov-2009: extend to 100TeV, using a constant above 20GeV
 //
 
Index: trunk/source/processes/hadronic/cross_sections/src/G4TripathiLightCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4TripathiLightCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4TripathiLightCrossSection.cc	(revision 1228)
@@ -153,7 +153,4 @@
   pT = pT + pP;
   G4double E_cm = (pT.mag()-mT-pP.m())/MeV;
-  if(E_cm <= DBL_MIN) return result;  
-
-
 //
 //
@@ -172,6 +169,5 @@
 
   G4double B = 1.44 * ZP * ZT / Radius;
-  if(E_cm <= B) return result; 
-
+//
 //
 // Now determine other parameters associated with the parametric
@@ -291,9 +287,8 @@
            std::pow((std::pow(AT,third) + std::pow(AP,third) + deltaE),2.0) *
            (1.0 - R_c*B/E_cm) * X_m;
-  if(result < 0.0) result = 0.0;
-  /*
   if (!lowEnergyCheck)
   {
-    if (result < 0.0)  result = 0.0;
+    if (result < 0.0)
+      result = 0.0;
     else if (E < 6.0*MeV)
     {
@@ -301,13 +296,15 @@
       G4DynamicParticle slowerProjectile = *theProjectile;
       slowerProjectile.SetKineticEnergy(f * EA * MeV);
-      G4TripathiLightCrossSection theTripathiLightCrossSection;
-      theTripathiLightCrossSection.SetLowEnergyCheck(true);
+      // G4TripathiLightCrossSection theTripathiLightCrossSection; // MHM 20090824 Not needed
+	  // theTripathiLightCrossSection.SetLowEnergyCheck(true);
+	  G4bool savelowenergy=lowEnergyCheck;
+	  SetLowEnergyCheck(true);
       G4double resultp =
-        theTripathiLightCrossSection.GetIsoZACrossSection
-        (&slowerProjectile, ZZ, AA, 0.0);
+        GetIsoZACrossSection(&slowerProjectile, ZZ, AA, 0.0);
+	  SetLowEnergyCheck(savelowenergy);
       if (resultp >result) result = 0.0;
     }
   }
-  */
+
   return result;
 }
Index: trunk/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VCrossSectionDataSet.cc,v 1.8 2009/01/24 11:54:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/management/History
===================================================================
--- trunk/source/processes/hadronic/management/History	(revision 1227)
+++ trunk/source/processes/hadronic/management/History	(revision 1228)
@@ -14,4 +14,8 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+2 December 2009 Vladimir Ivanchenko (hadr-man-V09-02-05)
+---------------------------------------------------------
+- G4HadronicProcessStore - added protection to the Clean method 
 
 25 February 2009 Vladimir Ivanchenko (hadr-man-V09-02-04)
Index: trunk/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
===================================================================
--- trunk/source/processes/hadronic/management/include/G4EnergyRangeManager.hh	(revision 1227)
+++ trunk/source/processes/hadronic/management/include/G4EnergyRangeManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyRangeManager.hh,v 1.9 2006/06/29 19:58:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Energy Range Manager
Index: trunk/source/processes/hadronic/management/include/G4HadLeadBias.hh
===================================================================
--- trunk/source/processes/hadronic/management/include/G4HadLeadBias.hh	(revision 1227)
+++ trunk/source/processes/hadronic/management/include/G4HadLeadBias.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/processes/hadronic/management/include/G4HadronicProcessStore.hh
===================================================================
--- trunk/source/processes/hadronic/management/include/G4HadronicProcessStore.hh	(revision 1227)
+++ trunk/source/processes/hadronic/management/include/G4HadronicProcessStore.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronicProcessStore.hh,v 1.5 2009/02/15 16:50:15 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/management/include/G4HadronicProcessType.hh
===================================================================
--- trunk/source/processes/hadronic/management/include/G4HadronicProcessType.hh	(revision 1227)
+++ trunk/source/processes/hadronic/management/include/G4HadronicProcessType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronicProcessType.hh,v 1.1 2008/10/02 19:02:03 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh
===================================================================
--- trunk/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh	(revision 1227)
+++ trunk/source/processes/hadronic/management/include/G4VLeadingParticleBiasing.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VLeadingParticleBiasing.hh,v 1.6 2006/06/29 19:58:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------------
Index: trunk/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
===================================================================
--- trunk/source/processes/hadronic/management/src/G4EnergyRangeManager.cc	(revision 1227)
+++ trunk/source/processes/hadronic/management/src/G4EnergyRangeManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EnergyRangeManager.cc,v 1.15 2006/06/29 19:58:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Energy Range Manager
Index: trunk/source/processes/hadronic/management/src/G4HadronicProcessStore.cc
===================================================================
--- trunk/source/processes/hadronic/management/src/G4HadronicProcessStore.cc	(revision 1227)
+++ trunk/source/processes/hadronic/management/src/G4HadronicProcessStore.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4HadronicProcessStore.cc,v 1.12 2009/02/25 16:29:03 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4HadronicProcessStore.cc,v 1.13 2009/12/02 15:56:02 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -92,6 +92,7 @@
         //G4cout << "G4HadronicProcessStore::Clean() delete hadronic " << i << G4endl;
 	//G4cout <<  process[i]->GetProcessName() << G4endl;
-	delete process[i];
+	G4HadronicProcess* p = process[i]; 
 	process[i] = 0;
+	delete p;
       }
     }
@@ -103,6 +104,7 @@
 	//       << i << G4endl;
 	//G4cout << extraProcess[i]->GetProcessName() << G4endl;
-	delete extraProcess[i];
+	G4VProcess* p = extraProcess[i]; 
         extraProcess[i] = 0;
+	delete p;
       }
     }
@@ -362,5 +364,5 @@
   if(0 < n_proc) {
     for(G4int i=0; i<n_proc; i++) {
-      if(process[i] == proc) return;
+      if(process[i] == proc) { return; }
     }
   }
Index: trunk/source/processes/hadronic/models/abrasion/include/G4WilsonAbrasionModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/abrasion/include/G4WilsonAbrasionModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/abrasion/include/G4WilsonAbrasionModel.hh	(revision 1228)
@@ -40,6 +40,6 @@
 // MODULE:              G4WilsonAbrasionModel.hh
 //
-// Version:		B.1
-// Date:		15/04/04
+// Version:		1.0
+// Date:		08/12/2009
 // Author:		P R Truscott
 // Organisation:	QinetiQ Ltd, UK
@@ -57,4 +57,8 @@
 // 15 March 2004, P R Truscott, QinetiQ Ltd, UK
 // Beta release
+//
+// 08 December 2009, P R Truscott, QinetiQ Ltd, Ltd
+// ver 1.0
+// Variable fradius defined. See .cc file for more details.
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -119,4 +123,5 @@
     G4double               B;
     G4double               third;
+    G4double               fradius;
 };
 ////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/hadronic/models/abrasion/src/G4WilsonAbrasionModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/abrasion/src/G4WilsonAbrasionModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/abrasion/src/G4WilsonAbrasionModel.cc	(revision 1228)
@@ -38,6 +38,6 @@
 // MODULE:              G4WilsonAbrasionModel.cc
 //
-// Version:		B.2
-// Date:		18/01/05
+// Version:		1.0
+// Date:		08/12/2009
 // Author:		P R Truscott
 // Organisation:	QinetiQ Ltd, UK
@@ -60,4 +60,19 @@
 // handler deleted to prevent memory leaks.  Also particle change of projectile
 // fragment previously not properly defined.
+//
+// 08 December 2009, P R Truscott, QinetiQ Ltd, Ltd
+// ver 1.0
+// There was originally a possibility of the minimum impact parameter AFTER
+// considering Couloumb repulsion, rm, being too large.  Now if:
+//     rm >= fradius * (rP + rT)
+// where fradius is currently 0.99, then it is assumed the primary track is
+// unchanged.  Additional conditions to escape from while-loop over impact
+// parameter: if the loop counter evtcnt reaches 1000, the primary track is
+// continued.
+// Additional clauses have been included in
+//    G4WilsonAbrasionModel::GetNucleonInducedExcitation
+// Previously it was possible to get sqrt of negative number as Wilson algorithm
+// not properly defined if either:
+//    rT > rP && rsq < rTsq - rPsq) or (rP > rT && rsq < rPsq - rTsq)
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -151,4 +166,5 @@
   B                = 10.0 * MeV;
   third            = 1.0 / 3.0;
+  fradius          = 0.99;
   conserveEnergy   = false;
   conserveMomentum = true;
@@ -197,4 +213,5 @@
   B                = 10.0 * MeV;
   third            = 1.0 / 3.0;
+  fradius          = 0.99;
   conserveEnergy   = false;
   conserveMomentum = true;
@@ -208,6 +225,9 @@
 // The destructor doesn't have to do a great deal!
 //
-  delete theExcitationHandler;
-  delete theExcitationHandlerx;
+  if (theExcitationHandler)  delete theExcitationHandler;
+  if (theExcitationHandlerx) delete theExcitationHandlerx;
+  if (useAblation)           delete theAblation;
+//  delete theExcitationHandler;
+//  delete theExcitationHandlerx;
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -304,10 +324,57 @@
     G4double rPT   = rP + rT;
     G4double rPTsq = rPT * rPT;
+//
+//
+// This is a "catch" to make sure we don't go into an infinite loop because the
+// energy is too low to overcome nuclear repulsion.  PRT 20091023.  If the
+// value of rm < fradius * rPT then we're unlikely to sample a small enough
+// impact parameter (energy of incident particle is too low).  Return primary
+// and don't complete nuclear interaction analysis. 
+//
+    if (rm >= fradius * rPT) {
+      theParticleChange.SetStatusChange(isAlive);
+      theParticleChange.SetEnergyChange(theTrack.GetKineticEnergy());
+      theParticleChange.SetMomentumChange(theTrack.Get4Momentum().vect().unit());
+      if (verboseLevel >= 2) {
+        G4cout <<"Particle energy too low to overcome repulsion." <<G4endl;
+        G4cout <<"Event rejected and original track maintained" <<G4endl;
+        G4cout <<"########################################"
+               <<"########################################"
+               <<G4endl;
+      }
+      return &theParticleChange;
+    }
+//
+//
+// Now sample impact parameter until the criterion is met that projectile
+// and target overlap, but repulsion is taken into consideration.
+//
+    G4int evtcnt   = 0;
     r              = 1.1 * rPT;
-    while (r > rPT)
+    while (r > rPT && ++evtcnt < 1000)
     {
       G4double bsq = rPTsq * G4UniformRand();
       r            = (rm + std::sqrt(rm*rm + 4.0*bsq)) / 2.0;
     }
+//
+//
+// We've tried to sample this 1000 times, but failed.  Assume nuclei do not
+// collide.
+//
+    if (evtcnt >= 1000) {
+      theParticleChange.SetStatusChange(isAlive);
+      theParticleChange.SetEnergyChange(theTrack.GetKineticEnergy());
+      theParticleChange.SetMomentumChange(theTrack.Get4Momentum().vect().unit());
+      if (verboseLevel >= 2) {
+        G4cout <<"Particle energy too low to overcome repulsion." <<G4endl;
+        G4cout <<"Event rejected and original track maintained" <<G4endl;
+        G4cout <<"########################################"
+               <<"########################################"
+               <<G4endl;
+      }
+      return &theParticleChange;
+    }
+
+
     rsq = r * r;
 //
@@ -764,7 +831,31 @@
   if (r > rT) Cl = 2.0*std::sqrt(rPsq + 2.0*r*rT - rsq - rTsq);
   else        Cl = 2.0*rP;
-  
-  G4double bP = (rPsq+rsq-rTsq)/2.0/r;
-  G4double Ct = 2.0*std::sqrt(rPsq - bP*bP);
+//
+//
+// The next lines have been changed to include a "catch" to make sure if the
+// projectile and target are too close, Ct is set to twice rP or twice rT.
+// Otherwise the standard Wilson algorithm should work fine.
+// PRT 20091023.
+//
+  G4double Ct = 0.0;
+  if      (rT > rP && rsq < rTsq - rPsq) Ct = 2.0 * rP;
+  else if (rP > rT && rsq < rPsq - rTsq) Ct = 2.0 * rT;
+  else {
+    G4double bP = (rPsq+rsq-rTsq)/2.0/r;
+    G4double x  = rPsq - bP*bP;
+    if (x < 0.0) {
+      G4cerr <<"########################################"
+             <<"########################################"
+             <<G4endl;
+      G4cerr <<"ERROR IN G4WilsonAbrasionModel::GetNucleonInducedExcitation"
+             <<G4endl;
+      G4cerr <<"rPsq - bP*bP < 0.0 and cannot be square-rooted" <<G4endl;
+      G4cerr <<"Set to zero instead" <<G4endl;
+      G4cerr <<"########################################"
+             <<"########################################"
+             <<G4endl;
+    }
+    Ct = 2.0*std::sqrt(x);
+  }
   
   G4double Ex = 13.0 * Cl / fermi;
Index: trunk/source/processes/hadronic/models/binary_cascade/History
===================================================================
--- trunk/source/processes/hadronic/models/binary_cascade/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/binary_cascade/History	(revision 1228)
@@ -13,4 +13,9 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+4-Dec-2009, Gunter Folger                had-binary-V09-02-06
+- Bug fix in G4BinaryCascade::ApplyCollision; decay products outside
+   nucleus were nevertheless counted in currentZ/A as if these were within
+   nucleus.
 
 13-Nov-2009, Gunter Folger               had-binary-V09-02-05
Index: trunk/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh
===================================================================
--- trunk/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh	(revision 1228)
@@ -1,3 +1,3 @@
-
+//
 // ********************************************************************
 // * License and Disclaimer                                           *
Index: trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc
===================================================================
--- trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc	(revision 1228)
@@ -787,11 +787,11 @@
 // get A and Z for the residual nucleus
   #if defined(debug_G4BinaryCascade) || defined(debug_BIC_GetExcitationEnergy)
-  G4int finalA = theTargetList.size()+theCapturedList.size();
-  G4int finalZ = GetTotalCharge(theTargetList)+GetTotalCharge(theCapturedList);
-  if ( (currentA - finalA) != 0 || (currentZ - finalZ) != 0 )
-  {
-     G4cerr << "G4BIC:GetExcitationEnergy(): Nucleon counting error current/final{A,Z} " 
-            << currentA << " " << finalA << " "<< currentZ << " " << finalZ << G4endl;
-  }
+     G4int finalA = theTargetList.size()+theCapturedList.size();
+     G4int finalZ = GetTotalCharge(theTargetList)+GetTotalCharge(theCapturedList);
+     if ( (currentA - finalA) != 0 || (currentZ - finalZ) != 0 )
+     {
+	G4cerr << "G4BIC:GetExcitationEnergy(): Nucleon counting error current/final{A,Z} " 
+               << currentA << " " << finalA << " "<< currentZ << " " << finalZ << G4endl;
+     }
   
   #endif
@@ -852,5 +852,5 @@
       initialExc = theInitial4Mom.mag()-
            G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z, A);
-	   G4cout << " Initial nucleus A Z" << A << " " << Z << initialExc << G4endl; 
+	   G4cout << "GetExcitationEnergy: Initial nucleus A Z " << A << " " << Z << " " << initialExc << G4endl; 
     }
   }
@@ -1081,5 +1081,4 @@
   G4int initialBaryon(0);
   G4int initialCharge(0);
-  G4double initial_Efermi(0);
   G4LorentzVector mom4Primary(0);
   
@@ -1090,24 +1089,27 @@
   }
 
-// for primary resonances, subtract neutron ( = proton) field ( ie. add std::abs(field))
   G4int PDGcode=std::abs(primary->GetDefinition()->GetPDGEncoding());
   mom4Primary=primary->Get4Momentum();
-  initial_Efermi=RKprop->GetField(primary->GetDefinition()->GetPDGEncoding(),primary->GetPosition());
-
-  if ( PDGcode > 1000 && PDGcode != 2112 && PDGcode != 2212 )
-  {
-     initial_Efermi = RKprop->GetField(G4Neutron::Neutron()->GetPDGEncoding(),
-                                                primary->GetPosition());
-     primary->Update4Momentum(mom4Primary.e() - initial_Efermi);
-  }
-
-  std::vector<G4KineticTrack *>::iterator titer;
-  for ( titer=target_collection.begin() ; titer!=target_collection.end(); ++titer)
-  {
-     G4ParticleDefinition * aDef=(*titer)->GetDefinition();
-     G4int aCode=aDef->GetPDGEncoding();
-     G4ThreeVector aPos=(*titer)->GetPosition();
-     initial_Efermi+= RKprop->GetField(aCode, aPos);
-//     initial_Efermi+= RKprop->GetField((*titer)->GetDefinition()->GetPDGEncoding(),(*titer)->GetPosition());
+
+// for primary resonances, subtract neutron ( = proton) field ( ie. add std::abs(field))
+  G4double initial_Efermi(0);
+  if (primary->GetState() == G4KineticTrack::inside ) {
+     initial_Efermi=RKprop->GetField(primary->GetDefinition()->GetPDGEncoding(),primary->GetPosition());
+
+     if ( PDGcode > 1000 && PDGcode != 2112 && PDGcode != 2212 )
+     {
+	initial_Efermi = RKprop->GetField(G4Neutron::Neutron()->GetPDGEncoding(),
+                                                   primary->GetPosition());
+	primary->Update4Momentum(mom4Primary.e() - initial_Efermi);
+     }
+
+     std::vector<G4KineticTrack *>::iterator titer;
+     for ( titer=target_collection.begin() ; titer!=target_collection.end(); ++titer)
+     {
+	G4ParticleDefinition * aDef=(*titer)->GetDefinition();
+	G4int aCode=aDef->GetPDGEncoding();
+	G4ThreeVector aPos=(*titer)->GetPosition();
+	initial_Efermi+= RKprop->GetField(aCode, aPos);
+     }
   }
 //****************************************
@@ -1140,5 +1142,5 @@
      G4bool lateParticleCollision= (!haveTarget) && products && products->size() == 1;
 	//  if ( lateParticleCollision ) G4cout << " Added late particle--------------------------"<<G4endl;
-	//  if ( products ) PrintKTVector(products, " reaction products");
+	//  if ( lateParticleCollision && products ) PrintKTVector(products, " reaction products");
 //****************************************  
 
@@ -1172,38 +1174,40 @@
   }
 
-   G4double final_Efermi(0);
-   G4KineticTrackVector resonances;
-   for ( std::vector<G4KineticTrack *>::iterator i =products->begin(); i != products->end(); i++)
-   {
-       G4int PDGcode=std::abs((*i)->GetDefinition()->GetPDGEncoding());
-//       G4cout << " PDGcode, state " << PDGcode << " " << (*i)->GetState()<<G4endl;
-       final_Efermi+=RKprop->GetField(PDGcode,(*i)->GetPosition());
-       if ( PDGcode > 1000 && PDGcode != 2112 && PDGcode != 2212 )
-       {  
-	  resonances.push_back(*i);
-       }
-   }	
-   if ( resonances.size() > 0 ) 
-   {  
-      G4double delta_Fermi= (initial_Efermi-final_Efermi)/resonances.size();
-      for (std::vector<G4KineticTrack *>::iterator res=resonances.begin(); res != resonances.end(); res++)
-      {
-	  G4LorentzVector mom=(*res)->Get4Momentum();
-	  G4double mass2=mom.mag2();
-	  G4double newEnergy=mom.e() + delta_Fermi;
-	  G4double newEnergy2= newEnergy*newEnergy;
-	  	//G4cout << "mom = " << mom <<" newE " << newEnergy<< G4endl;
-	  if ( newEnergy2 < mass2 )
-	  {
-             ClearAndDestroy(products);
-             if (target_collection.size() == 0 ) FindDecayCollision(primary);  // for decay, sample new decay
-	     delete products;
-	     return false;
-	  }
-//	  G4cout << " correct resonance from /to " << mom.e() << " / " << newEnergy<< G4endl;
-	  G4ThreeVector mom3=std::sqrt(newEnergy2 - mass2) * mom.vect().unit();
-	  (*res)->Set4Momentum(G4LorentzVector(mom3,newEnergy));
-      }
-   }
+  if (primary->GetState() == G4KineticTrack::inside ) {   // if the primary was outside, nothing to correct
+     G4double final_Efermi(0);
+     G4KineticTrackVector resonances;
+     for ( std::vector<G4KineticTrack *>::iterator i =products->begin(); i != products->end(); i++)
+     {
+	 G4int PDGcode=std::abs((*i)->GetDefinition()->GetPDGEncoding());
+         //       G4cout << " PDGcode, state " << PDGcode << " " << (*i)->GetState()<<G4endl;
+	 final_Efermi+=RKprop->GetField(PDGcode,(*i)->GetPosition());
+	 if ( PDGcode > 1000 && PDGcode != 2112 && PDGcode != 2212 )
+	 {  
+	    resonances.push_back(*i);
+	 }
+     }	
+     if ( resonances.size() > 0 ) 
+     {  
+	G4double delta_Fermi= (initial_Efermi-final_Efermi)/resonances.size();
+	for (std::vector<G4KineticTrack *>::iterator res=resonances.begin(); res != resonances.end(); res++)
+	{
+	    G4LorentzVector mom=(*res)->Get4Momentum();
+	    G4double mass2=mom.mag2();
+	    G4double newEnergy=mom.e() + delta_Fermi;
+	    G4double newEnergy2= newEnergy*newEnergy;
+	  	  //G4cout << "mom = " << mom <<" newE " << newEnergy<< G4endl;
+	    if ( newEnergy2 < mass2 )
+	    {
+               ClearAndDestroy(products);
+               if (target_collection.size() == 0 ) FindDecayCollision(primary);  // for decay, sample new decay
+	       delete products;
+	       return false;
+	    }
+            //	  G4cout << " correct resonance from /to " << mom.e() << " / " << newEnergy<< G4endl;
+	    G4ThreeVector mom3=std::sqrt(newEnergy2 - mass2) * mom.vect().unit();
+	    (*res)->Set4Momentum(G4LorentzVector(mom3,newEnergy));
+	}
+     }
+  }
 
 #ifdef debug_BIC_ApplyCollision
@@ -1218,7 +1222,9 @@
     if ( ! lateParticleCollision ) 
     {
-       (*i)->SetState(primary->GetState());  // secondaries are created inside nucleus, except for decay in propagate
-       finalBaryon+=(*i)->GetDefinition()->GetBaryonNumber();
-       finalCharge+=G4lrint((*i)->GetDefinition()->GetPDGCharge());
+       (*i)->SetState(primary->GetState());  // decay may be anywhere!
+       if ( (*i)->GetState() == G4KineticTrack::inside ){
+          finalBaryon+=(*i)->GetDefinition()->GetBaryonNumber();
+          finalCharge+=G4lrint((*i)->GetDefinition()->GetPDGCharge());
+       }
     } else {
        G4double tin=0., tout=0.; 
@@ -1247,5 +1253,5 @@
        }
        
-//       G4cout << " PDGcode, state " << (*i)->GetDefinition()->GetPDGEncoding() << " " << (*i)->GetState()<<G4endl;
+       //G4cout << " PDGcode, state " << (*i)->GetDefinition()->GetPDGEncoding() << " " << (*i)->GetState()<<G4endl;
 
     }   
@@ -1269,5 +1275,5 @@
   currentA += finalBaryon-initialBaryon;
   currentZ += finalCharge-initialCharge;
-	//G4cout << " currentA, Z aft: " << currentA << " " << currentZ << G4endl;
+	//G4cout << " ApplyCollision currentA, Z aft: " << currentA << " " << currentZ << G4endl;
   
   G4KineticTrackVector oldSecondaries;
@@ -2351,5 +2357,5 @@
      G4cerr << "G4BinaryCascade::GetFinal4Momentum - Fatal"<<G4endl;
      G4KineticTrackVector::iterator i;
-     G4cerr <<" Initial nucleus "<<theInitial4Mom<<G4endl;
+     G4cerr <<" GetFinal4Momentum: Initial nucleus "<<theInitial4Mom<<G4endl;
      for(i = theProjectileList.begin() ; i != theProjectileList.end(); ++i)
      {
Index: trunk/source/processes/hadronic/models/cascade/History
===================================================================
--- trunk/source/processes/hadronic/models/cascade/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/History	(revision 1228)
@@ -15,4 +15,9 @@
      ---------------------------------------------------------------
 
+1 Dec 2009 Dennis Wright (hadr-casc-V09-02-11)
+----------------------------------------------
+- G4PionSampler, G4NucleonSampler: change loop variable in ctor from i to j
+  in order to satisfy Windows compiler
+ 
 11 Nov 2009 Dennis Wright (hadr-casc-V09-02-10)
 -----------------------------------------------
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CascadeMomentum.hh,v 1.1 2008/09/22 10:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4FinalStateSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4FinalStateSampler.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4FinalStateSampler.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateSampler.hh,v 1.2 2009/09/17 18:11:57 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleonSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleonSampler.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleonSampler.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NucleonSampler.hh,v 1.1 2009/09/24 18:50:27 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionSampler.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionSampler.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PionSampler.hh,v 1.2 2009/09/17 18:10:44 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4FinalStateSampler.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4FinalStateSampler.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4FinalStateSampler.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FinalStateSampler.cc,v 1.2 2009/09/17 18:15:38 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc	(revision 1228)
@@ -969,10 +969,10 @@
 
   G4double rat;
-  G4double ratm;
+  //  G4double ratm;
 
   // Calculate number of protons and neutrons in local region
-  G4double Athird = std::pow(A, 0.3333);
-  G4double Nneut = Athird*(A-Z)/A;
-  G4double Nprot = Athird*Z/A;
+  //  G4double Athird = std::pow(A, 0.3333);
+  //  G4double Nneut = Athird*(A-Z)/A;
+  //  G4double Nprot = Athird*Z/A;
 
   // Reduce number of 
@@ -985,7 +985,7 @@
 
     // Calculate ratio modified for local region
-    G4double deltaP = protonNumber - protonNumberCurrent;
+    //    G4double deltaP = protonNumber - protonNumberCurrent;
     //    G4cout << " deltaP = " << deltaP << G4endl;
-    ratm = std::max(0.0, (Nprot - deltaP)/Nprot);
+    //    ratm = std::max(0.0, (Nprot - deltaP)/Nprot);
 
   } else {
@@ -997,7 +997,7 @@
 
     // Calculate ratio modified for local region
-    G4double deltaN = neutronNumber - neutronNumberCurrent;
+    //    G4double deltaN = neutronNumber - neutronNumberCurrent;
     //   G4cout << " deltaN = " << deltaN << G4endl;
-    ratm = std::max(0.0, (Nneut - deltaN)/Nneut);
+    //    ratm = std::max(0.0, (Nneut - deltaN)/Nneut);
   }
 
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleonSampler.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleonSampler.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleonSampler.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4NucleonSampler.cc,v 1.1 2009/09/24 18:51:14 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4NucleonSampler.cc,v 1.2 2009/12/02 17:34:57 dennis Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
@@ -62,5 +62,5 @@
   }
 
-  G4int i, k, m;
+  G4int j, k, m;
   G4int start, stop;
 
@@ -70,5 +70,5 @@
     for (k = 0; k < 30; k++) {
       t1_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t1_dSigma_dMult[m][k] += PPCrossSections[i][k];
+      for (j = start; j < stop; j++) t1_dSigma_dMult[m][k] += PPCrossSections[j][k];
     }
 
@@ -77,5 +77,5 @@
     for (k = 0; k < 30; k++) {
       t0_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t0_dSigma_dMult[m][k] += NPCrossSections[i][k];
+      for (j = start; j < stop; j++) t0_dSigma_dMult[m][k] += NPCrossSections[j][k];
     }
   }
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionSampler.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionSampler.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionSampler.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4PionSampler.cc,v 1.4 2009/10/09 01:03:45 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4PionSampler.cc,v 1.5 2009/12/02 17:35:10 dennis Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
@@ -60,5 +60,5 @@
   }
 
-  G4int i, k, m;
+  G4int j, k, m;
   G4int start, stop;
 
@@ -68,5 +68,5 @@
     for (k = 0; k < 30; k++) {
       t33_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t33_dSigma_dMult[m][k] += pipPCrossSections[i][k];
+      for (j = start; j < stop; j++) t33_dSigma_dMult[m][k] += pipPCrossSections[j][k];
     }
 
@@ -75,5 +75,5 @@
     for (k = 0; k < 30; k++) {
       t31_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t31_dSigma_dMult[m][k] += pimPCrossSections[i][k];
+      for (j = start; j < stop; j++) t31_dSigma_dMult[m][k] += pimPCrossSections[j][k];
     }
 
@@ -82,5 +82,5 @@
     for (k = 0; k < 30; k++) {
       t11_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t11_dSigma_dMult[m][k] += pizPCrossSections[i][k];
+      for (j = start; j < stop; j++) t11_dSigma_dMult[m][k] += pizPCrossSections[j][k];
     }
   }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/History	(revision 1228)
@@ -18,4 +18,21 @@
 
 <<<<<<< History
+
+3-Dec-2009 M.Kosov                            (hadr-chips-V09-02-31)
+-----------------------------------------------------------------------
+Mutual tag: further CHIPS acceleration (10% slower than QGSP_BERT)
+
+3-Dec-2009 M.Kosov                            (hadr-chips-V09-02-30)
+-----------------------------------------------------------------------
+Mutual tag: Tuning of parameters to accelerate CHIPS
+
+1-Dec-2009 M.Kosov                            (hadr-chips-V09-02-29)
+-----------------------------------------------------------------------
+Mutual tag: Compilation warning fix in G4QFragmentation and G4QIonIonCollision
+
+30-Nov-2009 M.Kosov                            (hadr-chips-V09-02-28)
+-----------------------------------------------------------------------
+Mutual tag: Bug fix for the final double delete and slight change of
+parameters based on the Sunanda tests
 
 20-Nov-2009 M.Kosov                            (hadr-chips-V09-02-27)
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History	(revision 1228)
@@ -16,4 +16,8 @@
      * Please list in reverse chronological order (last date on top) *
      -----------------------------------------------------------------
+
+14-Dec-2009 M.Kosov                           (hadr-chips-body-V09-02-16) 
+-----------------------------------------------------------------------
+Mutual tag: Bug fix in G4QNucleus (crash in QGSC for 400 GeV p)
 
 17-Nov-2009 M.Kosov                            (hadr-chips-V09-02-24)
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Chips.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Chips.hh,v 1.19 2006/06/29 20:05:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4Chips ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QBesIKJY.hh,v 1.3 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QBesIKJY ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCHIPSWorld.hh,v 1.26 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCHIPSWorld ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidate.hh,v 1.29 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidate ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidateVector.hh,v 1.22 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QChipolino.hh,v 1.24 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QChipolino ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QContent.hh,v 1.31 2009/07/24 16:37:03 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QContent ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChan.hh,v 1.24 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDecayChan ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChanVector.hh,v 1.20 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QEnvironment.hh,v 1.36 2009/11/16 18:15:01 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QEnvironment ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QException.hh,v 1.11 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QException ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadron.hh,v 1.46 2009/09/08 14:04:14 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QHadron ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadronVector.hh,v 1.23 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -43,5 +43,5 @@
 //
 // $Id: G4QHadronVector.hh,v 1.23 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteraction.hh,v 1.7 2009/08/28 14:49:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteractionVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -38,5 +38,5 @@
 //
 // $Id: G4QInteractionVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QIsotope.hh,v 1.6 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QNucleus.hh,v 1.45 2009/08/31 11:21:48 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QNucleus.hh,v 1.46 2009/12/16 17:51:01 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QNucleus ----------------
@@ -91,6 +91,6 @@
   G4double GetRelativeDensity(const G4ThreeVector& aPosition); // Densyty/rho0
   G4double GetRelWSDensity(const G4double& r)       // Wood-Saxon rho/rho0(r)
-                                        {return 1./(1.+exp((r-radius)/WoodSaxonSurf));}    
-  G4double GetRelOMDensity(const G4double& r2){return exp(-r2/radius);} // OscModelRelDens
+                                        {return 1./(1.+std::exp((r-radius)/WoodSaxonSurf));}    
+  G4double GetRelOMDensity(const G4double& r2){return std::exp(-r2/radius);} // OscModelRelDens
   G4double GetRadius(const G4double maxRelativeDenisty=0.5); // Radius of %ofDensity
   G4double GetOuterRadius();                        // Get radius of the most far nucleon
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPDGCode.hh,v 1.30 2009/11/04 11:01:59 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QPDGCode ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPDGCodeVector.hh,v 1.20 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentCluster.hh,v 1.24 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QParentCluster ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentClusterVector.hh,v 1.19 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticle.hh,v 1.25 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QParticle ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticleVector.hh,v 1.20 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh	(revision 1228)
@@ -29,5 +29,5 @@
 
 // $Id: G4QParton.hh,v 1.8 2009/07/17 16:54:57 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh	(revision 1228)
@@ -28,5 +28,5 @@
 //
 // $Id: G4QPartonPair.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPartonPairVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPartonVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -40,5 +40,5 @@
 //
 // $Id: G4QPartonVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QProbability.hh	(revision 1228)
@@ -28,5 +28,5 @@
 //
 // $Id: G4QProbability.hh,v 1.4 2009/09/04 16:13:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4QString.hh,v 1.11 2009/08/24 14:41:49 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 #ifndef G4QString_h
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QStringVector.hh,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QStringVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Quasmon.hh,v 1.46 2009/11/16 18:15:01 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4Quasmon ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasmonVector.hh,v 1.22 2009/11/16 18:15:01 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QuasmonVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QBesIKJY.cc,v 1.4 2009/11/10 17:13:46 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QBesIKJY ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCHIPSWorld.cc,v 1.33 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCHIPSWorld ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidate.cc,v 1.35 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCandidate ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QChipolino.cc,v 1.36 2009/08/10 16:36:53 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QChipolino ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QContent.cc,v 1.49 2009/08/07 14:20:57 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QContent ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChan.cc,v 1.28 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDecayChan ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc	(revision 1228)
@@ -28,6 +28,6 @@
 //
 //
-// $Id: G4QEnvironment.cc,v 1.157 2009/11/16 18:15:01 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QEnvironment.cc,v 1.160 2009/12/03 18:09:07 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QEnvironment ----------------
@@ -1737,5 +1737,6 @@
     //G4int   c3Max = 9;                    // Max#of "no hadrons" steps (reduced below?)
     //G4int   c3Max = 3;
-    G4int   c3Max = 1;
+    //G4int   c3Max = 1;
+    G4int   c3Max = 0;
     //G4int   premC = 27;
     //G4int   premC = 3;
@@ -1745,10 +1746,11 @@
     //if(envA>1&&envA<19) premC = 36/envA;
     //if(envA>1&&envA<25) premC = 48/envA;
-    if(envA>1&&envA<41) premC = 80/envA;
+    //if(envA>1&&envA<41) premC = 80/envA;
     G4int  sumstat= 2;                     // Sum of statuses of all Quasmons
     G4bool force  = false;                 // Prototype of the Force Major Flag
     G4int cbR     =0;                      // Counter of the "Stoped by Coulomb Barrier"
     //
-    G4int cbRM    =1;                      // MaxCounter of the "StopedByCoulombBarrier"
+    G4int cbRM    =0;                      //** MaxCounter of "StopedByCoulombBarrier" **
+    //G4int cbRM    =1;                      // MaxCounter of the "StopedByCoulombBarrier"
     //G4int cbRM    =3;                      // MaxCounter of the "StopedByCoulombBarrier"
     //G4int cbRM    =9;                      // MaxCounter of the "Stoped byCoulombBarrier"
@@ -1762,5 +1764,8 @@
     G4bool first=true;                     // Flag of the first interaction (only NucMedia)
     G4int cAN=0;                           // Counter of the nucleon absorptions
-    G4int mcAN=3;                          // Max for the counter of nucleon absorptions
+    //G4int mcAN=27;                         // Max for the counter of nucleon absorptions
+    G4int mcAN=9;                          // Max for the counter of nucleon absorptions
+    //G4int mcAN=3;                          // Max for the counter of nucleon absorptions
+    //G4int mcAN=1;                          // Max for the counter of nucleon absorptions
     while (sumstat||totC<totCM)            // ===***=== The MAIN "FOREVER" LOOP ===***===
     {
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QException.cc,v 1.10 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QException ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadron.cc,v 1.64 2009/09/02 15:45:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QHadron ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteraction.cc,v 1.6 2009/08/28 14:49:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QIsotope.cc,v 1.13 2009/08/28 14:49:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QIsotope class ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QNucleus.cc,v 1.115 2009/11/04 10:52:34 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QNucleus.cc,v 1.116 2009/12/14 16:41:52 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QNucleus ----------------
@@ -5990,5 +5990,6 @@
       G4cerr<<"***G4QN::DecDiBar: badPDG="<<qPDG<<" or smallM="<<qM<<",2mP="<<dProt
             <<",2mN="<<dNeut<<G4endl;
-      throw G4QException("G4QNucleus::DecayDibar: Unknown PDG code or small Mass of DB");
+      // @@ Nothing to do. Just 2 GeV disappears... Very rare! Just to avoid the exception.
+      //throw G4QException("G4QNucleus::DecayDibar: Unknown PDG code or small Mass of DB");
     }
   }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPDGCode.cc,v 1.63 2009/11/03 16:13:37 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QPDGCode ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentCluster.cc,v 1.26 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QParentCluster ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticle.cc,v 1.34 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QParticle ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParton.cc,v 1.9 2009/07/17 16:54:57 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4QPartonPair.cc,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QProbability.cc,v 1.3 2009/09/04 16:13:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QString.cc,v 1.17 2009/09/04 14:38:00 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc	(revision 1228)
@@ -28,6 +28,6 @@
 //
 //
-// $Id: G4Quasmon.cc,v 1.119 2009/11/16 18:15:01 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4Quasmon.cc,v 1.121 2009/12/03 18:09:07 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4Quasmon ----------------
@@ -537,5 +537,5 @@
     }
     G4ThreeVector totBoost = tot4M.boostVector(); // BoostVector for TotalSystem (backward)
-    G4ThreeVector totRBoost= -totBoost;    // Boost vector for Total System (forward)
+    G4ThreeVector totRBoost= -totBoost;   // Boost vector for Total System (forward)
     G4int    iniPDG =valQ.GetSPDGCode();
     G4int    iniBN  =valQ.GetBaryonNumber();
@@ -548,5 +548,5 @@
 #endif
     G4QNucleus iniRN(iniP,iniN-1,iniS);
-    G4double iniRM = iniRN.GetMZNS();      // Mass of Residual Quasmon when neutron is rad
+    G4double iniRM = iniRN.GetMZNS();     // Mass of Residual Quasmon when neutron is rad
     if(iniBN<2||envA>0) iniRM=0.;
     G4double iniQM =G4QPDGCode(iniPDG).GetMass();  // Minimum mass of Quasmon
@@ -565,42 +565,43 @@
           <<envQC<<",Q+E="<<quen<<",tM="<<totPDG<<totQC<<totM<<"<"<<totMass<<G4endl;
 #endif
-    G4int tQ    = valQ.GetTot();           // Total number of quarks for current Quasmon
+    G4int tQ    = valQ.GetTot();          // Total number of quarks for current Quasmon
     G4int bQ    = abs(valQ.GetBaryonNumber()); // Baryon number of the current Quasmon
-    G4QContent cQ = valQ;                  // Temporary copy of Quasmon QC
-    G4int   s   = 4;                       // Mesonic
-    if (bQ) s   = 3*bQ + 2;                // Barionic
-    if (tQ> s) cQ.DecQAQ((tQ-s)/2);        // Reduce QC to minimum QC
-#ifdef debug
-    G4int rsPDG = cQ.GetSPDGCode();        // PDG for the lowest residual Quasmon state
+    G4QContent cQ = valQ;                 // Temporary copy of Quasmon QC
+    G4int   s   = 4;                      // Mesonic
+    if (bQ) s   = 3*bQ + 2;               // Barionic
+    if (tQ> s) cQ.DecQAQ((tQ-s)/2);       // Reduce QC to minimum QC
+#ifdef debug
+    G4int rsPDG = cQ.GetSPDGCode();       // PDG for the lowest residual Quasmon state
     G4cout<<"G4Q::HQ:eN="<<envN<<",eZ="<<envZ<<",Q="<<rsPDG<<cQ<<",piF="<<piF<<",gaF="<<gaF
          <<G4endl;
 #endif
-    theEnvironment.UpdateClusters(false);// New A-clusters are calculated
+    theEnvironment.UpdateClusters(false); // New A-clusters are calculated
     //theEnvironment.PrepareCandidates(theQCandidates,false,false);//Calc.PrePreprob's of C
     //G4bool fF=piF||gaF;
     // piF,piF or gaF,gaF is correct. Made to avoid theSpecificInteractionTimeClusterChoice
     theEnvironment.PrepareCandidates(theQCandidates,piF,piF);// Calc.PrePreprob of Candid's
-    ModifyInMatterCandidates();            // Calculate InMediaMasses of Cand. & Possibil.
-    G4double kMom = 0.;                    // Energy of primary qParton in Q-CMS
-    G4double minK = 0.;                    // k_min for randomization
-    G4double maxK = quasM/2.;              // k_max for randomization
-    G4double kLS  = 0;                     // Energy of primary qParton in LS
-    G4double cost = 0.;                    // Cos(theta) of k in QS InRespecTo Q direction
-    G4bool   kCond = true;                 // k choice condition
-    G4bool   qCond = true;                 // q choice condition
-    G4bool   pCond = true;                 // Not adoptable parent cluster choice condition
-    G4bool   fskip=false;                  // Flag to skip when sucked
-    G4bool   fred =false;                  // Flag of Environment reduction
-    //G4bool   ffdc =true;                   // Flag of not successful decay in fragment
-    G4LorentzVector k4Mom=zeroLV;          // 4-momentum prototype for k
-    G4LorentzVector cr4Mom=zeroLV;         // 4-momentum prototype for the ColResQuasmon
-    G4int kCount =0;                       // Counter of attempts of k for hadronization
+    ModifyInMatterCandidates();           // Calculate InMediaMasses of Cand. & Possibil.
+    G4double kMom = 0.;                   // Energy of primary qParton in Q-CMS
+    G4double minK = 0.;                   // k_min for randomization
+    G4double maxK = quasM/2.;             // k_max for randomization
+    G4double kLS  = 0;                    // Energy of primary qParton in LS
+    G4double cost = 0.;                   // Cos(theta) of k in QS InRespecTo Q direction
+    G4bool   kCond = true;                // k choice condition
+    G4bool   qCond = true;                // q choice condition
+    G4bool   pCond = true;                // Not adoptable parent cluster choice condition
+    G4bool   fskip=false;                 // Flag to skip when sucked
+    G4bool   fred =false;                 // Flag of Environment reduction
+    //G4bool   ffdc =true;                  // Flag of not successful decay in fragment
+    G4LorentzVector k4Mom=zeroLV;         // 4-momentum prototype for k
+    G4LorentzVector cr4Mom=zeroLV;        // 4-momentum prototype for the ColResQuasmon
+    G4int kCount =0;                      // Counter of attempts of k for hadronization
     //G4int kCountMax=27;
     //G4int kCountMax=9;
-    //G4int kCountMax=3;                     // Try different k if they are below minK
-    G4int kCountMax=1;                     // "No reson to increase it"
-    //G4int kCountMax=0;                   //@@ *** Close search for the minimum k ***
+    //G4int kCountMax=3;                    // Try different k if they are below minK
+    G4int kCountMax=1;                    // "No reson to increase it"
+    //G4int kCountMax=0;                    //@@ *** Close search for the minimum k ***
     //
-    G4int qCountMax=27;                   // Try different q to come over CoulBar or SepE
+    //G4int qCountMax=27;                   // Try different q to come over CoulBar or SepE
+    G4int qCountMax=12;                   // Try different q to come over CoulBar or SepE
     //G4int qCountMax=9;                    // Try different q to come over CoulBar or SepE
     //G4int qCountMax=3;                    // Try different q to come over CoulBar or SepE
@@ -612,8 +613,10 @@
     G4int pCountMax=1;                    //Try differentHadrons(Parents) forBetterRecoil
     //if(envA>0) pCountMax=3;
-    if(envA>0&&envA<31)
+    //if(envA>0&&envA<31)
+    if(envA>0&&envA<61)
     {
-      pCountMax=60/envA;
-      kCountMax=pCountMax;
+      //pCountMax=60/envA;
+      pCountMax=120/envA;
+      //kCountMax=pCountMax;                // See above !
     }
     G4bool gintFlag=false;                // Flag of gamma interaction with one quark
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/History	(revision 1228)
@@ -17,4 +17,8 @@
      -----------------------------------------------------------------
 
+7-Dec-2009 M.Kosov                            (hadr-chips-cs-V09-02-00)
+-----------------------------------------------------------------------
+Bug fix in G4QNeutronCaptureRatio (Cu65): accelerate CuSc by 1.5
+
 18-Nov-2009 M.Kosov                            (hadr-chips-V09-02-25)
 -----------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuANuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuANuNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuANuNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuANuNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuENuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuENuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuENuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuENuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuMuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuMuNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QANuMuNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuMuNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonPlusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonPlusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QAntiBaryonPlusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QDiffractionRatio.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QDiffractionRatio.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QDiffractionRatio.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElasticCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElasticCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElasticCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElectronNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElectronNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QElectronNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonPlusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonPlusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QHyperonPlusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QIonIonCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QIonIonCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QIonIonCrossSection.hh	(revision 1228)
@@ -28,5 +28,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonMinusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonMinusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonMinusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonPlusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonPlusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonPlusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonZeroNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonZeroNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QKaonZeroNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QMuonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QMuonNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QMuonNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QMuonNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronCaptureRatio.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronCaptureRatio.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronCaptureRatio.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNeutronNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuENuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuENuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuENuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuENuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuMuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuMuNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuMuNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuMuNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuNuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuNuNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QNuNuNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuNuNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPhotonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPhotonNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPhotonNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionMinusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionMinusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionMinusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionPlusNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionPlusNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QPionPlusNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QProtonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QProtonNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QProtonNuclearCrossSection.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QTauNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QTauNuclearCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QTauNuclearCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QTauNuclearCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QuasiFreeRatios.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QuasiFreeRatios.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4QuasiFreeRatios.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4VQCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4VQCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include/G4VQCrossSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VQCrossSection.hh,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuANuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuANuNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuANuNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuANuNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuENuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuENuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuENuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuENuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuMuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuMuNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QANuMuNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuMuNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonPlusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonPlusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QAntiBaryonPlusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QDiffractionRatio.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QDiffractionRatio.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QDiffractionRatio.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDiffractionRatio.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElasticCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElasticCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElasticCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QElasticCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElectronNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElectronNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QElectronNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QElectronNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonPlusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonPlusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QHyperonPlusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QIonIonCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QIonIonCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QIonIonCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 19-Aug-07
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonMinusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonMinusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonMinusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonPlusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonPlusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonPlusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonZeroNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonZeroNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QKaonZeroNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QMuonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QMuonNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QMuonNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QMuonNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronCaptureRatio.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronCaptureRatio.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronCaptureRatio.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QNeutronCaptureRatio.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QNeutronCaptureRatio.cc,v 1.2 2009/12/07 10:32:06 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -476,5 +476,5 @@
   static const G4double pZ29N36[5]={.036, 15., .003, .0001, .013};
   static const std::pair<G4int, const G4double*> Z29N36=std::make_pair(36,pZ29N36);
-  static const std::pair<G4int, const G4double*> Z29[N29]={Z29N34, Z29N34};
+  static const std::pair<G4int, const G4double*> Z29[N29]={Z29N34, Z29N36};
   //==> Zn(Z=30)
   static const G4int N30=5;
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNeutronNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-May-09
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuENuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuENuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuENuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuENuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuMuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuMuNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuMuNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuMuNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuNuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuNuNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QNuNuNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuNuNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPhotonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPhotonNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPhotonNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionMinusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionMinusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionMinusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionPlusNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionPlusNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QPionPlusNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QProtonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QProtonNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QProtonNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QTauNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QTauNuclearCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QTauNuclearCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QTauNuclearCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QuasiFreeRatios.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QuasiFreeRatios.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4QuasiFreeRatios.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasiFreeRatios.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4VQCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4VQCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/cross_sections/src/G4VQCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VQCrossSection.cc,v 1.1 2009/11/16 18:15:43 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/History	(revision 1228)
@@ -17,4 +17,8 @@
      -----------------------------------------------------------------
 
+1-Dec-2009 M.Kosov                             (hadr-chips-V09-02-29)
+-----------------------------------------------------------------------
+Mutual tag: Compilation warning fix in G4QFragmentation and G4QIonIonCollision
+
 17-Nov-2009 M.Kosov                            (hadr-chips-V09-02-24)
 -----------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QFragmentation.hh,v 1.1 2009/11/16 18:16:04 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QIonIonCollision.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QIonIonCollision.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include/G4QIonIonCollision.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QIonIonCollision.hh,v 1.1 2009/11/16 18:16:04 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QFragmentation.cc	(revision 1228)
@@ -16,5 +16,5 @@
 // * for the full disclaimer and the limitation of liability.         *
 // *                                                                  *
-// * This  code  implementation is the result of  the  scientific 2and *
+// * This  code  implementation is the result of  the  scientific and *
 // * technical work of the GEANT4 collaboration.                      *
 // * By using,  copying,  modifying or  distributing the software (or *
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QFragmentation.cc,v 1.1 2009/11/16 18:16:04 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QFragmentation.cc,v 1.6 2009/12/16 17:51:03 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
@@ -53,9 +53,9 @@
 
 // Definition of static parameters
-G4int    G4QFragmentation::nCutMax=7; 
-G4double G4QFragmentation::stringTension=1.*GeV/fermi;
-G4double G4QFragmentation::tubeDensity  =1./fermi;
-// Parameters of diffractional fragmentation
-G4double G4QFragmentation::widthOfPtSquare=-0.72*GeV*GeV; // pt -width2 forStringExcitation
+G4int    G4QFragmentation::nCutMax=7;
+G4double G4QFragmentation::stringTension=1.5*GeV/fermi;
+G4double G4QFragmentation::tubeDensity  =1.5/fermi;
+// Parameters of diffractional fragmentation (was .72*)
+G4double G4QFragmentation::widthOfPtSquare=-GeV*GeV;// pt -width2 forStringExcitation
 
 G4QFragmentation::G4QFragmentation(const G4QNucleus &aNucleus, const G4QHadron &aPrimary)
@@ -551,11 +551,11 @@
   // >>>>>>>> make soft collisions (ordering is vital)
   //
-  G4QInteractionVector::iterator i;
+  G4QInteractionVector::iterator it;
 #ifdef debug
   G4cout<<"G4QFragmentation::Construct: Creation ofSoftCollisionPartonPair STARTS"<<G4endl;
 #endif
-  for(i = theInteractions.begin(); i != theInteractions.end(); i++)   
-  {
-    G4QInteraction* anIniteraction = *i;
+  for(it = theInteractions.begin(); it != theInteractions.end(); ++it)   
+  {
+    G4QInteraction* anIniteraction = *it;
     G4QPartonPair*  aPair=0;
     G4int nSoftCollisions = anIniteraction->GetNumberOfSoftCollisions();
@@ -581,7 +581,7 @@
 #endif
       }  
-      delete *i;
-      i=theInteractions.erase(i);       // Soft interactions are converted & erased
-      i--;
+      delete *it;
+      it=theInteractions.erase(it);      // Soft interactions are converted & erased
+      it--;
     }
   }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QIonIonCollision.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QIonIonCollision.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/fragmentation/src/G4QIonIonCollision.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QIonIonCollision.cc,v 1.1 2009/11/16 18:16:04 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QIonIonCollision.cc,v 1.2 2009/12/01 09:24:24 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
@@ -454,11 +454,11 @@
   // >>>>>>>> make soft collisions (ordering is vital)
   //
-  G4QInteractionVector::iterator i;
+  G4QInteractionVector::iterator it;
 #ifdef debug
   G4cout<<"G4QIonIonCollision::Constr: Creation ofSoftCollisionPartonPair STARTS"<<G4endl;
 #endif
-  for(i = theInteractions.begin(); i != theInteractions.end(); i++)   
-  {
-    G4QInteraction* anIniteraction = *i;
+  for(it = theInteractions.begin(); it != theInteractions.end(); ++it)   
+  {
+    G4QInteraction* anIniteraction = *it;
     G4QPartonPair*  aPair=0;
     G4int nSoftCollisions = anIniteraction->GetNumberOfSoftCollisions();
@@ -484,7 +484,7 @@
 #endif
       }  
-      delete *i;
-      i=theInteractions.erase(i);                   // SoftInteractions're converted&erased
-      i--;
+      delete *it;
+      it=theInteractions.erase(it);                 // SoftInteractions're converted&erased
+      it--;
     }
   }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ElectroNuclearReaction.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ElectroNuclearReaction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ElectroNuclearReaction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4ElectroNuclearReaction.hh,v 1.27 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 physics class: G4ElectroNuclearReaction -- header file for CHIPS
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4GammaNuclearReaction.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4GammaNuclearReaction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4GammaNuclearReaction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GammaNuclearReaction.hh,v 1.15 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QHadronInelasticDataSet.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QHadronInelasticDataSet.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QHadronInelasticDataSet.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QHadronInelasticDataSet.hh,v 1.1 2009/11/20 10:08:36 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 physics class: G4QHadronInelasticDataSet -- header file
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QHadronInelasticDataSet.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QHadronInelasticDataSet.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QHadronInelasticDataSet.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QHadronInelasticDataSet.cc,v 1.1 2009/11/20 10:08:36 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // GEANT4 physics class: G4QHadronInelasticDataSet -- header file
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QStringChipsParticleLevelInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QStringChipsParticleLevelInterface.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QStringChipsParticleLevelInterface.cc	(revision 1228)
@@ -23,4 +23,5 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
 // Short description: Interface of QGSC to CHIPS (EnergyFlow) 
 // ----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4StringChipsParticleLevelInterface.cc	(revision 1228)
@@ -23,4 +23,5 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
 // Short description: Interface of QGSC to CHIPS (SoftHadrons) 
 // ----------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QAtomicElectronScattering.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QAtomicElectronScattering.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QAtomicElectronScattering.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QAtomicElectronScattering.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QAtomicElectronScattering header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCaptureAtRest.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCaptureAtRest.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCaptureAtRest.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCaptureAtRest.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCaptureAtRest header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCoherentChargeExchange.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCoherentChargeExchange.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QCoherentChargeExchange.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCoherentChargeExchange.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCoherentChargeExchange header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiffraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiffraction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiffraction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QDiffraction.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDiffraction header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscProcessMixer.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscProcessMixer.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscProcessMixer.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QDiscProcessMixer.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDiscProcessMixer header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscreteProcessVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscreteProcessVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QDiscreteProcessVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDiscreteProcessVector.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDiscreteProcessVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QElastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QElastic.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QElastic header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QInelastic.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QInelastic header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QIonIonElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QIonIonElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QIonIonElastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QIonIonElastic.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QIonIonElastic header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QLowEnergy.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QLowEnergy.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QLowEnergy.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QLowEnergy.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QLowEnergy header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QPDGToG4Particle.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QPDGToG4Particle.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QPDGToG4Particle.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPDGToG4Particle.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QPDGToG4Particle header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QSynchRad.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QSynchRad.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/include/G4QSynchRad.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QSynchRad.hh,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Created by Mikhail Kosov 6-Nov-2009
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QAtomicElectronScattering.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QAtomicElectronScattering.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QAtomicElectronScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QAtomicElectronScattering.cc,v 1.1 2009/11/17 10:36:54 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QAtomicElectronScattering class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCaptureAtRest.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCaptureAtRest.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCaptureAtRest.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCaptureAtRest.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCaptureAtRest class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCoherentChargeExchange.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCoherentChargeExchange.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QCoherentChargeExchange.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QCoherentChargeExchange.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QCoherentChargeExchange class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiffraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiffraction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiffraction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QDiffraction.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDiffraction class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiscProcessMixer.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiscProcessMixer.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QDiscProcessMixer.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QDiscProcessMixer.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QDiscProcessMixer class -------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QElastic.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QElastic class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QInelastic.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QInelastic.cc,v 1.2 2009/11/19 16:32:56 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4QInelastic.cc,v 1.5 2009/12/03 18:09:07 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QInelastic class -----------------
@@ -68,11 +68,11 @@
 
 G4bool   G4QInelastic::manualFlag=false; // If false then standard parameters are used
-G4double G4QInelastic::Temperature=180.; // Critical Temperature (sensitive at High En)
+G4double G4QInelastic::Temperature=210.; // Critical Temperature (sensitive at High En)
 G4double G4QInelastic::SSin2Gluons=0.3;  // Supression of s-quarks (in respect to u&d)
 G4double G4QInelastic::EtaEtaprime=0.3;  // Supression of eta mesons (gg->qq/3g->qq)
-G4double G4QInelastic::freeNuc=0.5;      // Percentage of free nucleons on the surface
-G4double G4QInelastic::freeDib=0.05;     // Percentage of free diBaryons on the surface
+G4double G4QInelastic::freeNuc=.35;      // Percentage of free nucleons on the surface
+G4double G4QInelastic::freeDib=.05;      // Percentage of free diBaryons on the surface
 G4double G4QInelastic::clustProb=5.;     // Nuclear clusterization parameter
-G4double G4QInelastic::mediRatio=10.;    // medium/vacuum hadronization ratio
+G4double G4QInelastic::mediRatio=1.;     // medium/vacuum hadronization ratio
 G4int    G4QInelastic::nPartCWorld=152;  // The#of particles initialized in CHIPS World
 G4double G4QInelastic::SolidAngle=0.5;   // Part of Solid Angle to capture (@@A-dep.)
@@ -80,5 +80,5 @@
 G4double G4QInelastic::PiPrThresh=141.4; // Pion Production Threshold for gammas
 G4double G4QInelastic::M2ShiftVir=20000.;// Shift for M2=-Q2=m_pi^2 of the virtualGamma
-G4double G4QInelastic::DiNuclMass=1880.; // DoubleNucleon Mass for VirtualNormalization
+G4double G4QInelastic::DiNuclMass=1870.; // DoubleNucleon Mass for VirtualNormalization
 G4double G4QInelastic::photNucBias=1.;   // BiasingParameter for photo(e,mu,tau)Nuclear
 G4double G4QInelastic::weakNucBias=1.;   // BiasingParameter for ChargedCurrents(nu,mu) 
@@ -119,18 +119,20 @@
 G4QInelastic::~G4QInelastic()
 {
-  ElementZ.clear();
-  ElProbInMat.clear();
-  for(unsigned i=0; i < ElIsoN.size(); ++i)
-  {
-    std::vector<G4int>* curEIN=ElIsoN[i];
-    curEIN->clear();
-    delete curEIN;
-  }
-  for(unsigned i=0; i < IsoProbInEl.size(); ++i)
-  {
-    std::vector<G4double>* curEIN=IsoProbInEl[i];
-    curEIN->clear();
-    delete curEIN;
-  }
+  // The following is just a copy of what is done in PostStepDoIt every interaction !
+  // The correction is if(IPIE), so just for(...;ip<IPIE;...) does not work ! @@
+  G4int IPIE=IsoProbInEl.size();            // How many old elements?
+  if(IPIE) for(G4int ip=0; ip<IPIE; ++ip)   // Clean up the SumProb's of Isotopes (SPI)
+  {
+    std::vector<G4double>* SPI=IsoProbInEl[ip]; // Pointer to the SPI vector
+    SPI->clear();
+    delete SPI;
+    std::vector<G4int>* IsN=ElIsoN[ip];     // Pointer to the N vector
+    IsN->clear();
+    delete IsN;
+  }
+  ElProbInMat.clear();                      // Clean up the SumProb's of Elements (SPE)
+  ElementZ.clear();                         // Clear the body vector for Z of Elements
+  IsoProbInEl.clear();                      // Clear the body vector for SPI
+  ElIsoN.clear();                           // Clear the body vector for N of Isotopes
 }
 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QIonIonElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QIonIonElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QIonIonElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QIonIonElastic.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QIonIonElastic class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QLowEnergy.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QLowEnergy.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QLowEnergy.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QLowEnergy.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //      ---------------- G4QLowEnergy class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QPDGToG4Particle.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QPDGToG4Particle.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QPDGToG4Particle.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPDGToG4Particle.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------- G4QG4ToG4Particle singletone class ------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QSynchRad.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QSynchRad.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/processes/src/G4QSynchRad.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QSynchRad.cc,v 1.1 2009/11/17 10:36:55 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Created by Mikhail Kosov 6-Nov-2009
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4CHIPSElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4CHIPSElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4CHIPSElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CHIPSElastic.hh,v 1.3 2009/10/08 18:56:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Header : G4CHIPSElastic
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchange.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChargeExchange.hh,v 1.6 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4ChargeExchangeProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChargeExchangeProcess.hh,v 1.3 2008/11/20 12:35:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4DiffuseElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4DiffuseElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4DiffuseElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DiffuseElastic.hh,v 1.17 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4ElasticHadrNucleusHE.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElasticHadrNucleusHE.hh,v 1.47 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4ElasticHadrNucleusHe.hh
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4HadronElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronElastic.hh,v 1.31 2009/10/08 18:56:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4NuclNuclDiffuseElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4NuclNuclDiffuseElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4NuclNuclDiffuseElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NuclNuclDiffuseElastic.hh,v 1.8 2009/04/10 13:22:25 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4UHadronElasticProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UHadronElasticProcess.hh,v 1.10 2006/11/16 20:09:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Hadron Elastic Scattering Process -- header file
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4VHadronElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4VHadronElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4VHadronElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHadronElastic.hh,v 1.4 2009/09/23 14:37:44 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Header : G4VHadronElastic
Index: trunk/source/processes/hadronic/models/coherent_elastic/include/G4WHadronElasticProcess.hh
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/include/G4WHadronElasticProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/include/G4WHadronElasticProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WHadronElasticProcess.hh,v 1.2 2009/09/22 17:35:07 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Hadron Elastic Scattering Process -- header file
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4CHIPSElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4CHIPSElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4CHIPSElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CHIPSElastic.cc,v 1.3 2009/10/08 18:56:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchange.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChargeExchange.cc,v 1.16 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4ChargeExchangeProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ChargeExchangeProcess.cc,v 1.15 2008/11/27 16:43:00 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4DiffuseElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4DiffuseElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4DiffuseElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4DiffuseElastic.cc,v 1.25 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4ElasticHadrNucleusHE.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElasticHadrNucleusHE.cc,v 1.81 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronElastic.cc,v 1.65 2009/10/08 18:56:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4NuclNuclDiffuseElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4NuclNuclDiffuseElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4NuclNuclDiffuseElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NuclNuclDiffuseElastic.cc,v 1.2 2009/04/10 13:22:25 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UHadronElasticProcess.cc,v 1.39 2008/10/22 08:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Hadron Elastic Scattering Process -- header file
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4VHadronElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4VHadronElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4VHadronElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VHadronElastic.cc,v 1.4 2009/09/23 14:37:44 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Header : G4VHadronElastic
Index: trunk/source/processes/hadronic/models/coherent_elastic/src/G4WHadronElasticProcess.cc
===================================================================
--- trunk/source/processes/hadronic/models/coherent_elastic/src/G4WHadronElasticProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/coherent_elastic/src/G4WHadronElasticProcess.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4WHadronElasticProcess.cc,v 1.2 2009/09/22 16:21:46 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Geant4 Hadron Elastic Scattering Process 
Index: trunk/source/processes/hadronic/models/de_excitation/History
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/History	(revision 1228)
@@ -14,4 +14,38 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+09 December 2009 Gunter Folger  (hadr-deex-V09-02-23)
+-----------------------------------------------------
+- Include fixes in ablation by Pete Truscott:
+   Ablation has been updated, largely to comply with updates in
+   G4Evaporation, but also some oddities in the way G4Fragment works 
+   (or doesn't work!), and to fix a bug in fragment identification 
+   when evaporation isn't used.
+
+01 December 2009 Gabriele Cosmo (hadr-deex-V09-02-22)
+-----------------------------------------------------
+- Fixed singletons in utils sub-module to canonical form, to help preventing
+  leaks reported by Valgrind (tag hadr-deex-util-V09-02-01).
+- Corrected argument to std::pow() in G4FermiConfiguration.cc to fix
+  compilation problem on Windows VC7.
+
+27 November 2009 Vladimir Ivanchenko (hadr-deex-V09-02-21)
+----------------------------------------------------------
+- G4ExcitationHandler - cleanup the logic; reduce number internal vectors;
+                        fixed memory leak; should work bit faster
+
+24 November 2009 Vladimir Ivanchenko (hadr-deex-V09-02-20)
+----------------------------------------------------------
+- G4ExcitationHandler - fixed double deletion only on top of tag 18
+
+23 November 2009 Vladimir Ivanchenko (hadr-deex-V09-02-19)
+----------------------------------------------------------
+- G4ExcitationHandler - fixed double deletion; cleanup logic of
+                        new/delete of intermediate G4Fragments
+                        reducing number of coping
+
+22 November 2009 Vladimir Ivanchenko (hadr-deex-V09-02-18)
+----------------------------------------------------------
+- G4FissionLevelDensityParameter tuning using IAEA benchmark
 
 19 November 2009 Vladimir Ivanchenko (hadr-deex-V09-02-17)
Index: trunk/source/processes/hadronic/models/de_excitation/ablation/include/G4WilsonAblationModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/ablation/include/G4WilsonAblationModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/ablation/include/G4WilsonAblationModel.hh	(revision 1228)
@@ -40,6 +40,6 @@
 // MODULE:              G4WilsonAblationModel.hh
 //
-// Version:		B.1
-// Date:		15/04/04
+// Version:		1.0
+// Date:		08/12/2009
 // Author:		P R Truscott
 // Organisation:	QinetiQ Ltd, UK
@@ -58,4 +58,11 @@
 // Beta release
 //
+// 08 December 2009, P R Truscott, QinetiQ Ltd, UK
+// Ver 1.0
+// Introduced vector of evaporation channels and evaporation factory.  Also
+// copied directly over the SumProbabilities class in G4Evaporation.hh at
+// version 9.2.r9, just in cases there's any subtle differences.  See .cc
+// file comments to see impact of the rest of the changes.
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ////////////////////////////////////////////////////////////////////////////////
@@ -67,4 +74,7 @@
 #include "G4ParticleDefinition.hh"
 #include "globals.hh"
+#include "G4VEvaporationFactory.hh"
+#include "G4EvaporationFactory.hh"
+
 
 #include <vector>
@@ -99,21 +109,24 @@
     VectorOfFragmentTypes  evapType;
 
-    class SumProbabilities : 
-      public std::binary_function<G4double,G4double,G4double>
-    {
-      public:
-        SumProbabilities() : total(0.0) {}
-        G4double operator() (G4double& /* probSoFar */, G4VEvaporationChannel*& frag)
-        {
-          total += frag->GetEmissionProbability();
-          return total;
-        }
+    std::vector<G4VEvaporationChannel*> * theChannels;
+    G4VEvaporationFactory * theChannelFactory;
 
-        G4double GetTotal() { return total; }
-      public:
-      G4double total;
+  class SumProbabilities : public std::binary_function<G4double,G4double,G4double>
+  {
+  public:
+    SumProbabilities() : total(0.0) {}
+    G4double operator() (G4double& /* probSoFar */, G4VEvaporationChannel*& frag)
+    { 
+      G4double temp_prob = frag->GetEmissionProbability();
+      if(temp_prob >= 0.0) total += temp_prob;
+      //      total += frag->GetEmissionProbability();
+      return total;
+    }
+    
+    G4double GetTotal() { return total; }
+  public:
+    G4double total;
+    
   };
-                                                                                
-
 
 };
Index: trunk/source/processes/hadronic/models/de_excitation/ablation/src/G4WilsonAblationModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/ablation/src/G4WilsonAblationModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/ablation/src/G4WilsonAblationModel.cc	(revision 1228)
@@ -38,6 +38,6 @@
 // MODULE:              G4WilsonAblationModel.cc
 //
-// Version:		B.1
-// Date:		15/04/04
+// Version:		1.0
+// Date:		08/12/2009
 // Author:		P R Truscott
 // Organisation:	QinetiQ Ltd, UK
@@ -56,4 +56,22 @@
 // Beta release
 //
+// 08 December 2009, P R Truscott, QinetiQ Ltd, UK
+// Ver 1.0
+// Updated as a result of changes in the G4Evaporation classes.  These changes
+// affect mostly SelectSecondariesByEvaporation, and now you have variables
+// associated with the evaporation model which can be changed:
+//    OPTxs to select the inverse cross-section
+//    OPTxs = 0      => Dostrovski's parameterization
+//    OPTxs = 1 or 2 => Chatterjee's paramaterization
+//    OPTxs = 3 or 4 => Kalbach's parameterization
+//    useSICB        => use superimposed Coulomb Barrier for inverse cross
+//                      sections
+// Other problem found with G4Fragment definition using Lorentz vector and
+// **G4ParticleDefinition**.  This does not allow A and Z to be defined for the
+// fragment for some reason.  Now the fragment is defined more explicitly:
+//    G4Fragment *fragment = new G4Fragment(A, Z, lorentzVector);
+// to avoid this quirk.  Bug found in SelectSecondariesByDefault: *type is now
+// equated to evapType[i] whereas previously it was equated to fragType[i].
+// 
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ////////////////////////////////////////////////////////////////////////////////
@@ -123,9 +141,21 @@
 //
   verboseLevel = 0;
+  theChannelFactory = new G4EvaporationFactory();
+  theChannels = theChannelFactory->GetChannel();
+//
+//
+// Set defaults for evaporation classes.  These can be overridden by user
+// "set" methods.
+//
+  OPTxs   = 3;
+  useSICB = false;
 }
 ////////////////////////////////////////////////////////////////////////////////
 //
 G4WilsonAblationModel::~G4WilsonAblationModel()
-{;}
+{
+  if (theChannels != 0) theChannels = 0;
+  if (theChannelFactory != 0) delete theChannelFactory;
+}
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -207,6 +237,7 @@
   G4int DAabl = (G4int) (ex / B);
   if (DAabl > A) DAabl = A;
-  if (verboseLevel >= 2)
-    G4cout <<"Number of nucleons ejected = " <<DAabl <<G4endl;
+// The following lines are no longer accurate given we now treat the final fragment
+//  if (verboseLevel >= 2)
+//    G4cout <<"Number of nucleons ejected = " <<DAabl <<G4endl;
 
 //
@@ -219,5 +250,5 @@
   if (AF > 0)
   {
-    G4double AFd = static_cast<G4double>(AF);
+    G4double AFd = (G4double) AF;
     G4double R = 11.8 / std::pow(AFd, 0.45);
     G4int minZ = Z - DAabl;
@@ -253,8 +284,4 @@
   }
   G4int DZabl = Z - ZF;
-  if (verboseLevel >= 2)
-    G4cout <<"Final fragment      A=" <<AF
-           <<", Z=" <<ZF
-           <<G4endl;
 //
 //
@@ -285,20 +312,44 @@
       DAabl -= (G4int) (n * type->GetBaryonNumber() + 1.0E-10);
       DZabl -= (G4int) (n * type->GetPDGCharge() + 1.0E-10);
-      if (verboseLevel >= 2)
-        G4cout <<"Particle type: " <<std::setw(10) <<type->GetParticleName()
-               <<", number of particles emitted = " <<n
-               <<G4endl;
-    }
-  }
-//
-//
-// Determine the properties of the final nuclear fragment.
+    }
+  }
+//
+//
+// Determine the properties of the final nuclear fragment.  Note that if
+// the final fragment is predicted to have a nucleon number of zero, then
+// really it's the particle last in the vector evapType which becomes the
+// final fragment.  Therefore delete this from the vector if this is the
+// case.
 //
   G4double massFinalFrag = 0.0;
-  if (AF > 0.0)
+  if (AF > 0)
     massFinalFrag = G4ParticleTable::GetParticleTable()->GetIonTable()->
       GetIonMass(ZF,AF);
+  else
+  {
+    G4ParticleDefinition *type = evapType[evapType.size()-1];
+    AF                         = type->GetBaryonNumber();
+    ZF                         = (G4int) (type->GetPDGCharge() + 1.0E-10);
+    evapType.erase(evapType.end()-1);
+  }
   totalEpost   += massFinalFrag;
 //
+//
+// Provide verbose output on the nuclear fragment if requested.
+//
+  if (verboseLevel >= 2)
+  {
+    G4cout <<"Final fragment      A=" <<AF
+           <<", Z=" <<ZF
+           <<G4endl;
+    for (G4int ift=0; ift<nFragTypes; ift++)
+    {
+      G4ParticleDefinition *type = fragType[ift];
+      G4int n                    = std::count(evapType.begin(),evapType.end(),type);
+      if (n > 0) 
+        G4cout <<"Particle type: " <<std::setw(10) <<type->GetParticleName()
+               <<", number of particles emitted = " <<n <<G4endl;
+    }
+  }
 //
 // Add the total energy from the fragment.  Note that the fragment is assumed
@@ -326,4 +377,5 @@
       SelectSecondariesByDefault(G4ThreeVector(0.0,0.0,0.0));
   }
+
   if (AF > 0)
   {
@@ -352,9 +404,9 @@
     G4int ie = 0;
     G4FragmentVector::iterator iter;
-    for (iter = fragmentVector->begin(); iter != fragmentVector->end(); ++iter)
+    for (iter = fragmentVector->begin(); iter != fragmentVector->end(); iter++)
     {
       if (ie == nEvap)
       {
-        G4cout <<*iter  <<G4endl;
+//        G4cout <<*iter  <<G4endl;
         G4cout <<"---------------------------------" <<G4endl;
         G4cout <<"Particles from default emission :" <<G4endl;
@@ -375,4 +427,5 @@
   (G4Fragment *intermediateNucleus)
 {
+  G4Fragment theResidualNucleus = *intermediateNucleus;
   G4bool evaporate = true;
   while (evaporate && evapType.size() != 0)
@@ -386,4 +439,5 @@
     std::vector <G4VEvaporationChannel*>  theChannels;
     theChannels.clear();
+    std::vector <G4VEvaporationChannel*>::iterator i;
     VectorOfFragmentTypes::iterator iter;
     std::vector <VectorOfFragmentTypes::iterator> iters;
@@ -393,4 +447,8 @@
     {
       theChannels.push_back(new G4AlphaEvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -399,4 +457,8 @@
     {
       theChannels.push_back(new G4He3EvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -405,4 +467,8 @@
     {
       theChannels.push_back(new G4TritonEvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -411,4 +477,8 @@
     {
       theChannels.push_back(new G4DeuteronEvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -417,4 +487,8 @@
     {
       theChannels.push_back(new G4ProtonEvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -423,4 +497,8 @@
     {
       theChannels.push_back(new G4NeutronEvaporationChannel);
+      i = theChannels.end() - 1;
+      (*i)->SetOPTxs(OPTxs);
+      (*i)->UseSICB(useSICB);
+//      (*i)->Initialize(theResidualNucleus);
       iters.push_back(iter);
     }
@@ -479,5 +557,5 @@
   for (unsigned i=0; i<evapType.size(); i++)
   {
-    G4ParticleDefinition *type = fragType[i];
+    G4ParticleDefinition *type = evapType[i];
     G4double mass              = type->GetPDGMass();
     G4double e                 = mass + 10.0*eV;
@@ -489,6 +567,13 @@
     G4LorentzVector lorentzVector = G4LorentzVector(direction*p, e);
     lorentzVector.boost(-boost);
+// Possibility that the following line is not correctly carrying over A and Z
+// from particle definition.  Force values.  PRT 03/12/2009.
+//    G4Fragment *fragment          = 
+//      new G4Fragment(lorentzVector, type);
+    G4int A = type->GetBaryonNumber();
+    G4int Z = (G4int) (type->GetPDGCharge() + 1.0E-10);
     G4Fragment *fragment          = 
-      new G4Fragment(lorentzVector, type);
+      new G4Fragment(A, Z, lorentzVector);
+
     fragmentVector->push_back(fragment);
   }
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4AlphaEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaEvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4DeuteronEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronEvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4Evaporation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Evaporation.hh,v 1.7 2009/07/27 10:32:05 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationDefaultGEMFactory.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationDefaultGEMFactory.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationDefaultGEMFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationDefaultGEMFactory.hh,v 1.1 2009/07/27 10:20:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4EvaporationFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationFactory.hh,v 1.3 2006/06/29 20:09:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4He3EvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3EvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4NeutronEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronEvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4ProtonEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonEvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4TritonEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonEvaporationChannel.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/include/G4VEvaporation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporation.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4AlphaEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaEvaporationChannel.cc,v 1.4 2006/06/29 20:10:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4DeuteronEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4Evaporation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Evaporation.cc,v 1.15 2009/09/16 15:32:25 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationDefaultGEMFactory.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationDefaultGEMFactory.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationDefaultGEMFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationDefaultGEMFactory.cc,v 1.1 2009/07/27 10:20:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4EvaporationFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationFactory.cc,v 1.4 2006/06/29 20:10:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4He3EvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3EvaporationChannel.cc,v 1.4 2006/06/29 20:10:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4NeutronEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronEvaporationChannel.cc,v 1.4 2006/06/29 20:10:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4ProtonEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4TritonEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonEvaporationChannel.cc,v 1.4 2006/06/29 20:10:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/evaporation/src/G4VEvaporation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporation.cc,v 1.5 2006/06/29 20:10:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4B9FermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B9FermiFragment.hh,v 1.3 2006/06/29 20:10:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Be8FermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be8FermiFragment.hh,v 1.3 2006/06/29 20:10:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiBreakUp.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FermiBreakUp.hh,v 1.3 2006/06/29 20:11:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfiguration.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FermiConfiguration.hh,v 1.4 2006/06/29 20:11:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4FermiConfigurationList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FermiConfigurationList.hh,v 1.5 2006/06/29 20:12:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4He5FermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He5FermiFragment.hh,v 1.3 2006/06/29 20:12:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4Li5FermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li5FermiFragment.hh,v 1.3 2006/06/29 20:12:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4StableFermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StableFermiFragment.hh,v 1.3 2006/06/29 20:12:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4UnstableFermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnstableFermiFragment.hh,v 1.3 2006/06/29 20:12:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiBreakUp.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFermiBreakUp.hh,v 1.3 2006/06/29 20:12:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/include/G4VFermiFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFermiFragment.hh,v 1.3 2006/06/29 20:12:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4B9FermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B9FermiFragment.cc,v 1.7 2006/06/29 20:12:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Be8FermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be8FermiFragment.cc,v 1.7 2006/06/29 20:12:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4FermiConfiguration.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4FermiConfiguration.cc,v 1.10 2009/11/19 10:41:59 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4FermiConfiguration.cc,v 1.12 2009/12/16 17:51:09 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -143,5 +143,5 @@
 	arg2-=2;
       }
-    Gamma=Gamma/std::pow(2,n)*sqrt(pi);
+    Gamma=Gamma/std::pow(2.,n)*std::sqrt(pi);
   }
   // end of new implementation of Gamma function
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4He5FermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He5FermiFragment.cc,v 1.7 2006/06/29 20:13:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4Li5FermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li5FermiFragment.cc,v 1.7 2006/06/29 20:13:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4StableFermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StableFermiFragment.cc,v 1.5 2006/06/29 20:13:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4UnstableFermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UnstableFermiFragment.cc,v 1.8 2006/06/29 20:13:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiBreakUp.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFermiBreakUp.cc,v 1.5 2006/06/29 20:13:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fermi_breakup/src/G4VFermiFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFermiFragment.cc,v 1.5 2006/06/29 20:13:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4CompetitiveFission.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompetitiveFission.hh,v 1.3 2006/06/29 20:13:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionBarrier.hh,v 1.3 2006/06/29 20:13:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionLevelDensityParameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionLevelDensityParameter.hh,v 1.3 2006/06/29 20:13:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionParameters.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionParameters.hh,v 1.3 2006/06/29 20:13:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4FissionProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionProbability.hh,v 1.3 2006/06/29 20:13:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/include/G4VFissionBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFissionBarrier.hh,v 1.4 2006/06/29 20:13:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4CompetitiveFission.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CompetitiveFission.cc,v 1.11 2009/03/13 18:57:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionBarrier.cc,v 1.5 2006/06/29 20:13:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionLevelDensityParameter.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4FissionLevelDensityParameter.cc,v 1.6 2009/11/19 10:32:42 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4FissionLevelDensityParameter.cc,v 1.7 2009/11/21 18:05:26 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -73,8 +73,13 @@
     theEvaporationLevelDensityParameter.LevelDensityParameter(A,Z,U);
 
+  if(Z >= 89)      { EvapLDP *= 1.02; }
+  else if(Z >= 85) { EvapLDP *= (1.02 + 0.004*(89 - Z)); }
+  else             { EvapLDP *= 1.04; }
+
+  /*
   if(Z >= 89)      { EvapLDP *= 1.01; }
   else if(Z >= 85) { EvapLDP *= (1.01 + 0.002*(89 - Z)); }
   else             { EvapLDP *= 1.02; }
-
+  */
   return EvapLDP;
 
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionParameters.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionParameters.cc,v 1.7 2009/11/19 10:30:49 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4FissionProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FissionProbability.cc,v 1.9 2009/02/15 17:03:25 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/fission/src/G4VFissionBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFissionBarrier.cc,v 1.4 2006/06/29 20:13:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaGEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4AlphaGEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaGEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B10GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B10GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B10GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B10GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B11GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B11GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B11GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B11GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B12GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B12GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B12GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B12GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B13GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B13GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B13GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B13GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B8GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B8GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4B8GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B8GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be10GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be10GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be10GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be10GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be11GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be11GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be11GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be11GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be12GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be12GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be12GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be12GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be7GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be7GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be7GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be7GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be9GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be9GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Be9GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be9GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C10GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C10GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C10GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C10GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C11GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C11GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C11GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C11GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C12GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C12GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C12GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C12GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C13GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C13GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C13GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C13GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C14GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C14GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C14GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C14GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C15GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C15GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C15GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C15GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C16GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C16GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4C16GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C16GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronGEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4DeuteronGEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronGEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4EvaporationGEMFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationGEMFactory.hh,v 1.7 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F17GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F17GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F17GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F17GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F18GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F18GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F18GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F18GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F19GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F19GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F19GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F19GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F20GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F20GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F20GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F20GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F21GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F21GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4F21GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F21GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GEMChannel.hh,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4GEMCoulombBarrierHE.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GEMCoulombBarrierHE.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He3GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He6GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He6GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He6GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He6GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He8GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He8GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4He8GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He8GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li6GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li6GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li6GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li6GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li7GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li7GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li7GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li7GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li8GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li8GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li8GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li8GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li9GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li9GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Li9GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li9GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg22GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg22GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg22GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg22GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg23GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg23GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg23GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg23GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg24GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg24GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg24GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg24GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg25GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg25GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg25GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg25GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg26GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg26GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg26GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg26GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg27GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg27GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg27GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg27GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg28GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg28GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Mg28GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg28GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N12GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N12GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N12GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N12GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N13GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N13GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N13GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N13GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N14GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N14GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N14GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N14GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N15GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N15GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N15GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N15GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N16GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N16GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N16GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N16GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N17GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N17GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4N17GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N17GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na21GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na21GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na21GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na21GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na22GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na22GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na22GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na22GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na23GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na23GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na23GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na23GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na24GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na24GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na24GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na24GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na25GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na25GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Na25GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na25GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne18GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne18GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne18GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne18GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne19GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne19GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne19GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne19GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne20GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne20GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne20GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne20GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne21GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne21GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne21GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne21GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne22GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne22GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne22GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne22GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne23GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne23GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne23GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne23GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne24GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne24GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4Ne24GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne24GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronGEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4NeutronGEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronGEMProbability.hh,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O14GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O14GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O14GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O14GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O15GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O15GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O15GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O15GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O16GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O16GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O16GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O16GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O17GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O17GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O17GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O17GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O18GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O18GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O18GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O18GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O19GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O19GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O19GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O19GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O20GEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O20GEMCoulombBarrier.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4O20GEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O20GEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonGEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4ProtonGEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonGEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonGEMChannel.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/include/G4TritonGEMProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonGEMProbability.hh,v 1.4 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaGEMChannel.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4AlphaGEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaGEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B10GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B11GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B12GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B12GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B13GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B13GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4B8GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4B8GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be10GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be11GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be12GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be12GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be7GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be7GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Be9GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Be9GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C10GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C10GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C11GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C11GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C12GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C12GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C13GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C13GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C14GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C14GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C15GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C15GEMProbability.cc,v 1.6 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4C16GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4C16GEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronGEMChannel.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4DeuteronGEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronGEMProbability.cc,v 1.5 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4EvaporationGEMFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationGEMFactory.cc,v 1.9 2009/09/15 12:54:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F17GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F17GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F18GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F19GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F20GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F20GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4F21GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4F21GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GEMChannel.cc,v 1.10 2009/10/08 07:55:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4GEMCoulombBarrierHE.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GEMCoulombBarrierHE.cc,v 1.7 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3GEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He3GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He6GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He6GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4He8GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He8GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li6GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li6GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li7GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li7GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li8GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li8GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Li9GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Li9GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg22GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg22GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg23GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg23GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg24GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg24GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg25GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg25GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg26GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg26GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg27GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg27GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Mg28GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mg28GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N12GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N12GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N13GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N13GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N14GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N14GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N15GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N15GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N16GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N16GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4N17GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4N17GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na21GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na21GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na22GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na22GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na23GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na23GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na24GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na24GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Na25GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Na25GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne18GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne19GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne20GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne20GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne21GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne21GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne22GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne22GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne23GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne23GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4Ne24GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Ne24GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4NeutronGEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O14GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O14GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O15GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O15GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O16GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O16GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O17GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O17GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O18GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O18GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O19GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O19GEMProbability.cc,v 1.6 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4O20GEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4O20GEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4ProtonGEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonGEMChannel.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/gem_evaporation/src/G4TritonGEMProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonGEMProbability.cc,v 1.5 2009/09/15 12:54:17 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ExcitationHandler.hh,v 1.8 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4ExcitationHandler.hh,v 1.10 2009/11/24 11:18:48 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/handler/src/G4ExcitationHandler.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/handler/src/G4ExcitationHandler.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/handler/src/G4ExcitationHandler.cc	(revision 1228)
@@ -52,4 +52,6 @@
 
 #include "G4ExcitationHandler.hh"
+#include "globals.hh"
+#include "G4LorentzVector.hh"
 #include <list>
 
@@ -121,17 +123,17 @@
   
   // Pointer which will be used to return the final production vector
-  G4FragmentVector * theResult = 0;
+  //G4FragmentVector * theResult = new G4FragmentVector;
   
   // Variables existing until end of method
-  G4Fragment * theInitialStatePtr = const_cast<G4Fragment*>(&theInitialState);
-  //  G4Fragment * theInitialStatePtr = new G4Fragment(theInitialState);
-  G4Fragment theExcitedNucleus;              // object to be passed in BreakItUp methods
+  //G4Fragment * theInitialStatePtr = const_cast<G4Fragment*>(&theInitialState);
+  G4Fragment * theInitialStatePtr = new G4Fragment(theInitialState);
   G4FragmentVector * theTempResult = 0;      // pointer which receives temporal results
   std::list<G4Fragment*> theEvapList;        // list to apply Evaporation, SMF or Fermi Break-Up
   std::list<G4Fragment*> theEvapStableList;  // list to apply PhotonEvaporation
-  std::list<G4Fragment*> theFinalStableList; // list to store final result
+  std::list<G4Fragment*> theResults;         // list to store final result
   std::list<G4Fragment*>::iterator iList;
   //
-  
+  //G4cout << "@@@@@@@@@@ Start G4Exitation Handler @@@@@@@@@@@@@" << G4endl;  
+  //G4cout << theInitialState << G4endl;  
   
   // Variables to describe the excited configuration
@@ -145,6 +147,5 @@
   if (A <= 4)
     {
-      // I store G4Fragment* in theEvapStableList to apply thePhotonEvaporation later
-      
+      // I store G4Fragment* in theEvapStableList to apply thePhotonEvaporation later      
       theEvapStableList.push_back( theInitialStatePtr );
     }
@@ -172,245 +173,216 @@
         }
       
+      G4bool deletePrimary = true;
+      if(theTempResult->size() > 0) 
+	{      
+	  // Store original state in theEvapList
+	  G4FragmentVector::iterator j;
+	  for (j = theTempResult->begin(); j != theTempResult->end(); ++j)
+	    {  
+	      if((*j) == theInitialStatePtr) { deletePrimary = false; }
+	      A = static_cast<G4int>((*j)->GetA()+0.5);  // +0.5 to avoid bad truncation
+
+	      if(A <= 1)      { theResults.push_back(*j); }         // gamma, p, n
+	      else if(A <= 4) { theEvapStableList.push_back(*j); }  // evaporation is not possible
+	      else            { theEvapList.push_back(*j); }        // evaporation is possible
+	    }
+	}
+      if( deletePrimary ) { delete theInitialStatePtr; }
+      delete theTempResult;
+    }
+  //
+  // JMQ 150909: Further steps in de-excitation chain follow ..
       
-      // Store original state in theEvapList
-      G4FragmentVector::iterator j;
-      for (j = theTempResult->begin(); j != theTempResult->end(); j++)
-	{  
-	  theEvapList.push_back(*j);
-	  //  This memory release works with a list but not with a G4FragmentVector 
-	  //	 delete (*j);
+  //G4cout << "## After first step " << theEvapList.size() << " for evap;  "
+  //	 << theEvapStableList.size() << " for photo-evap; " 
+  //	 << theResults.size() << " results. " << G4endl; 
+
+  // ------------------------------
+  // De-excitation loop
+  // ------------------------------
+      
+  for (iList = theEvapList.begin(); iList != theEvapList.end(); ++iList)
+    {
+      A = static_cast<G4int>((*iList)->GetA()+0.5);  // +0.5 to avoid bad truncation
+      Z = static_cast<G4int>((*iList)->GetZ()+0.5);
+	  
+      // In case A <= 4 the fragment will not perform any nucleon emission
+      if (A <= 4)
+	{
+	  // storing G4Fragment* in theEvapStableList to apply thePhotonEvaporation later    
+	  theEvapStableList.push_back(*iList );
 	}
-      delete theTempResult;
-      //theTempResult->clear();
-      //
-      // JMQ 150909: Further steps in de-excitation chain follow ..
+	  
+      else  // If A > 4 we try to apply theFermiModel or theEvaporation
+	{   
+	  // stable fragment  
+	  if ((*iList)->GetExcitationEnergy() <= 0.1*eV) 
+	    { 
+	      theResults.push_back(*iList); 
+	    }
+	  else
+	    {
+	      if ( A < GetMaxA() && Z < GetMaxZ() ) // if satisfied apply Fermi Break-Up
+		{
+		  theTempResult = theFermiModel->BreakItUp(*(*iList));
+		}
+	      else // apply Evaporation in another case
+		{
+		  theTempResult = theEvaporation->BreakItUp(*(*iList));
+		}
+		  
+	      // New configuration is stored in theTempResult, so we can free
+	      // the memory where the previous configuration is
+		  
+	      G4bool deletePrimary = true;
+	      G4int nsec = theTempResult->size();
+		  
+	      // The number of secondaries tells us if the configuration has changed  
+	      if ( nsec > 0 )
+		{
+		  G4FragmentVector::iterator j;
+		  for (j = theTempResult->begin(); j != theTempResult->end(); ++j)
+		    {
+		      if((*j) == (*iList)) { deletePrimary = false; }
+		      A = static_cast<G4int>((*j)->GetA()+0.5);  // +0.5 to avoid bad truncation
+
+		      if(A <= 1)                   { theResults.push_back(*j); }        // gamma, p, n
+		      else if(A <= 4 || 1 == nsec) { theEvapStableList.push_back(*j); } // no evaporation 
+		      else                         { theEvapList.push_back(*j); }      
+		    }
+		}
+	      if( deletePrimary ) { delete (*iList); }
+	      delete theTempResult;
+	      
+	    }
+	} // endif (A <=4)
+    } // end of the loop over theEvapList
+
+  //G4cout << "## After 2nd step " << theEvapList.size() << " was evap;  "
+  //	 << theEvapStableList.size() << " for photo-evap; " 
+  //	 << theResults.size() << " results. " << G4endl; 
       
-      // ------------------------------
-      // De-excitation loop
-      // ------------------------------
-      
-      for (iList = theEvapList.begin(); iList != theEvapList.end(); iList++)
-	{
-	  A = static_cast<G4int>((*iList)->GetA()+0.5);  // +0.5 to avoid bad truncation
-	  Z = static_cast<G4int>((*iList)->GetZ()+0.5);
-	  
-	  // In case A <= 4 the fragment will not perform any nucleon emission
-	  if (A <= 4)
-	    {
-	      // I store G4Fragment* in theEvapStableList to apply thePhotonEvaporation later
-	      
-	      theEvapStableList.push_back(*iList );
-	    }
-	  
-	  else  // If A > 4 we try to apply theFermiModel or theEvaporation
-	    {
-	      exEnergy = (*iList)->GetExcitationEnergy();
-	      
-	      if (exEnergy > 0.0)
-		{
-		  // Check conditions for each model
-		  theExcitedNucleus = *(*iList);
-		  
-		  if ( A < GetMaxA() && Z < GetMaxZ() ) // if satisfied apply Fermi Break-Up
-		    {
-		      theTempResult = theFermiModel->BreakItUp(theExcitedNucleus);
-		    }
-		  else // apply Evaporation in another case
-		    {
-		      theTempResult = theEvaporation->BreakItUp(theExcitedNucleus);
-		    }
-		  
-		  // New configuration is stored in theTempResult, so we can free
-		  // the memory where the previous configuration is
-		  
-		  delete (*iList);
-		  
-		  // And now the theTempResult->size() tells us if the configuration has changed
-		  
-		  if ( theTempResult->size() > 1 )
-		    {
-		      // push_back the result to the end of theEvapList (this same list)
-		      
-		      for (G4FragmentVector::iterator j = theTempResult->begin();
-			   j != theTempResult->end(); j++)
-			{
-			  theEvapList.push_back(*j);
-			}
-		    }
-		  else
-		    {
-		      // push_back the result to theEvapStableList, because
-		      // is still excited, but cannot emmit more nucleons
-		      
-		      for (G4FragmentVector::iterator j = theTempResult->begin();
-			   j != theTempResult->end(); j++)
-			{
-			  theEvapStableList.push_back(*j);
-			}
-		    }
-		  
-		  // after working with theTempResult, clear and delete it
-		  theTempResult->clear();
-		  delete theTempResult;
-		  
-		}
-	      else // exEnergy = 0.0
-		{
-		  // if this fragment is at ground state,
-		  // store it in theFinalStableList
-		  
-		  theFinalStableList.push_back(*iList);
-		  
-		} // endif (exEnergy > 0.0)
-	    } // endif (A <=4)
-	} // end of the loop over theEvapList
-      
-      theEvapList.clear();   // clear all the list and do not free memory pointed by
-                             // each element because this have been done before!
-    }
-  
-  // Now we try to deexcite by means of PhotonEvaporation those fragments
-  // which are still excited.
-  
-  
   // -----------------------
   // Photon-Evaporation loop
   // -----------------------
   
-  for (iList = theEvapStableList.begin(); iList != theEvapStableList.end(); iList++)
+  for (iList = theEvapStableList.begin(); iList != theEvapStableList.end(); ++iList)
     {
+      // take out stable particles and fragments
       A = static_cast<G4int>((*iList)->GetA()+0.5);
-      exEnergy = (*iList)->GetExcitationEnergy();
-      
-      if ( A > 1 && exEnergy > 0.1*eV ) // if so, photon-evaporation is applied
+      if ( A <= 1 )                                       { theResults.push_back(*iList); }
+      else if ((*iList)->GetExcitationEnergy() <= 0.1*eV) { theResults.push_back(*iList); }
+
+      else
 	{
-	  theExcitedNucleus = *(*iList);
-	  theTempResult = thePhotonEvaporation->BreakItUp(theExcitedNucleus);
+	  // photon-evaporation is applied
+	  theTempResult = thePhotonEvaporation->BreakItUp(*(*iList));
 	  
+	  G4bool deletePrimary = true;
+	  G4int nsec = theTempResult->size();
 	  
 	  // if there is a gamma emission then
-	  if (theTempResult->size() > 1)
+	  if (nsec > 1)
 	    {
-	      // first free the memory occupied by the previous state
-	      delete (*iList);
+	      G4FragmentVector::iterator j;
+	      for (j = theTempResult->begin(); j != theTempResult->end(); ++j)
+		{
+		  if((*j) == (*iList)) { deletePrimary = false; }
+		  A = static_cast<G4int>((*j)->GetA()+0.5);  // +0.5 to avoid bad truncation
+
+		  if(A <= 1)                                     { theResults.push_back(*j); }  // gamma, p, n
+		  else if((*j)->GetExcitationEnergy() <= 0.1*eV) { theResults.push_back(*j); }  // stable fragment
+		  else                                           { theEvapStableList.push_back(*j); }      
+		}
+	    }
 	      
-	      // and now add the final state from gamma emission to the end of
-	      // theEvapStableList
-	      for (G4FragmentVector::reverse_iterator ri = theTempResult->rbegin(); 
-		   ri != theTempResult->rend(); ++ri)
-		// reversed is applied in order to have residual nucleus in first position
+	  else if(1 == nsec) 
+	    {
+	      G4FragmentVector::iterator j = theTempResult->begin();
+	      if((*j) == (*iList)) { deletePrimary = false; }
+	      // Let's create a G4Fragment pointer representing the gamma emmited
+	      G4LorentzVector lv = (*j)->GetMomentum();
+              G4double Mass = (*j)->GetGroundStateMass();
+              G4double Ecm = lv.m();
+              if(Ecm - Mass > 0.1*eV) 
 		{
-		  
-#ifdef PRECOMPOUND_TEST
-		  if ((*ri)->GetA() == 0)
-		    (*ri)->SetCreatorModel(G4String("G4PhotonEvaporation"));
-		  else
-		    (*ri)->SetCreatorModel(G4String("ResidualNucleus"));
+		  G4ThreeVector bst = lv.boostVector();
+		  G4double GammaEnergy = 0.5*(Ecm - Mass)*(Ecm + Mass)/Ecm;
+		  G4double cosTheta = 1. - 2. * G4UniformRand(); 
+		  G4double sinTheta = std::sqrt(1. - cosTheta * cosTheta);
+		  G4double phi = twopi * G4UniformRand();
+		  G4LorentzVector Gamma4P(GammaEnergy * sinTheta * std::cos(phi),
+					  GammaEnergy * sinTheta * std::sin(phi),
+					  GammaEnergy * cosTheta,
+					  GammaEnergy);
+		  Gamma4P.boost(bst);  
+		  G4Fragment * theHandlerPhoton = new G4Fragment(Gamma4P,G4Gamma::GammaDefinition());
+		  theResults.push_back(theHandlerPhoton); 
+	      
+		  // And now we update momentum and energy for the nucleus
+		  lv -= Gamma4P;
+		  (*j)->SetMomentum(lv); // Now this fragment has been deexcited!
+		}
+	      // we store the deexcited fragment 
+	      theResults.push_back(*j);
+	    }
+	  if( deletePrimary ) { delete (*iList); }
+	  delete theTempResult;
+	}  
+    } // end of photon-evaporation loop
+
+  //G4cout << "## After 3d step " << theEvapList.size() << " was evap;  "
+  //	 << theEvapStableList.size() << " was photo-evap; " 
+  //	 << theResults.size() << " results. " << G4endl; 
+    
+#ifdef debug
+  CheckConservation(theInitialState,*theResults);
 #endif
-		  
-		  theEvapStableList.push_back(*ri);
-		}
-	      
-	      // now we clean and remove the temporal vector
-	      theTempResult->clear();
-	      delete theTempResult;
-	      
-	    }
-	  else  // if theTempResult->size() = 1
-	    {
-	      // if there is not any gamma emission from this excited fragment
-	      // we have to emmit a gamma which forces the deexcitation
-	      
-	      // First I clean completely theTempResult
-	      
-	      for (G4FragmentVector::iterator j = theTempResult->begin();
-		   j != theTempResult->end(); j++)
-		{
-		  delete (*j);
-		}
-	      
-	      theTempResult->clear();
-	      delete theTempResult;
-	      
-#ifdef debugphoton
-              G4cout << "G4ExcitationHandler: Gamma Evaporation could not deexcite the nucleus: \n"
-                     << "-----------------------------------------------------------------------\n"
-                     << theExcitedNucleus << '\n'
-                     << "-----------------------------------------------------------------------\n";
-#endif
-	      
-	      // Let's create a G4Fragment pointer representing the gamma emmited
-	      G4double GammaEnergy = (*iList)->GetExcitationEnergy();
-	      G4double cosTheta = 1. - 2. * G4UniformRand();
-	      G4double sinTheta = std::sqrt(1. - cosTheta * cosTheta);
-              G4double phi = twopi * G4UniformRand();
-              G4ThreeVector GammaP(GammaEnergy * sinTheta * std::cos(phi),
-                                   GammaEnergy * sinTheta * std::sin(phi),
-                                   GammaEnergy * cosTheta );
-              G4LorentzVector Gamma4P(GammaP,GammaEnergy);
-              G4Fragment * theHandlerPhoton = new G4Fragment(Gamma4P,G4Gamma::GammaDefinition());
-	      
-	      // And now we update momentum and energy for the nucleus
-              G4double Mass = (*iList)->GetGroundStateMass();
-              G4ThreeVector ResidualP((*iList)->GetMomentum().vect() - GammaP);
-              G4double ResidualE = std::sqrt(ResidualP*ResidualP + Mass*Mass);
-              G4LorentzVector Residual4P(ResidualP,ResidualE);
-              (*iList)->SetMomentum(Residual4P); // Now this fragment has been deexcited!
-	      
-	      // we store the deexcited fragment in theFinalStableList
-	      theFinalStableList.push_back(*iList);
-	      
-#ifdef PRECOMPOUND_TEST
-	      theHandlerPhoton->SetCreatorModel("G4ExcitationHandler");
-#endif
-	      
-	      // Finally, we add theHandlerPhoton to theFinalStableList
-	      theFinalStableList.push_back(theHandlerPhoton); 
-	      
-#ifdef debugphoton
-              G4cout << "Emmited photon:\n"
-                     << theFinalStableList.back() << '\n'
-                     << "Residual nucleus after photon emission:\n"
-                     << *(*iList) << '\n'
-                     << "-----------------------------------------------------------------------\n";
-#endif
-	      
-	    }
+
+  G4ReactionProductVector * theReactionProductVector = new G4ReactionProductVector;
+
+  // MAC (24/07/08)
+  // To optimise the storing speed, we reserve space in memory for the vector
+  theReactionProductVector->reserve( theResults.size() );
+
+  G4int theFragmentA, theFragmentZ;
+  G4LorentzVector theFragmentMomentum;
+
+  std::list<G4Fragment*>::iterator i;
+  for (i = theResults.begin(); i != theResults.end(); ++i) 
+    {
+      theFragmentA = static_cast<G4int>((*i)->GetA());
+      theFragmentZ = static_cast<G4int>((*i)->GetZ());
+      theFragmentMomentum = (*i)->GetMomentum();
+      G4ParticleDefinition* theKindOfFragment = 0;
+      if (theFragmentA == 0 && theFragmentZ == 0) {       // photon
+	theKindOfFragment = G4Gamma::GammaDefinition();   
+      } else if (theFragmentA == 1 && theFragmentZ == 0) { // neutron
+	theKindOfFragment = G4Neutron::NeutronDefinition();
+      } else if (theFragmentA == 1 && theFragmentZ == 1) { // proton
+	theKindOfFragment = G4Proton::ProtonDefinition();
+      } else if (theFragmentA == 2 && theFragmentZ == 1) { // deuteron
+	theKindOfFragment = G4Deuteron::DeuteronDefinition();
+      } else if (theFragmentA == 3 && theFragmentZ == 1) { // triton
+	theKindOfFragment = G4Triton::TritonDefinition();
+      } else if (theFragmentA == 3 && theFragmentZ == 2) { // helium3
+	theKindOfFragment = G4He3::He3Definition();
+      } else if (theFragmentA == 4 && theFragmentZ == 2) { // alpha
+	theKindOfFragment = G4Alpha::AlphaDefinition();;
+      } else {
+	theKindOfFragment = theTableOfParticles->FindIon(theFragmentZ,theFragmentA,0,theFragmentZ);
+      }
+      if (theKindOfFragment != 0) 
+	{
+	  G4ReactionProduct * theNew = new G4ReactionProduct(theKindOfFragment);
+	  theNew->SetMomentum(theFragmentMomentum.vect());
+	  theNew->SetTotalEnergy(theFragmentMomentum.e());
+	  theNew->SetFormationTime((*i)->GetCreationTime());
+	  theReactionProductVector->push_back(theNew);
 	}
-      else // case of a nucleon, gamma or very small excitation energy
-	{
-	  // we don't have to do anything, just store the fragment in theFinalStableList
-	  
-	  theFinalStableList.push_back(*iList);
-	  
-	} // A > 1 && exEnergy > 0.1*eV
-      
-    } // end of photon-evaporation loop
-  
-  
-  // The deexcitation from fragments inside theEvapStableList has been finished, so...
-  theEvapStableList.clear();
-  
-  // Now the final state is in theFinalStableList, and we have to send it to theResult vector
-  
-  theResult = new G4FragmentVector;
-  theResult->reserve( theFinalStableList.size() * sizeof(G4Fragment*) );
-  // We reserve enough memory to optimise the storing speed
-  
-  for (iList = theFinalStableList.begin(); iList != theFinalStableList.end(); iList++)
-    {
-      theResult->push_back(*iList);
+      delete (*i);
     }
-  
-  // After storing the final state , we can clear theFinalStableList
-  theFinalStableList.clear();
-  
-#ifdef debug
-  CheckConservation(theInitialState,theResult);
-#endif
-  
-  
-  // Change G4FragmentVector* to G4ReactionProductVector*
-  return Transform(theResult);
+
+  return theReactionProductVector;
 }
 
Index: trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporationChannel.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/management/include/G4VEvaporationFactory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporationFactory.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporationChannel.cc,v 1.5 2006/06/29 20:23:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/management/src/G4VEvaporationFactory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEvaporationFactory.cc,v 1.6 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4Solver.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Solver.hh,v 1.4 2006/06/29 20:23:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMF.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMF.hh,v 1.3 2006/06/29 20:24:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFChannel.hh,v 1.3 2006/06/29 20:24:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFFragment.hh,v 1.3 2006/06/29 20:24:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroBiNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroBiNucleon.hh,v 1.4 2008/10/24 23:03:33 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroChemicalPotential.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroChemicalPotential.hh,v 1.3 2006/06/29 20:24:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroMultiNucleon.hh,v 1.3 2006/06/29 20:24:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroMultiplicity.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroMultiplicity.hh,v 1.3 2006/06/29 20:24:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroNucleon.hh,v 1.3 2006/06/29 20:24:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTemperature.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTemperature.hh,v 1.3 2006/06/29 20:24:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTetraNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTetraNucleon.hh,v 1.4 2008/10/24 23:03:23 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMacroTriNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTriNucleon.hh,v 1.4 2008/10/24 23:01:32 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroCanonical.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroCanonical.hh,v 1.3 2006/06/29 20:24:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroManager.hh,v 1.3 2006/06/29 20:24:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFMicroPartition.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroPartition.hh,v 1.3 2006/06/29 20:24:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4StatMFParameters.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFParameters.hh,v 1.3 2006/06/29 20:24:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VMultiFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VMultiFragmentation.hh,v 1.3 2006/06/29 20:24:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFEnsemble.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStatMFEnsemble.hh,v 1.3 2006/06/29 20:24:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/include/G4VStatMFMacroCluster.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStatMFMacroCluster.hh,v 1.5 2006/08/19 19:55:09 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4Solver.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Solver.cc,v 1.4 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMF.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMF.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFChannel.cc,v 1.10 2008/11/19 14:33:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFFragment.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFFragment.cc,v 1.7 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroBiNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroBiNucleon.cc,v 1.7 2008/10/24 22:56:42 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroCanonical.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroCanonical.cc,v 1.8 2008/11/19 14:33:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroChemicalPotential.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroChemicalPotential.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroMultiNucleon.cc,v 1.7 2008/11/19 14:33:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroMultiplicity.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroMultiplicity.cc,v 1.7 2008/11/19 14:33:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroNucleon.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTemperature.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTemperature.cc,v 1.7 2008/11/19 14:33:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTetraNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTetraNucleon.cc,v 1.7 2008/10/24 22:57:07 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMacroTriNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMacroTriNucleon.cc,v 1.7 2008/10/24 22:57:24 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroCanonical.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroCanonical.cc,v 1.7 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroManager.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFMicroPartition.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFMicroPartition.cc,v 1.8 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4StatMFParameters.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StatMFParameters.cc,v 1.5 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VMultiFragmentation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VMultiFragmentation.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFEnsemble.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStatMFEnsemble.cc,v 1.6 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/multifragmentation/src/G4VStatMFMacroCluster.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStatMFMacroCluster.cc,v 1.5 2008/07/25 11:20:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4NeutronRadCapture.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4NeutronRadCapture.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4NeutronRadCapture.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronRadCapture.hh,v 1.1 2009/08/31 13:52:42 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NeutronRadCapture.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NeutronRadCapture.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NeutronRadCapture.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4NeutronRadCapture.cc,v 1.3 2009/09/15 19:05:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4NeutronRadCapture.cc,v 1.4 2009/12/16 17:51:11 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -97,5 +97,5 @@
   if(cost > 1.0) {cost = 1.0;}
   else if(cost < -1.0) {cost = -1.0;}
-  G4double sint = sqrt((1. - cost)*(1.0 + cost));
+  G4double sint = std::sqrt((1. - cost)*(1.0 + cost));
   G4double phi  = G4UniformRand()*CLHEP::twopi;
   G4LorentzVector lv2(e1*sint*std::cos(phi),e1*sint*std::sin(phi),e1*cost,e1);   
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4AlphaCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaCoulombBarrier.hh,v 1.4 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertPairingCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CameronGilbertPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronGilbertShellCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CameronGilbertShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronShellPlusPairingCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CameronShellPlusPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfPairingCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CameronTruranHilfPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CameronTruranHilfShellCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CameronTruranHilfShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4ConstantLevelDensityParameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ConstantLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations (photon evaporation)
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookPairingCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CookPairingCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CookShellCorrections.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CookShellCorrections.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4CoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CoulombBarrier.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4DeuteronCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4EvaporationLevelDensityParameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationLevelDensityParameter.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4He3CoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3CoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4NeutronCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4PairingCorrection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PairingCorrection.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4ProtonCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4ShellCorrection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ShellCorrection.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4TritonCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4VCoulombBarrier.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCoulombBarrier.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4VEmissionProbability.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEmissionProbability.hh,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/include/G4VLevelDensityParameter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VLevelDensityParameter.hh,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4AlphaCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4AlphaCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertPairingCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CameronGilbertPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CameronGilbertPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -75,9 +75,10 @@
 
 G4CameronGilbertPairingCorrections::~G4CameronGilbertPairingCorrections()
-{ delete theInstance; }
+{;}
 
 G4CameronGilbertPairingCorrections* G4CameronGilbertPairingCorrections::GetInstance()
 {
-  if (!theInstance) theInstance = new G4CameronGilbertPairingCorrections();
+  static G4CameronGilbertPairingCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronGilbertShellCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CameronGilbertShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CameronGilbertShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -75,9 +75,10 @@
 
 G4CameronGilbertShellCorrections::~G4CameronGilbertShellCorrections()
-{ delete theInstance; }
+{;}
 
 G4CameronGilbertShellCorrections* G4CameronGilbertShellCorrections::GetInstance()
 {
-  if (!theInstance) theInstance = new G4CameronGilbertShellCorrections();
+  static G4CameronGilbertShellCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronShellPlusPairingCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CameronShellPlusPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CameronShellPlusPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -93,8 +93,10 @@
 
 G4CameronShellPlusPairingCorrections::~G4CameronShellPlusPairingCorrections()
-{ delete theInstance; }
+{;}
 
-G4CameronShellPlusPairingCorrections* G4CameronShellPlusPairingCorrections::GetInstance() {
-  if (!theInstance) theInstance = new G4CameronShellPlusPairingCorrections();
+G4CameronShellPlusPairingCorrections* G4CameronShellPlusPairingCorrections::GetInstance()
+{
+  static G4CameronShellPlusPairingCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfPairingCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -80,8 +80,10 @@
 
 G4CameronTruranHilfPairingCorrections::~G4CameronTruranHilfPairingCorrections()
-{ delete theInstance; }
+{;}
 
-G4CameronTruranHilfPairingCorrections* G4CameronTruranHilfPairingCorrections::GetInstance() {
-  if (!theInstance) theInstance = new G4CameronTruranHilfPairingCorrections();
+G4CameronTruranHilfPairingCorrections* G4CameronTruranHilfPairingCorrections::GetInstance()
+{
+  static G4CameronTruranHilfPairingCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CameronTruranHilfShellCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CameronTruranHilfShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CameronTruranHilfShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -82,8 +82,10 @@
 
 G4CameronTruranHilfShellCorrections::~G4CameronTruranHilfShellCorrections()
-{ delete theInstance; }
+{;}
 
-G4CameronTruranHilfShellCorrections* G4CameronTruranHilfShellCorrections::GetInstance() {
-  if (!theInstance) theInstance = new G4CameronTruranHilfShellCorrections();
+G4CameronTruranHilfShellCorrections* G4CameronTruranHilfShellCorrections::GetInstance()
+{
+  static G4CameronTruranHilfShellCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookPairingCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CookPairingCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CookPairingCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -74,8 +74,10 @@
 
 G4CookPairingCorrections::~G4CookPairingCorrections()
-{ delete theInstance; }
+{;}
 
-G4CookPairingCorrections* G4CookPairingCorrections::GetInstance() {
-  if (!theInstance) theInstance = new  G4CookPairingCorrections();
+G4CookPairingCorrections* G4CookPairingCorrections::GetInstance()
+{
+  static G4CookPairingCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CookShellCorrections.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4CookShellCorrections.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4CookShellCorrections.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -74,8 +74,10 @@
 
 G4CookShellCorrections::~G4CookShellCorrections()
-{ delete theInstance; }
+{;}
 
-G4CookShellCorrections* G4CookShellCorrections::GetInstance() {
-  if (!theInstance) theInstance = new G4CookShellCorrections();
+G4CookShellCorrections* G4CookShellCorrections::GetInstance()
+{
+  static G4CookShellCorrections theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4CoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CoulombBarrier.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4DeuteronCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DeuteronCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4EvaporationLevelDensityParameter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EvaporationLevelDensityParameter.cc,v 1.9 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4He3CoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4He3CoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4NeutronCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4PairingCorrection.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4PairingCorrection.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4PairingCorrection.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -45,9 +45,10 @@
 
 G4PairingCorrection::~G4PairingCorrection()
-{ delete theInstance; }
+{;}
 
 G4PairingCorrection* G4PairingCorrection::GetInstance()
 {
-  if (!theInstance) theInstance = new G4PairingCorrection();
+  static G4PairingCorrection theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }   
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4ProtonCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProtonCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4ShellCorrection.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4ShellCorrection.cc,v 1.5 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4ShellCorrection.cc,v 1.6 2009/11/30 10:33:33 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -46,10 +46,10 @@
 G4ShellCorrection::~G4ShellCorrection()
 {
-  delete theInstance;
 }
 
 G4ShellCorrection* G4ShellCorrection::GetInstance()
 {
-  if (!theInstance) theInstance = new G4ShellCorrection();
+  static G4ShellCorrection theCorrections;
+  if (!theInstance)  { theInstance = &theCorrections; }
   return theInstance;
 }   
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4TritonCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TritonCoulombBarrier.cc,v 1.5 2008/09/19 13:32:54 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4VCoulombBarrier.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VCoulombBarrier.cc,v 1.7 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4VEmissionProbability.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VEmissionProbability.cc,v 1.7 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc
===================================================================
--- trunk/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/de_excitation/util/src/G4VLevelDensityParameter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VLevelDensityParameter.cc,v 1.6 2009/03/04 11:05:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear De-excitations
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiKaonZeroInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiLambdaInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiNeutronInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiOmegaMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiProtonInelastic.hh,v 1.15 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaPlusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaZeroInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiXiMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiXiZeroInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonPlusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroInelastic.hh,v 1.13 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroLongInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroShortInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HELambdaInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HENeutronInelastic.hh,v 1.15 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEOmegaMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPionMinusInelastic.hh,v 1.15 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPionPlusInelastic.hh,v 1.15 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPlot.hh,v 1.9 2006/06/29 20:29:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEProtonInelastic.hh,v 1.15 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaPlusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaZeroInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEVector.hh,v 1.12 2006/06/29 20:29:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEXiMinusInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEXiZeroInelastic.hh,v 1.14 2007/04/11 18:11:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiKaonZeroInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiLambdaInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiNeutronInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiProtonInelastic.cc,v 1.14 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiSigmaZeroInelastic.cc,v 1.10 2006/06/29 20:30:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiXiMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEAntiXiZeroInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonMinusInelastic.cc,v 1.14 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonPlusInelastic.cc,v 1.14 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroLongInelastic.cc,v 1.10 2006/06/29 20:30:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEKaonZeroShortInelastic.cc,v 1.10 2006/06/29 20:30:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HELambdaInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HENeutronInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEOmegaMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPionMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 // 11-OCT-2007 F.W. Jones: fixed incorrect Imax (should be Imin) in
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPionPlusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEPlot.cc,v 1.11 2006/06/29 20:30:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEProtonInelastic.cc,v 1.14 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaPlusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HESigmaZeroInelastic.cc,v 1.11 2006/06/29 20:30:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEVector.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEVector.cc,v 1.20 2006/11/22 23:52:32 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEXiMinusInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HEXiZeroInelastic.cc,v 1.15 2008/03/17 20:49:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/im_r_matrix/History
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/History	(revision 1228)
@@ -14,4 +14,17 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+30-Nov-2009 Gunter Folger                hadr-im_r-V09-02-02
+-  Fix compilation error in gcc 4.3 (typeinfo)
+
+20-Nov-2009 Gunter Folger                hadr-im_r-V09-02-01
+-  Reduce usage of strings. Maps of cross sections use G4Particledefinition
+   in place of particle name
+
+19-Nov-2009 Gunter Folger/Tatsumi Koi    hadr-im_r-V09-02-00
+-  G4CollisionComposite.cc: Fix for reproducability provided by Tatsumi. 
+   Removed the dependance of the energy grid of the cross section set
+   on the order of the particles by forcing heavier particle to be at rest
+   when caching the cross section.
 
 8-Dec-2008  Gunter Folger           hadr-im_r-V09-01-01
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CollisionInitialState.hh,v 1.4.4.2 2006/06/29 20:31:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4CollisionInitialState.hh,v 1.0 1998/06/30
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ListOfCollisions.hh,v 1.1.4.2 2006/06/29 20:35:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4ListOfCollisions.hh,v 1.0 1998/06/30
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh	(revision 1228)
@@ -76,5 +76,5 @@
                    G4double eParam, G4double power) const;
 
-  G4String FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const;
+  G4ParticleDefinition * FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const;
   
   // Transverse pion mass
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNElasticLowE.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNElasticLowE.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNElasticLowE.hh	(revision 1228)
@@ -78,5 +78,5 @@
   static const G4double _eStepLog;
 
-  std::map <G4String, G4PhysicsVector*, std::less<G4String> > xMap;
+  std::map <G4ParticleDefinition *, G4PhysicsVector*, std::less<G4ParticleDefinition *> > xMap;
 
   G4double _eMin;
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNTotalLowE.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNTotalLowE.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNTotalLowE.hh	(revision 1228)
@@ -66,6 +66,7 @@
   static const G4int tableSize;
 
-  std::map <G4String, G4LowEXsection *, std::less<G4String> > theCrossSections;
-  typedef std::map <G4String, G4LowEXsection*, std::less<G4String> > LowEMap;
+  std::map <G4ParticleDefinition *, G4LowEXsection *,
+  std::less<G4ParticleDefinition *> > theCrossSections;
+  typedef std::map <G4ParticleDefinition *, G4LowEXsection*, std::less<G4ParticleDefinition *> > LowEMap;
 
 };
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGElastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4XPDGElastic.hh,v 1.2 2006/06/29 20:36:48 gunter Exp $ //
+// $Id: G4XPDGElastic.hh,v 1.2.2.1 2009/11/20 16:25:08 gunter Exp $ //
 // ---------------------------------------------------------------
 //      GEANT4 Class file
@@ -48,5 +48,5 @@
 #include <map>
 
-typedef std::pair<G4String,G4String> G4StringPair;
+typedef std::pair<G4ParticleDefinition *,G4ParticleDefinition *> G4pDefPair;
 
 class G4KineticTrack;
@@ -96,7 +96,7 @@
   static const G4double npbarPDGFit[7];
 
-  std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > xMap;
+  std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > xMap;
 
-  typedef std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > PairDoubleMap;
+  typedef std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > PairDoubleMap;
 
   //  G4double pMinFit;
Index: trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGTotal.hh
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGTotal.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGTotal.hh	(revision 1228)
@@ -48,5 +48,5 @@
 #include <vector>
 
-typedef std::pair<G4String,G4String> G4StringPair;
+typedef std::pair<G4ParticleDefinition *,G4ParticleDefinition *> G4pDefPair;
 
 class G4KineticTrack;
@@ -97,6 +97,6 @@
   static const G4double gammagammaPDGFit[5];
 
-  std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > xMap;
-  typedef std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > PairDoubleMap;
+  std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > xMap;
+  typedef std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > PairDoubleMap;
 
   //  G4double eMinFit;
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4CollisionManager.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4CollisionManager.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4CollisionManager.cc	(revision 1228)
@@ -27,4 +27,7 @@
 #include "G4HadronicException.hh"
 #include "G4CollisionInitialState.hh"
+#include "G4BCAction.hh"
+
+#include <typeinfo>
 
 G4CollisionManager::G4CollisionManager()
@@ -178,8 +181,15 @@
   {
     collision = *i;
+    G4int tgtPdg=collision->GetTarget() ?
+	   collision->GetTarget()->GetDefinition()->GetPDGEncoding() : 0;
     G4cout << "  collision " << collision << " time: "
 	   << collision->GetCollisionTime()/second << " proj: "
-	   << collision->GetPrimary() << " trgt: "
-	   << collision->GetTarget() << G4endl;
+	   << collision->GetPrimary() << "/pdg="
+	   << collision->GetPrimary()->GetDefinition()->GetPDGEncoding()
+	   << " trgt: "
+	   << collision->GetTarget() << "/pdg="
+	   << tgtPdg
+	   << " Collision type: "<< typeid(*collision->GetGenerator()).name()
+	   << G4endl;
   }
 }
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4Scatterer.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4Scatterer.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4Scatterer.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4Scatterer.cc,v 1.13.2.4 2006/06/29 20:40:31 gunter Exp $ //
+// $Id: G4Scatterer.cc,v 1.13.2.4.2.1 2009/11/20 16:25:08 gunter Exp $ //
 //
 
@@ -126,6 +126,4 @@
 //	    << G4endl;
 
-	   // global optimization
-//	   static const G4double maxCrossSection = 500*millibarn;
 	   if(pi*distance>maxCrossSection) return time;
 	   
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4VCrossSectionSource.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4VCrossSectionSource.cc,v 1.5 2006/08/19 21:50:47 dennis Exp $ //
+// $Id: G4VCrossSectionSource.cc,v 1.5.2.1 2009/11/20 16:25:08 gunter Exp $ //
 //
 
@@ -46,8 +46,8 @@
 
 
-G4String G4VCrossSectionSource::
+G4ParticleDefinition * G4VCrossSectionSource::
 FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const
 {
-  G4String result;
+  G4ParticleDefinition * result;
   
   G4ParticleDefinition * p1 = trk1.GetDefinition();
@@ -57,10 +57,10 @@
       (p1==G4Neutron::Neutron() && p2==G4Neutron::Neutron()) )
   {
-    result = G4Proton::Proton()->GetParticleName();
+    result = G4Proton::Proton();
   }
   else if( (p1==G4Neutron::Neutron() && p2==G4Proton::Proton()) ||
            (p2==G4Neutron::Neutron() && p1==G4Proton::Proton()) )
   {
-    result = G4Neutron::Neutron()->GetParticleName();
+    result = G4Neutron::Neutron();
   }
   else
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNElasticLowE.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNElasticLowE.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNElasticLowE.cc	(revision 1228)
@@ -111,6 +111,6 @@
       np->PutValue(i,value);
     }
-  xMap[G4Proton::ProtonDefinition()->GetParticleName()] = pp;
-  xMap[G4Neutron::NeutronDefinition()->GetParticleName()] = np;
+  xMap[G4Proton::ProtonDefinition()] = pp;
+  xMap[G4Neutron::NeutronDefinition()] = np;
 }
 
@@ -118,8 +118,6 @@
 G4XNNElasticLowE::~G4XNNElasticLowE()
 {
-  G4String name_proton = "proton";
-  G4String name_neutron = "neutron";
-  delete xMap[name_proton];
-  delete xMap[name_neutron];
+  delete xMap[G4Proton::ProtonDefinition()];
+  delete xMap[G4Neutron::NeutronDefinition()];
 }
 
@@ -144,7 +142,7 @@
   G4bool dummy = false;
 
-  G4String key = FindKeyParticle(trk1,trk2);
-
-  typedef std::map <G4String, G4PhysicsVector*, std::less<G4String> > StringPhysMap;
+  G4ParticleDefinition * key = FindKeyParticle(trk1,trk2);
+
+  typedef std::map <G4ParticleDefinition *, G4PhysicsVector*, std::less<G4ParticleDefinition *> > StringPhysMap;
 
   if (xMap.find(key)!= xMap.end())
@@ -154,5 +152,5 @@
       for (iter = xMap.begin(); iter != xMap.end(); ++iter)
 	{
-	  G4String str = (*iter).first;
+	  G4ParticleDefinition * str = (*iter).first;
           if (str == key)
 	    {
@@ -166,4 +164,6 @@
                   sigma = physVector->GetValue(_eMin,dummy);
                 }
+		//G4cout << " sqrtS / sigma " << sqrtS/GeV << " / " <<
+		//          sigma/millibarn << G4endl;
 	    }
 	}
@@ -181,13 +181,13 @@
   G4bool dummy = false;
   G4int i;
-  G4String key = G4Proton::ProtonDefinition()->GetParticleName();
+  G4ParticleDefinition * key = G4Proton::ProtonDefinition();
   G4PhysicsVector* pp = 0;
 
-  typedef std::map <G4String, G4PhysicsVector*, std::less<G4String> > StringPhysMap;
+  typedef std::map <G4ParticleDefinition *, G4PhysicsVector*, std::less<G4ParticleDefinition *> > StringPhysMap;
   StringPhysMap::const_iterator iter;
 
   for (iter = xMap.begin(); iter != xMap.end(); ++iter)
     {
-      G4String str = (*iter).first;
+      G4ParticleDefinition * str = (*iter).first;
       if (str == key)
 	{
@@ -210,9 +210,9 @@
   G4cout << Name() << ", np cross-section: " << G4endl;
 
-  key = G4Neutron::NeutronDefinition()->GetParticleName();
+  key = G4Neutron::NeutronDefinition();
   G4PhysicsVector* np = 0;
   for (iter = xMap.begin(); iter != xMap.end(); ++iter)
     {
-      G4String str = (*iter).first;
+      G4ParticleDefinition * str = (*iter).first;
       if (str == key)
 	{
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNTotalLowE.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNTotalLowE.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4XNNTotalLowE.cc	(revision 1228)
@@ -65,6 +65,6 @@
       it.second=npTot[i]; np->push_back(it);
     }
-  theCrossSections[G4Proton::ProtonDefinition()->GetParticleName()] = pp;
-  theCrossSections[G4Neutron::NeutronDefinition()->GetParticleName()] = np;
+  theCrossSections[G4Proton::ProtonDefinition()] = pp;
+  theCrossSections[G4Neutron::NeutronDefinition()] = np;
 }
 
@@ -72,9 +72,7 @@
 G4XNNTotalLowE::~G4XNNTotalLowE()
 {
-  G4String name_proton = "proton";
-  G4String name_neutron = "neutron";
   
-  delete theCrossSections[name_proton];
-  delete theCrossSections[name_neutron];
+  delete theCrossSections[G4Proton::ProtonDefinition()];
+  delete theCrossSections[G4Neutron::NeutronDefinition()];
 }
 
@@ -83,5 +81,5 @@
   G4double result = 0.;
   G4double sqrtS = (trk1.Get4Momentum() + trk2.Get4Momentum()).mag();
-  G4String key = FindKeyParticle(trk1,trk2);
+  G4ParticleDefinition * key = FindKeyParticle(trk1,trk2);
 
   if (theCrossSections.find(key)!= theCrossSections.end())
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGElastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGElastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4XPDGElastic.cc,v 1.3 2006/06/29 20:42:42 gunter Exp $ //
+// $Id: G4XPDGElastic.cc,v 1.3.2.1 2009/11/20 16:25:08 gunter Exp $ //
 // -------------------------------------------------------------------
 //      
@@ -74,21 +74,21 @@
 G4XPDGElastic::G4XPDGElastic() 
 {
-  G4String proton = G4Proton::ProtonDefinition()->GetParticleName();
-  G4String neutron = G4Neutron::NeutronDefinition()->GetParticleName();
-  G4String piPlus = G4PionPlus::PionPlusDefinition()->GetParticleName();
-  G4String piMinus = G4PionMinus::PionMinusDefinition()->GetParticleName();
-  G4String KPlus = G4KaonPlus::KaonPlusDefinition()->GetParticleName();
-  G4String KMinus = G4KaonMinus::KaonMinusDefinition()->GetParticleName();
-  G4String antiproton = G4AntiProton::AntiProtonDefinition()->GetParticleName();
-  
-  std::pair<G4String,G4String> pp(proton,proton);
-  std::pair<G4String,G4String> pn(proton,neutron);
-  std::pair<G4String,G4String> piPlusp(piPlus,proton);
-  std::pair<G4String,G4String> piMinusp(piMinus,proton);
-  std::pair<G4String,G4String> KPlusp(KPlus,proton);
-  std::pair<G4String,G4String> KMinusp(KMinus,proton);
-  std::pair<G4String,G4String> nn(neutron,neutron);
-  std::pair<G4String,G4String> ppbar(proton,antiproton);
-  std::pair<G4String,G4String> npbar(antiproton,neutron);
+  G4ParticleDefinition * proton = G4Proton::ProtonDefinition();
+  G4ParticleDefinition * neutron = G4Neutron::NeutronDefinition();
+  G4ParticleDefinition * piPlus = G4PionPlus::PionPlusDefinition();
+  G4ParticleDefinition * piMinus = G4PionMinus::PionMinusDefinition();
+  G4ParticleDefinition * KPlus = G4KaonPlus::KaonPlusDefinition();
+  G4ParticleDefinition * KMinus = G4KaonMinus::KaonMinusDefinition();
+  G4ParticleDefinition * antiproton = G4AntiProton::AntiProtonDefinition();
+  
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> pp(proton,proton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> pn(proton,neutron);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> piPlusp(piPlus,proton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> piMinusp(piMinus,proton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KPlusp(KPlus,proton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KMinusp(KMinus,proton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> nn(neutron,neutron);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> ppbar(proton,antiproton);
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> npbar(antiproton,neutron);
 
   std::vector<G4double> ppData;
@@ -159,6 +159,4 @@
   G4ParticleDefinition* def1 = trk1.GetDefinition();
   G4ParticleDefinition* def2 = trk2.GetDefinition();
-  G4String name1 = def1->GetParticleName();
-  G4String name2 = def2->GetParticleName();     
   
   G4double sqrtS = (trk1.Get4Momentum() + trk2.Get4Momentum()).mag();
@@ -182,7 +180,7 @@
       
       // Order the pair: first is the lower mass particle, second is the higher mass one
-      std::pair<G4String,G4String> trkPair(def1->GetParticleName(),def2->GetParticleName());
+      std::pair<G4ParticleDefinition *,G4ParticleDefinition *> trkPair(def1,def2);
       if (def1->GetPDGMass() > def2->GetPDGMass())
-	trkPair = std::pair<G4String,G4String>(def2->GetParticleName(),def1->GetParticleName());
+	trkPair = std::pair<G4ParticleDefinition *,G4ParticleDefinition *>(def2,def1);
       
       std::vector<G4double> data; 
@@ -204,5 +202,5 @@
 	  for (iter = xMap.begin(); iter != xMap.end(); ++iter)
 	    {
-	      std::pair<G4String,G4String> thePair = (*iter).first;
+	      std::pair<G4ParticleDefinition *,G4ParticleDefinition *> thePair = (*iter).first;
 	      if (thePair == trkPair)
 		{
@@ -245,5 +243,5 @@
     {
       G4cout << "WARNING! G4XPDGElastic::PDGElastic "      
-	     << name1 << "-" << name2
+	     << def1->GetParticleName() << "-" << def2->GetParticleName()
 	     << " elastic cross section: momentum " 
 	     << pLab << " GeV, negative cross section " 
Index: trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGTotal.cc
===================================================================
--- trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGTotal.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/im_r_matrix/src/G4XPDGTotal.cc	(revision 1228)
@@ -68,26 +68,26 @@
 G4XPDGTotal::G4XPDGTotal() 
 {
-  std::pair<G4String,G4String> pp(G4Proton::ProtonDefinition()->GetParticleName(),
-				    G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> pn(G4Proton::ProtonDefinition()->GetParticleName(),
-				    G4Neutron::NeutronDefinition()->GetParticleName());
-  std::pair<G4String,G4String> piPlusp(G4PionPlus::PionPlusDefinition()->GetParticleName(),
-					 G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> piMinusp(G4PionMinus::PionMinusDefinition()->GetParticleName(),
-					  G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> KPlusp(G4KaonPlus::KaonPlusDefinition()->GetParticleName(),
-					G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> KPlusn(G4KaonPlus::KaonPlusDefinition()->GetParticleName(),
-					G4Neutron::NeutronDefinition()->GetParticleName());
-  std::pair<G4String,G4String> KMinusp(G4KaonMinus::KaonMinusDefinition()->GetParticleName(),
-					 G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> KMinusn(G4KaonMinus::KaonMinusDefinition()->GetParticleName(),
-					 G4Neutron::NeutronDefinition()->GetParticleName());
-  std::pair<G4String,G4String> gp(G4Gamma::GammaDefinition()->GetParticleName(),
-				    G4Proton::ProtonDefinition()->GetParticleName());
-  std::pair<G4String,G4String> gg(G4Gamma::GammaDefinition()->GetParticleName(),
-				    G4Gamma::GammaDefinition()->GetParticleName());
-  std::pair<G4String,G4String> nn(G4Neutron::NeutronDefinition()->GetParticleName(),
-				    G4Neutron::NeutronDefinition()->GetParticleName());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> pp(G4Proton::ProtonDefinition(),
+				    G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> pn(G4Proton::ProtonDefinition(),
+				    G4Neutron::NeutronDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> piPlusp(G4PionPlus::PionPlusDefinition(),
+					 G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> piMinusp(G4PionMinus::PionMinusDefinition(),
+					  G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KPlusp(G4KaonPlus::KaonPlusDefinition(),
+					G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KPlusn(G4KaonPlus::KaonPlusDefinition(),
+					G4Neutron::NeutronDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KMinusp(G4KaonMinus::KaonMinusDefinition(),
+					 G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> KMinusn(G4KaonMinus::KaonMinusDefinition(),
+					 G4Neutron::NeutronDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> gp(G4Gamma::GammaDefinition(),
+				    G4Proton::ProtonDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> gg(G4Gamma::GammaDefinition(),
+				    G4Gamma::GammaDefinition());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> nn(G4Neutron::NeutronDefinition(),
+				    G4Neutron::NeutronDefinition());
  
   std::vector<G4double> nnData;
@@ -170,8 +170,8 @@
 
   // Order the pair: first is the lower mass particle, second is the higher mass one
-  std::pair<G4String,G4String> trkPair(def1->GetParticleName(),def2->GetParticleName());
+  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> trkPair(def1,def2);
 
   if (def1->GetPDGMass() > def2->GetPDGMass())
-    trkPair = std::pair<G4String,G4String>(def2->GetParticleName(),def1->GetParticleName());
+    trkPair = std::pair<G4ParticleDefinition *,G4ParticleDefinition *>(def2,def1);
  
   std::vector<G4double> data;   
@@ -183,5 +183,5 @@
       for (iter = xMap.begin(); iter != xMap.end(); ++iter)
 	{
-	  std::pair<G4String,G4String> thePair = (*iter).first;
+	  std::pair<G4ParticleDefinition *,G4ParticleDefinition *> thePair = (*iter).first;
 	  if (thePair == trkPair)
 	    {
Index: trunk/source/processes/hadronic/models/incl/History
===================================================================
--- trunk/source/processes/hadronic/models/incl/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/incl/History	(revision 1228)
@@ -4,5 +4,5 @@
      Geant4 - an Object-Oriented Toolkit for Physics Simulation
      ==========================================================
-$Id: History,v 1.19 2009/11/18 10:43:14 kaitanie Exp $
+$Id: History,v 1.26 2009/12/09 10:36:40 kaitanie Exp $
 ---------------------------------------------------------------------
 
@@ -16,4 +16,44 @@
    * Please list in reverse chronological order (last date on top)
    ---------------------------------------------------------------
+
+09 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-08)
+---------------------------------------------------------
+- Fix: Added a safeguard against division by zero in INCL nucleon
+  transmission probability calculation.
+
+08 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-07)
+---------------------------------------------------------
+- Fix: Added a safeguard against division by zero in INCL
+  initialization.
+
+08 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-06)
+---------------------------------------------------------
+- Fix: Added a safeguard to avoid (hopefully rare) negative energies
+  of INCL output particles. This would result in an attempt to take
+  square root of a negative number.
+
+04 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-05)
+---------------------------------------------------------
+- Fix: Corrected the G4InclAblaLightIonInterface error handling. In
+  case INCL is unable to produce a valid cascade it will return the
+  original projectile particle back to Geant4. Unfortunately in case
+  of the light ion interface it returned a particle with NULL pointer
+  to particle definition.
+- Added safeguards to both G4InclAblaCascadeInterface and
+  G4InclAblaLightIonInterface to prevent returning of particles with
+  NULL definition.
+
+03 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-04)
+---------------------------------------------------------
+- Fix: Added a safeguard against attempts to compute the logarithm of zero in
+  INCL
+
+02 December 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-03)
+---------------------------------------------------------
+- Fix: Corrected datatype problem in INCL initialization
+
+22 November 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-02)
+---------------------------------------------------------
+- Fix: Activated Geant4 random number generator instead of the built-in one.
 
 18 November 2009 - Pekka Kaitaniemi (hadr-incl-V09-02-01)
Index: trunk/source/processes/hadronic/models/incl/src/G4Incl.cc
===================================================================
--- trunk/source/processes/hadronic/models/incl/src/G4Incl.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/incl/src/G4Incl.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4Incl.cc,v 1.22 2009/11/18 10:43:14 kaitanie Exp $ 
+// $Id: G4Incl.cc,v 1.29 2009/12/09 10:36:40 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -49,6 +49,6 @@
   densFunction = 5;
 
-  //  randomGenerator = new G4InclGeant4Random();
-  randomGenerator = new G4Ranecu();
+  randomGenerator = new G4InclGeant4Random();
+  //randomGenerator = new G4Ranecu();
 }
 
@@ -94,6 +94,6 @@
   varntp = aVarntp;
 
-  //  randomGenerator = new G4InclGeant4Random();
-  randomGenerator = new G4Ranecu();
+  randomGenerator = new G4InclGeant4Random();
+  // randomGenerator = new G4Ranecu();
   light_gaus_nuc = new G4LightGausNuc();
   light_nuc = new G4LightNuc();
@@ -855,4 +855,5 @@
   if(nopart > -1) {
     for(G4int j = 0; j < nopart; j++) {
+      if(ep[j] < 0.0) continue; // Workaround to avoid negative energies (and taking std::sqrt of a negative number).
       varntp->itypcasc[j] = 1;
       // kind(): 1=proton, 2=neutron, 3=pi+, 4=pi0, 5=pi -      
@@ -1086,5 +1087,5 @@
 
   G4double xrand = 0.0;
-  G4double ialdep = 0.0;
+  G4long ialdep = 0;
   G4int imat = 0;
   G4int iamat = 0, izmat = 0;
@@ -1126,5 +1127,5 @@
     }
 
-    hazard->ial = int(ialdep);
+    hazard->ial = ialdep;
   }
 
@@ -1430,4 +1431,8 @@
 {
   for(G4int i=0; i < saxw->n-1; i++) {
+    if((saxw->x[i+1][k] - saxw->x[i][k]) == 0.0) { // Safeguard to avoid division by zero
+      saxw->s[i][k] = 0.0;
+      continue;
+    }
     saxw->s[i][k] = (saxw->y[i+1][k] - saxw->y[i][k]) / (saxw->x[i+1][k] - saxw->x[i][k]);
   }
@@ -6860,5 +6865,5 @@
     x = std::sqrt(E*(E - v0));
     barr = 4.0*x/(E + E - v0 + x + x);
-    if (iz > 0) {
+    if (iz > 0 && izn != 0) { // izn = 0 causes division by zero
       G4double b = izn*1.44/r;
       G4double px = std::sqrt((E - v0)/b);
@@ -7474,5 +7479,9 @@
       prob = clmb2(rho,eta,&dumm);                                       
     } else {
-      x = std::exp(std::log(eta)/6.0);
+      if(eta <= 1.0e-6) { // Safeguard against a floating point exception
+	x = 0.0;
+      } else {
+	x = std::exp(std::log(eta)/6.0);
+      }
       prob = std::sqrt(dp1 - y*x/(c0 + c1 * std::pow(x,3) + rho * x));
     } 
Index: trunk/source/processes/hadronic/models/incl/src/G4InclAblaCascadeInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/incl/src/G4InclAblaCascadeInterface.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/incl/src/G4InclAblaCascadeInterface.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4InclAblaCascadeInterface.cc,v 1.12 2009/11/18 10:43:14 kaitanie Exp $ 
+// $Id: G4InclAblaCascadeInterface.cc,v 1.13 2009/12/04 13:16:57 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -229,22 +229,22 @@
       if(bulletType == proton) {
         aParticleDefinition = G4Proton::ProtonDefinition();
-      }
-      if(bulletType == neutron) {
+      } else if(bulletType == neutron) {
         aParticleDefinition = G4Neutron::NeutronDefinition();
-      }
-      if(bulletType == pionPlus) {
+      } else if(bulletType == pionPlus) {
         aParticleDefinition = G4PionPlus::PionPlusDefinition();
-      }
-      if(bulletType == pionZero) {
+      } else if(bulletType == pionZero) {
         aParticleDefinition = G4PionZero::PionZeroDefinition();
-      }
-      if(bulletType == pionMinus) {
+      } else if(bulletType == pionMinus) {
         aParticleDefinition = G4PionMinus::PionMinusDefinition();
-      }
-
-      cascadeParticle = new G4DynamicParticle();
-      cascadeParticle->SetDefinition(aParticleDefinition);
-      cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
-      theResult.AddSecondary(cascadeParticle);
+      } else { // Projectile was not regognized
+	aParticleDefinition = 0;
+      }
+
+      if(aParticleDefinition != 0) {
+	cascadeParticle = new G4DynamicParticle();
+	cascadeParticle->SetDefinition(aParticleDefinition);
+	cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
+	theResult.AddSecondary(cascadeParticle);
+      }
     }
 
Index: trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4InclAblaLightIonInterface.cc,v 1.10 2007/12/10 16:31:57 gunter Exp $ 
+// $Id: G4InclAblaLightIonInterface.cc,v 1.11 2009/12/04 13:16:57 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -207,22 +207,30 @@
       if(bulletType == proton) {
         aParticleDefinition = G4Proton::ProtonDefinition();
-      }
-      if(bulletType == neutron) {
+      } else if(bulletType == neutron) {
         aParticleDefinition = G4Neutron::NeutronDefinition();
-      }
-      if(bulletType == pionPlus) {
+      } else if(bulletType == pionPlus) {
         aParticleDefinition = G4PionPlus::PionPlusDefinition();
-      }
-      if(bulletType == pionZero) {
+      } else if(bulletType == pionZero) {
         aParticleDefinition = G4PionZero::PionZeroDefinition();
-      }
-      if(bulletType == pionMinus) {
+      } else if(bulletType == pionMinus) {
         aParticleDefinition = G4PionMinus::PionMinusDefinition();
-      }
-
-      cascadeParticle = new G4DynamicParticle();
-      cascadeParticle->SetDefinition(aParticleDefinition);
-      cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
-      theResult.AddSecondary(cascadeParticle);
+      } else if(bulletType == deuteron) {
+        aParticleDefinition = G4Deuteron::DeuteronDefinition();
+      } else if(bulletType == triton) {
+        aParticleDefinition = G4Triton::TritonDefinition();
+      } else if(bulletType == he3) {
+        aParticleDefinition = G4He3::He3Definition();
+      } else if(bulletType == he4) {
+        aParticleDefinition = G4Alpha::AlphaDefinition();
+      } else { // Particle was not recognized. Probably an unsupported particle was given as input
+	aParticleDefinition = 0;
+      }
+
+      if(aParticleDefinition != 0) {
+	cascadeParticle = new G4DynamicParticle();
+	cascadeParticle->SetDefinition(aParticleDefinition);
+	cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
+	theResult.AddSecondary(cascadeParticle);
+      }
     }
 
Index: trunk/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh
===================================================================
--- trunk/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/leading_particle/include/G4Mars5GeV.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mars5GeV.hh,v 1.5 2006/06/29 20:43:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc
===================================================================
--- trunk/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/leading_particle/src/G4Mars5GeV.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Mars5GeV.cc,v 1.14 2006/06/29 20:43:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/hadronic/models/lll_fission/include/G4FissLib.hh
===================================================================
--- trunk/source/processes/hadronic/models/lll_fission/include/G4FissLib.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/lll_fission/include/G4FissLib.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4FissLib.hh,v 1.2 2007/06/01 13:46:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ********************************************************************
Index: trunk/source/processes/hadronic/models/lll_fission/include/G4FissionLibrary.hh
===================================================================
--- trunk/source/processes/hadronic/models/lll_fission/include/G4FissionLibrary.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/lll_fission/include/G4FissionLibrary.hh	(revision 1228)
@@ -54,5 +54,5 @@
 //
 // $Id: G4FissionLibrary.hh,v 1.4 2007/06/01 14:02:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LCapture.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LCapture.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LCapture.hh,v 1.11 2006/06/29 20:43:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAlphaInelastic.hh,v 1.10 2007/02/24 06:06:38 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy Alpha Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiKaonZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiKaonZeroInelastic.hh,v 1.7 2007/02/24 06:10:26 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonZeroL Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiLambdaInelastic.hh,v 1.11 2007/02/24 06:11:24 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiLambda Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiNeutronInelastic.hh,v 1.11 2007/02/24 06:13:02 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiNeutron Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiOmegaMinusInelastic.hh,v 1.11 2007/02/24 06:13:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiOmegaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4LEAntiProtonInelastic.hh,v 1.11 2007/02/24 05:07:32 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiProton Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiSigmaMinusInelastic.hh,v 1.11 2007/02/24 06:38:14 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiSigmaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiSigmaPlusInelastic.hh,v 1.11 2007/02/24 06:39:17 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiSigmaPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiXiMinusInelastic.hh,v 1.11 2007/02/24 06:42:10 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiXiMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiXiZeroInelastic.hh,v 1.11 2007/02/24 06:43:02 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy AntiXiZero Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEDeuteronInelastic.hh,v 1.10 2007/02/24 06:45:04 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy Deuteron Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonMinusInelastic.hh,v 1.11 2007/02/26 18:21:07 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonPlusInelastic.hh,v 1.11 2007/02/26 18:21:57 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonZeroInelastic.hh,v 1.7 2007/02/26 18:23:45 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonZeroS Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonZeroLInelastic.hh,v 1.12 2007/02/26 18:24:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonZeroSInelastic.hh,v 1.12 2007/02/26 18:25:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LELambdaInelastic.hh,v 1.11 2007/02/26 18:27:08 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy Lambda Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEOmegaMinusInelastic.hh,v 1.11 2007/02/26 18:29:56 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy OmegaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEPionMinusInelastic.hh,v 1.12 2007/02/24 05:23:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy PionMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEPionPlusInelastic.hh,v 1.12 2007/02/24 05:23:52 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy PionPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEProtonInelastic.hh,v 1.12 2007/02/26 18:31:19 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy Proton Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LESigmaMinusInelastic.hh,v 1.11 2007/02/26 18:33:03 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy SigmaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LESigmaPlusInelastic.hh,v 1.11 2007/02/26 18:33:48 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy SigmaPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LETritonInelastic.hh,v 1.10 2007/02/26 18:34:35 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy Triton Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEXiMinusInelastic.hh,v 1.11 2007/02/26 18:35:18 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy XiMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEXiZeroInelastic.hh,v 1.11 2007/02/26 18:36:05 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy XiZero Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LElastic.hh,v 1.12 2007/02/26 19:05:01 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/include/G4LFission.hh
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/include/G4LFission.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/include/G4LFission.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LFission.hh,v 1.11 2006/06/29 20:44:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LCapture.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LCapture.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LCapture.cc,v 1.14 2007/02/24 05:17:29 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiKaonZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiKaonZeroInelastic.cc,v 1.10 2006/06/29 20:44:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonZeroLong Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiLambdaInelastic.cc,v 1.11 2006/06/29 20:44:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiLambda Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiNeutronInelastic.cc,v 1.14 2006/06/29 20:44:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.12 2006/06/29 20:44:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiProtonInelastic.cc,v 1.15 2007/02/24 05:11:27 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiProton Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.11 2006/06/29 20:44:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.11 2006/06/29 20:44:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiXiMinusInelastic.cc,v 1.11 2006/06/29 20:44:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEAntiXiZeroInelastic.cc,v 1.11 2006/06/29 20:44:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonMinusInelastic.cc,v 1.15 2006/06/29 20:44:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonPlusInelastic.cc,v 1.13 2006/06/29 20:45:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEKaonZeroInelastic.cc,v 1.9 2006/06/29 20:45:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Low Energy KaonZeroShort Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LELambdaInelastic.cc,v 1.11 2006/06/29 20:45:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Lambda Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEOmegaMinusInelastic.cc,v 1.12 2006/06/29 20:45:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEPionPlusInelastic.cc,v 1.15 2007/02/24 06:28:52 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: PionPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LESigmaMinusInelastic.cc,v 1.11 2006/06/29 20:45:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: SigmaMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LESigmaPlusInelastic.cc,v 1.11 2006/06/29 20:45:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: SigmaPlus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEXiMinusInelastic.cc,v 1.11 2006/06/29 20:45:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: XiMinus Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LEXiZeroInelastic.cc,v 1.11 2006/06/29 20:45:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: XiZero Inelastic Process
Index: trunk/source/processes/hadronic/models/low_energy/src/G4LFission.cc
===================================================================
--- trunk/source/processes/hadronic/models/low_energy/src/G4LFission.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/low_energy/src/G4LFission.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LFission.cc,v 1.15 2007/02/26 19:29:30 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/management/History
===================================================================
--- trunk/source/processes/hadronic/models/management/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/History	(revision 1228)
@@ -14,4 +14,8 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+2 December 2009 - V.Ivanchenko (hadr-modman-V09-02-08)
+------------------------------------------------------
+-  G4HadronicInteractionRegistry - more accurate model deletion
 
 19 November 2009 Gunter Folger  (hadr-modman-V09-02-07)
Index: trunk/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronicInteraction.hh,v 1.13 2009/10/02 17:18:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Interaction  abstract base class
Index: trunk/source/processes/hadronic/models/management/include/G4HadronicInteractionRegistry.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4HadronicInteractionRegistry.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4HadronicInteractionRegistry.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronicInteractionRegistry.hh,v 1.5 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 23-Jan-2009 V.Ivanchenko make the class to be a singleton
Index: trunk/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4InelasticInteraction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InelasticInteraction.hh,v 1.7 2009/08/30 16:12:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Inelastic Interaction 
Index: trunk/source/processes/hadronic/models/management/include/G4V3DNucleus.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4V3DNucleus.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4V3DNucleus.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4V3DNucleus.hh,v 1.7 2009/11/19 14:29:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4V3DNucleus_h
Index: trunk/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHighEnergyGenerator.hh,v 1.4 2006/06/29 20:45:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VHighEnergyGenerator_h
Index: trunk/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4VIntraNuclearTransportModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIntraNuclearTransportModel.hh,v 1.4 2007/01/11 05:29:46 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30
Index: trunk/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4VKineticNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VKineticNucleon.hh,v 1.4 2006/06/29 20:45:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VKineticNucleon_h
Index: trunk/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4VNuclearDensity.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNuclearDensity.hh,v 1.4 2006/06/29 20:45:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VNuclearDensity_h
Index: trunk/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/include/G4VPreCompoundModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundModel.hh,v 1.5 2007/01/11 05:29:34 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/management/src/G4HadronicInteraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4HadronicInteraction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4HadronicInteraction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4HadronicInteraction.cc,v 1.6 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Interaction  base class
Index: trunk/source/processes/hadronic/models/management/src/G4HadronicInteractionRegistry.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4HadronicInteractionRegistry.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4HadronicInteractionRegistry.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteractionRegistry.cc,v 1.8 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4HadronicInteractionRegistry.cc,v 1.9 2009/12/02 15:57:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 23-Jan-2009 V.Ivanchenko make the class to be a singleton
@@ -53,6 +53,6 @@
 void G4HadronicInteractionRegistry::Clean()
 {
+  size_t nModels = allModels.size();
   //G4cout << "G4HadronicInteractionRegistry::Clean() start " << nModels << G4endl;
-  size_t nModels = allModels.size();
   if(0 < nModels) {
     for (size_t i=0; i<nModels; ++i) {
@@ -60,10 +60,11 @@
 	//G4cout << "delete " << i << G4endl;
         //G4cout << allModels[i]->GetModelName() << G4endl;
-	delete allModels[i];
+	G4HadronicInteraction * model = allModels[i];
 	allModels[i] = 0;
+	delete model;
       }
     }
+    allModels.clear();
   }
-  allModels.clear();
   //G4cout << "G4HadronicInteractionRegistry::Clean() is done " << G4endl; 
 }
@@ -72,8 +73,9 @@
 RegisterMe(G4HadronicInteraction * aModel)
 {
+  if(!aModel) { return; }
   size_t nModels = allModels.size();
   if(nModels > 0) {
     for (size_t i=0; i<nModels; ++i) {
-      if( aModel == allModels[i] ) return;
+      if( aModel == allModels[i] ) { return; }
     }
   }
@@ -86,6 +88,7 @@
 RemoveMe(G4HadronicInteraction * aModel)
 {
+  if(!aModel) { return; }
   size_t nModels = allModels.size();
-  if(0 == nModels) return;
+  if(0 == nModels) { return; }
   for (size_t i=0; i<nModels; ++i) {
     if( aModel == allModels[i] ) {
Index: trunk/source/processes/hadronic/models/management/src/G4InelasticInteraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4InelasticInteraction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4InelasticInteraction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4InelasticInteraction.cc,v 1.12 2009/01/24 11:56:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Inelastic Interaction 
Index: trunk/source/processes/hadronic/models/management/src/G4V3DNucleus.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4V3DNucleus.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4V3DNucleus.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4V3DNucleus.cc,v 1.5 2006/06/29 20:45:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4V3DNucleus.hh"
Index: trunk/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VHighEnergyGenerator.cc,v 1.5 2006/06/29 20:46:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VHighEnergyGenerator
Index: trunk/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.5 2007/01/11 05:28:56 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30
Index: trunk/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VKineticNucleon.cc,v 1.3 2006/06/29 20:46:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4VKineticNucleon.hh"
Index: trunk/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNuclearDensity.cc,v 1.3 2006/06/29 20:46:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundModel.cc,v 1.6 2007/01/11 05:29:10 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InterpolationIterator.hh,v 1.9 2006/06/29 20:46:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4InterpolationIterator_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InterpolationManager.hh,v 1.13 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4InterpolationManager_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InterpolationScheme.hh,v 1.8 2006/06/29 20:46:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4InterpolationScheme_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2AInelasticFS.hh,v 1.9 2006/06/29 20:46:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.9 2006/06/29 20:46:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2N2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2NAInelasticFS.hh,v 1.9 2006/06/29 20:46:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2NAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2NDInelasticFS.hh,v 1.9 2006/06/29 20:46:25 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2NDInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2NInelasticFS.hh,v 1.9 2006/06/29 20:46:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2NInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2NPInelasticFS.hh,v 1.9 2006/06/29 20:46:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2NPInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP2PInelasticFS.hh,v 1.9 2006/06/29 20:46:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP2PInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP3AInelasticFS.hh,v 1.9 2006/06/29 20:46:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP3AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP3NAInelasticFS.hh,v 1.9 2006/06/29 20:46:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP3NAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP3NInelasticFS.hh,v 1.9 2006/06/29 20:46:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP3NInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP3NPInelasticFS.hh,v 1.9 2006/06/29 20:46:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP3NPInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHP4NInelasticFS.hh,v 1.9 2006/06/29 20:46:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHP4NInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPAInelasticFS.hh,v 1.9 2006/06/29 20:46:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPAngular.hh,v 1.12 2007/06/22 09:23:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 070613 fix memory leaking by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPAngularP.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPAngularP_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPArbitaryTab.hh,v 1.12 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPArbitaryTab_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPCapture.hh,v 1.10 2006/06/29 20:46:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPCaptureData.hh,v 1.11 2008/04/28 19:07:54 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPCaptureFS.hh,v 1.11 2006/06/29 20:46:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPCaptureFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPChannel.hh,v 1.15 2008/05/20 21:24:28 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPChannelList.hh,v 1.10 2006/06/29 20:46:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPContAngularPar.hh,v 1.13 2008/07/21 23:26:29 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080718 Add ClearHistories method and related class member
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPContEnergyAngular.hh,v 1.12 2008/07/21 23:26:29 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080721 Add ClearHistories() method by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPD2AInelasticFS.hh,v 1.9 2006/06/29 20:47:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPD2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPDAInelasticFS.hh,v 1.9 2006/06/29 20:47:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPDAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPDInelasticFS.hh,v 1.9 2006/06/29 20:47:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPDInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPData.hh,v 1.9 2006/06/29 20:47:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPDataPoint.hh,v 1.8 2006/06/29 20:47:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPDataPoint_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPDeExGammas.hh,v 1.13 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPDeExGammas_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPDiscreteTwoBody_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPElastic.hh,v 1.10 2006/06/29 20:47:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: High Precision low E neutron tracking
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPElasticData.hh,v 1.11 2008/04/28 19:07:53 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPElasticFS.hh,v 1.12 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 25-08-06 New Final State type (refFlag==3 , Legendre (Low Energy) + Probability (High Energy) )
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPElementData.hh,v 1.10 2008/05/20 21:24:28 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPEnAngCorrelation.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPEnAngCorrelation_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPEnergyDistribution.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPEnergyDistribution_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPEvapSpectrum.hh,v 1.10 2006/06/29 20:47:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPEvapSpectrum_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFCFissionFS.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFCFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFSFissionFS.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFSFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFastLegendre.hh,v 1.11 2006/06/29 20:47:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFastLegendre_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPField.hh,v 1.8 2006/06/29 20:47:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPField_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFieldPoint.hh,v 1.9 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFieldPoint_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFinalState.hh,v 1.15 2008/08/05 22:43:26 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080721 Create adjust_final_state method by T. Koi  
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFission.hh,v 1.10 2006/06/29 20:47:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: High Precision low E neutron tracking
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFissionBaseFS.hh,v 1.13 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFissionBaseFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFissionData.hh,v 1.10 2008/04/16 23:39:56 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFissionERelease.hh,v 1.12 2007/06/08 22:39:50 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 070606 fix for Valgrind by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFissionFS.hh,v 1.9 2006/06/29 20:47:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPFissionSpectrum.hh,v 1.11 2006/06/29 20:47:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPFissionSpectrum_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPGamma.hh,v 1.14 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPGamma_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPHe3InelasticFS.hh,v 1.9 2006/06/29 20:48:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPHe3InelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPInelastic.hh,v 1.9 2006/06/29 20:48:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: High Precision low E neutron tracking
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPInelasticBaseFS.hh,v 1.12 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPInelasticBaseFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPInelasticCompFS.hh,v 1.13 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPInelasticCompFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPInelasticData.hh,v 1.11 2008/04/28 19:07:54 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080417 Add IsZAApplicable method (return false) by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPInterpolator.hh,v 1.20 2008/08/12 00:42:31 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080809 Change interpolation scheme of "histogram", now using LinearLinear
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPIsoData.hh,v 1.16 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPIsoData_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPIsotropic.hh,v 1.10 2006/06/29 20:48:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPIsotropic_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPKallbachMannSyst.hh,v 1.8 2006/06/29 20:48:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPKallbachMannSyst_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPLCFissionFS.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPLCFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPLabAngularEnergy.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPLabAngularEnergy_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPLegendreStore.hh,v 1.12 2008/06/13 00:29:26 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPLegendreStore_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPLegendreTable.hh,v 1.12 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPLegendreTable_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPLevel.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPLevel_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.12 2006/06/29 20:48:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPMadlandNixSpectrum_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPN2AInelasticFS.hh,v 1.9 2006/06/29 20:48:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPN2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPN2PInelasticFS.hh,v 1.9 2006/06/29 20:48:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPN2PInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPN3AInelasticFS.hh,v 1.9 2006/06/29 20:48:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPN3AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNAInelasticFS.hh,v 1.9 2006/06/29 20:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.12 2006/06/29 20:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNBodyPhaseSpace_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPND2AInelasticFS.hh,v 1.9 2006/06/29 20:48:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPND2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNDInelasticFS.hh,v 1.9 2006/06/29 20:48:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNDInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.9 2006/06/29 20:48:49 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNHe3InelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNInelasticFS.hh,v 1.9 2006/06/29 20:48:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNPAInelasticFS.hh,v 1.9 2006/06/29 20:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNPAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNPInelasticFS.hh,v 1.9 2006/06/29 20:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNPInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.9 2006/06/29 20:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNT2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNTInelasticFS.hh,v 1.9 2006/06/29 20:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNTInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNXInelasticFS.hh,v 1.9 2006/06/29 20:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNXInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNames.hh,v 1.15 2006/06/29 20:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNames_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNeutronYield.hh,v 1.10 2006/06/29 20:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPNeutronYield_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPAInelasticFS.hh,v 1.9 2006/06/29 20:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPAInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPDInelasticFS.hh,v 1.9 2006/06/29 20:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPDInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPInelasticFS.hh,v 1.9 2006/06/29 20:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPTInelasticFS.hh,v 1.9 2006/06/29 20:49:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPTInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPartial.hh,v 1.13 2007/06/18 20:56:05 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 070618 Comment out unused private member leaking by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPhotonDist.hh,v 1.17 2008/06/26 02:40:23 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPhotonXSection.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPhotonXSection_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPPolynomExpansion.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPPolynomExpansion_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPProduct.hh,v 1.12 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPProduct_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPSCFissionFS.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPSCFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.11 2006/06/29 20:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPSimpleEvapSpectrum_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPT2AInelasticFS.hh,v 1.9 2006/06/29 20:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPT2AInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPTCFissionFS.hh,v 1.11 2007/06/06 12:45:13 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPTCFissionFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPTInelasticFS.hh,v 1.9 2006/06/29 20:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPTInelasticFS_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPWattSpectrum.hh,v 1.11 2006/06/29 20:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4NeutronHPWattSpectrum_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNeutronHPEDis.hh,v 1.10 2006/06/29 20:50:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VNeutronHPEDis_h
Index: trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VNeutronHPEnergyAngular.hh,v 1.12 2008/07/21 23:26:29 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 080718 Add ClearHistories() method by T. Koi
Index: trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc	(revision 1228)
@@ -34,5 +34,5 @@
 //
 // $Id: G4NeutronHPInelastic.cc,v 1.24 2008/12/03 22:28:48 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 070523 bug fix for G4FPE_DEBUG on by A. Howard (and T. Koi)
Index: trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
===================================================================
--- trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.13 2006/06/29 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4NeutronHPNBodyPhaseSpace.hh"
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/History
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.22 2009/10/29 14:58:52 vuzhinsk Exp $
+$Id: History,v 1.29 2009/12/15 19:20:46 vuzhinsk Exp $
 -------------------------------------------------------------------
 
@@ -15,4 +15,31 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+15 Dec 2009 V.Uzhinsky  (hadr-string-diff-V09-02-23)
+   Bug was fixed for Kaon + A interactions in G4DiffractiveExcitation.cc
+
+------------------------------------------------------------
+15 Dec 2009 G.Folger     (hadr-string-diff-V09-02-22)
+-  G4FTFModel: In ctor, initialise NumberOfInvolvedNucleon
+
+14 Dec. 2009 V. Uzhinsky (hadr-string-diff-V09-02-21)
+  Momentum sampling in the reggeon cascade is improved.
+  More hard restrictions on the momentum are introdused.
+  Infinite loop is erased.
+  Arithmetical bag in kinky string is fixed.
+
+--------------------------------------------------------
+10 Dec. 2009 V. Uzhinsky (hadr-string-diff-V09-02-20)
+  Crush found by Alberto with AveragePt2=0 is erased in FTF.
+  Re-tag of hadr-string-diff-V09-03-00
+-----------------------------------------------------
+9 Dec. 2009 V. Uzhinsky (hadr-string-diff-V09-03-00)
+  Crush found by Alberto with AveragePt2=0 is erased in FTF.
+--------------------------------------------------------
+6 Dec. 2009 V.Uzhinsky (hadr-string-diff-V09-02-19) 
+   Sampling of kinky string momentum is improved
+  
+25 November 2009, V. Uzhinsky (hadr-string-diff-V09-02-18)
+   Memory leak is erased in FTF at the end.
+
 29 October 2009, V. Uzhinsky (hadr-string-diff-V09-02-17)
    Warning meassage is erased for using slc5 compilator in FTFModel.cc
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DiffractiveSplitableHadron.hh,v 1.5 2009/08/03 13:14:19 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FTFModel.hh,v 1.10 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParameters.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParameters.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParameters.hh	(revision 1228)
@@ -28,5 +28,5 @@
 //
 // $Id: G4FTFParameters.hh,v 1.7 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4Proton.hh"
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FTFParticipants.hh,v 1.6 2009/08/03 13:14:19 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveExcitation.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveExcitation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveExcitation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4DiffractiveExcitation.cc,v 1.16 2009/10/06 10:10:36 vuzhinsk Exp $
+// $Id: G4DiffractiveExcitation.cc,v 1.21 2009/12/15 19:14:31 vuzhinsk Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
@@ -73,9 +73,8 @@
                      G4VSplitableHadron *target,
                      G4FTFParameters    *theParameters,
-                     G4ElasticHNScattering *theElastic) const  // Uzhi 03.09.09
+                     G4ElasticHNScattering *theElastic) const  
 {
 // -------------------- Projectile parameters -----------------------
      G4LorentzVector Pprojectile=projectile->Get4Momentum();
-//G4cout<<"Excite P "<<Pprojectile<<G4endl;
 
      if(Pprojectile.z() < 0.)
@@ -88,5 +87,4 @@
 
      G4int    ProjectilePDGcode=projectile->GetDefinition()->GetPDGEncoding();
-//     G4ParticleDefinition * ProjectileDefinition = projectile->GetDefinition();
      G4int    absProjectilePDGcode=std::abs(ProjectilePDGcode);
 
@@ -115,8 +113,4 @@
      G4double M0target = Ptarget.mag();
 
-//G4cout<<"Excite T "<<Ptarget<<G4endl;
-//G4cout<<"PDGs "<<ProjectilePDGcode<<" "<<TargetPDGcode<<G4endl;
-//G4cout<<"Masses "<<M0projectile<<" "<<M0target<<G4endl;
-
      G4double TargetRapidity = Ptarget.rapidity();
 
@@ -149,4 +143,5 @@
 
      G4LorentzVector Ptmp=toCms*Pprojectile;
+
      if ( Ptmp.pz() <= 0. )
      {
@@ -167,6 +162,6 @@
 
      G4double SqrtS=std::sqrt(S);
-//G4cout<<" SqrtS "<<SqrtS<<" 2200 "<<G4endl;
-     if(absProjectilePDGcode > 1000 && SqrtS < 2300*MeV && SqrtS < SumMasses)
+               
+     if(absProjectilePDGcode > 1000 && (SqrtS < 2300*MeV || SqrtS < SumMasses))
      {target->SetStatus(2);  return false;}  // The model cannot work for
                                              // p+p-interactions
@@ -174,5 +169,5 @@
 
      if(( absProjectilePDGcode == 211 || ProjectilePDGcode ==  111) && 
-        (SqrtS < 1600*MeV) && (SqrtS < SumMasses))
+        ((SqrtS < 1600*MeV) || (SqrtS < SumMasses)))
      {target->SetStatus(2);  return false;}  // The model cannot work for
                                              // Pi+p-interactions
@@ -181,5 +176,5 @@
      if(( (absProjectilePDGcode == 321) || (ProjectilePDGcode == -311)   ||
           (absProjectilePDGcode == 311) || (absProjectilePDGcode == 130) ||
-          (absProjectilePDGcode == 310)) && (SqrtS < 1600*MeV) && (SqrtS < SumMasses)) 
+          (absProjectilePDGcode == 310)) && ((SqrtS < 1600*MeV) || (SqrtS < SumMasses))) 
      {target->SetStatus(2);  return false;}  // The model cannot work for
                                              // K+p-interactions
@@ -223,6 +218,4 @@
 // Charge exchange can be possible for baryons -----------------
 
-//G4cout<<1./std::exp(-2.0*(ProjectileRapidity - TargetRapidity))<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
 // Getting the values needed for exchange ----------------------
      G4double MagQuarkExchange        =theParameters->GetMagQuarkExchange();
@@ -231,5 +224,5 @@
 
 //     G4double NucleonMass=
-              (G4ParticleTable::GetParticleTable()->FindParticle(2112))->GetPDGMass();     
+//              (G4ParticleTable::GetParticleTable()->FindParticle(2112))->GetPDGMass();     
      G4double DeltaMass=
               (G4ParticleTable::GetParticleTable()->FindParticle(2224))->GetPDGMass();
@@ -239,10 +232,6 @@
         std::exp(-SlopeQuarkExchange*(ProjectileRapidity - TargetRapidity)))
      {    
-
-//G4cout<<"Exchange "<<G4endl;
-
       G4int NewProjCode(0), NewTargCode(0);
 
-//G4bool StandardExcitation(false); // ================================= 
       G4int ProjQ1(0), ProjQ2(0), ProjQ3(0);
 
@@ -264,9 +253,6 @@
       G4int TargExchangeQ(0);
 
-//G4cout<<"Targ "<<TargQ1<<" "<<TargQ2<<" "<<TargQ3<<G4endl;
       if(absProjectilePDGcode < 1000 )
       {    // projectile is meson ----------------- 
-//G4cout<<"Proj Q1 Q2 "<<ProjQ1<<" "<<ProjQ2<<G4endl;
-
        if(ProjQ1 > 0 ) // ProjQ1 is quark
        {  
@@ -283,5 +269,4 @@
          TargExchangeQ = TargQ3;  TargQ3=ProjExchangeQ; ProjQ1=TargExchangeQ;
         }
-//G4cout<<" Pr Tr "<<ProjQ1<<" "<<TargQ1<<" "<<TargQ2<<" "<<TargQ3<<G4endl;
        } else          // ProjQ2 is quark
        {  
@@ -310,9 +295,6 @@
        }
 
-//       projectile->SetDefinition(
-//       G4ParticleTable::GetParticleTable()->FindParticle(NewProjCode)); 
-
        NewTargCode = NewNucleonId(TargQ1, TargQ2, TargQ3);
- 
+
        if( (TargQ1 == TargQ2) && (TargQ1 == TargQ3) &&
            (SqrtS > M0projectile+DeltaMass))           {NewTargCode +=2;} //Create Delta isobar
@@ -326,13 +308,9 @@
                (SqrtS > M0projectile+DeltaMass))      {NewTargCode +=2;}  //Create Delta isobar
        else                                           {}                 //Save initial nucleon
-
-       target->SetDefinition(
-       G4ParticleTable::GetParticleTable()->FindParticle(NewTargCode)); 
-//G4cout<<"New PDGs "<<NewProjCode<<" "<<NewTargCode<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
-       //}
+//       target->SetDefinition(                                          // Fix 15.12.09
+//       G4ParticleTable::GetParticleTable()->FindParticle(NewTargCode));// Fix 15.12.09 
       } else 
       {    // projectile is baryon ----------------
-G4double Same=0.; //0.3; //0.5;
+       G4double Same=0.; //0.3; //0.5;
        G4bool ProjDeltaHasCreated(false);
        G4bool TargDeltaHasCreated(false);
@@ -341,5 +319,4 @@
        if(G4UniformRand() < 0.5)     // Sampling exchange quark from proj. or targ.
        {   // Sampling exchanged quark from the projectile ---
-//G4cout<<"Proj Exc"<<G4endl;
         if( Ksi < 0.333333 ) 
         {ProjExchangeQ = ProjQ1;}
@@ -348,11 +325,10 @@
         else
         {ProjExchangeQ = ProjQ3;}
-//G4cout<<"ProjExchangeQ "<<ProjExchangeQ<<G4endl;
-
-        if((ProjExchangeQ != TargQ1)||(G4UniformRand()<Same)) // Vova
+
+        if((ProjExchangeQ != TargQ1)||(G4UniformRand()<Same)) 
         {
          TargExchangeQ = TargQ1; TargQ1=ProjExchangeQ; ProjExchangeQ=TargExchangeQ;
         } else
-        if((ProjExchangeQ != TargQ2)||(G4UniformRand()<Same)) // Vova
+        if((ProjExchangeQ != TargQ2)||(G4UniformRand()<Same)) 
         {
          TargExchangeQ = TargQ2; TargQ2=ProjExchangeQ; ProjExchangeQ=TargExchangeQ;
@@ -361,5 +337,5 @@
          TargExchangeQ = TargQ3;  TargQ3=ProjExchangeQ; ProjExchangeQ=TargExchangeQ;
         }
-//G4cout<<"ProjExchangeQ "<<ProjExchangeQ<<G4endl;
+
         if( Ksi < 0.333333 ) 
         {ProjQ1=ProjExchangeQ;}
@@ -369,59 +345,6 @@
         {ProjQ3=ProjExchangeQ;}
 
-/*
-        NewProjCode = NewNucleonId(ProjQ1, ProjQ2, ProjQ3); // *****************************
-
-        if((ProjQ1==ProjQ2) && (ProjQ1==ProjQ3)) {NewProjCode +=2; ProjDeltaHasCreated=true;}
-        else if(projectile->GetDefinition()->GetPDGiIsospin() == 3)// Projectile was Delta
-        { if(G4UniformRand() > DeltaProbAtQuarkExchange)
-                                                 {NewProjCode +=2; ProjDeltaHasCreated=true;} 
-          else                                   {NewProjCode +=0; ProjDeltaHasCreated=false;}
-        }
-        else                                                       // Projectile was Nucleon
-        {
-         if((G4UniformRand() < DeltaProbAtQuarkExchange) && (SqrtS > DeltaMass+M0target)) 
-                                                 {NewProjCode +=2; ProjDeltaHasCreated=true;}
-         else                                    {NewProjCode +=0; ProjDeltaHasCreated=false;}
-        } 
-
-        NewTargCode = NewNucleonId(TargQ1, TargQ2, TargQ3); // *****************************
-
-        if((TargQ1==TargQ2) && (TargQ1==TargQ3)) {NewTargCode +=2; TargDeltaHasCreated=true;}  
-        else if(target->GetDefinition()->GetPDGiIsospin() == 3)    // Target was Delta
-        { if(G4UniformRand() > DeltaProbAtQuarkExchange)
-                                                 {NewTargCode +=2; TargDeltaHasCreated=true;} 
-          else                                   {NewTargCode +=0; TargDeltaHasCreated=false;}
-        }
-        else                                                       // Target was Nucleon
-        {
-         if((G4UniformRand() < DeltaProbAtQuarkExchange) && (SqrtS > M0projectile+DeltaMass)) 
-                                                 {NewTargCode +=2; TargDeltaHasCreated=true;}
-         else                                    {NewTargCode +=0; TargDeltaHasCreated=false;}
-        }         
-
-        if((absProjectilePDGcode == NewProjCode) && (absTargetPDGcode == NewTargCode))
-        { // Nothing was changed! It is not right!?
-        }
-*/
-/*-----------------------------------------------------------------------------------------
-        if(!ProjDeltaHasCreated && !TargDeltaHasCreated) // No Deltas were created then
-        { if( G4UniformRand() < 0.5) {NewProjCode +=2; ProjDeltaHasCreated = true;}
-          else                       {NewTargCode +=2; TargDeltaHasCreated = true;} 
-        }
-
-        if(!(ProjDeltaHasCreated && TargDeltaHasCreated))
-        {
-         if((G4UniformRand() < DeltaProbAtQuarkExchange) && (SqrtS >2600.)) 
-         { 
-G4cout<<"2 Deltas "<<G4endl;
-          if(!ProjDeltaHasCreated)
-               {NewProjCode +=2; ProjDeltaHasCreated = true;}
-          else {NewTargCode +=2; TargDeltaHasCreated = true;} // For Delta isobar
-         }
-        }
-*/
        } else
        {   // Sampling exchanged quark from the target -------
-//G4cout<<"Targ Exc"<<G4endl;
         if( Ksi < 0.333333 ) 
         {TargExchangeQ = TargQ1;}
@@ -430,10 +353,10 @@
         else
         {TargExchangeQ = TargQ3;}
-//G4cout<<"TargExchangeQ "<<TargExchangeQ<<G4endl;
-        if((TargExchangeQ != ProjQ1)||(G4UniformRand()<Same)) // Vova
+
+        if((TargExchangeQ != ProjQ1)||(G4UniformRand()<Same)) 
         {
          ProjExchangeQ = ProjQ1; ProjQ1=TargExchangeQ; TargExchangeQ=ProjExchangeQ;
         } else
-        if((TargExchangeQ != ProjQ2)||(G4UniformRand()<Same)) // Vova
+        if((TargExchangeQ != ProjQ2)||(G4UniformRand()<Same)) 
         {
          ProjExchangeQ = ProjQ2; ProjQ2=TargExchangeQ; TargExchangeQ=ProjExchangeQ;
@@ -442,5 +365,5 @@
          ProjExchangeQ = ProjQ3;  ProjQ3=TargExchangeQ; TargExchangeQ=ProjExchangeQ;
         }
-//G4cout<<"TargExchangeQ "<<TargExchangeQ<<G4endl;
+
         if( Ksi < 0.333333 ) 
         {TargQ1=TargExchangeQ;}
@@ -449,27 +372,5 @@
         else
         {TargQ3=TargExchangeQ;}
-/*
-        NewProjCode = NewNucleonId(ProjQ1, ProjQ2, ProjQ3);
-        if( (ProjQ1 == ProjQ2) && (ProjQ1 == ProjQ3) )  
-        {NewProjCode +=2; ProjDeltaHasCreated = true;}
-
-        NewTargCode = NewNucleonId(TargQ1, TargQ2, TargQ3);
-        if( (TargQ1 == TargQ2) && (TargQ1 == TargQ3) )  
-        {NewTargCode +=2; TargDeltaHasCreated = true;}
-
-        if(!ProjDeltaHasCreated && !TargDeltaHasCreated)
-        {NewTargCode +=2; TargDeltaHasCreated = true;}
-
-        if(!(ProjDeltaHasCreated && TargDeltaHasCreated))
-        {
-         if((G4UniformRand() < DeltaProbAtQuarkExchange) && (SqrtS >2600.)) 
-         { 
-G4cout<<"2 Deltas "<<G4endl;
-          if(!ProjDeltaHasCreated)
-               {NewProjCode +=2; ProjDeltaHasCreated = true;}
-          else {NewTargCode +=2; TargDeltaHasCreated = true;}
-         }
-        }
-*/
+
        } // End of sampling baryon
 
@@ -509,8 +410,4 @@
 // Forming baryons --------------------------------------------------
 
-//       if( ProjDeltaHasCreated && TargDeltaHasCreated ) {StandardExcitation = true;}
-
-//G4cout<<"New PDG "<<NewProjCode<<" "<<NewTargCode<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
       } // End of if projectile is baryon ---------------------------
 
@@ -518,4 +415,5 @@
 // If we assume that final state hadrons after the charge exchange will be
 // in the ground states, we have to put ----------------------------------
+
       if(M0projectile < 
          (G4ParticleTable::GetParticleTable()->FindParticle(NewProjCode))->GetPDGMass())
@@ -537,6 +435,4 @@
              2*S*M0projectile2 - 2*S*M0target2 - 2*M0projectile2*M0target2)
              /4./S;
-//G4cout<<"New Masses "<<M0projectile<<" "<<M0target<<G4endl;
-//G4cout<<"PZcms2 "<<PZcms2<<G4endl;
 
       if(PZcms2 < 0) {return false;}  // It can be if energy is not sufficient for Delta
@@ -556,8 +452,4 @@
       Ptarget.setE(std::sqrt(M0target2+PZcms2));
 
-//G4cout<<"Proj "<<Pprojectile<<" "<<Pprojectile.mag()<<G4endl;
-//G4cout<<"Targ "<<Ptarget<<" "<<Ptarget.mag()<<G4endl;
-
-//      if(!StandardExcitation)
       {
        Pprojectile.transform(toLab);
@@ -571,30 +463,10 @@
 
        G4bool Result= theElastic->ElasticScattering (projectile,target,theParameters);
-//G4cout<<"1 Delta result "<<Result<<"**********"<<G4endl;
+
        return Result;
       } 
-/*
-else
-      {
-       if(M0projectile > ProjectileDiffStateMinMass) 
-       { ProjectileDiffStateMinMass +=200.*MeV; ProjectileNonDiffStateMinMass +=200.*MeV;}
-
-       if(M0target > TargetDiffStateMinMass) 
-       { TargetDiffStateMinMass +=200.*MeV; TargetNonDiffStateMinMass +=200.*MeV;}
-
-       ProbOfDiffraction         = 1.;
-       ProbProjectileDiffraction =0.5;
-       ProbTargetDiffraction     =0.5;
-G4cout<<"Exc DD "<<M0projectile<<" "<<M0target<<" --------------------"<<G4endl;
-//       After that standard FTF excitation
-      }
-*/
      }  // End of charge exchange part ------------------------------
 
 // ------------------------------------------------------------------
-//     G4double ProbOfDiffraction=ProbProjectileDiffraction +
-//                                ProbTargetDiffraction;
-//G4cout<<ProbOfDiffraction<<" "<<ProbProjectileDiffraction<<" "<<ProbTargetDiffraction<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
      if(ProbOfDiffraction!=0.)
      {
@@ -606,6 +478,4 @@
      }
 
-//ProbOfDiffraction=1.; //0.5; // Vova 
-
      G4double ProjectileDiffStateMinMass2    = ProjectileDiffStateMinMass    *
                                                ProjectileDiffStateMinMass;
@@ -617,5 +487,4 @@
      G4double TargetNonDiffStateMinMass2     = TargetNonDiffStateMinMass     *
                                                TargetNonDiffStateMinMass;
-
 
      G4double Pt2;
@@ -637,5 +506,4 @@
         if(G4UniformRand() < ProbProjectileDiffraction)
         { //-------- projectile diffraction ---------------
-//G4cout<<"Proj difr"<<G4endl;
          do {
 //             Generate pt
@@ -659,5 +527,5 @@
                      2.*S*ProjMassT2-2.*S*TargMassT2-2.*ProjMassT2*TargMassT2)
                     /4./S;
-//G4cout<<"PZcms2 < 0 false "<<PZcms2<<G4endl;
+
              if(PZcms2 < 0 ) 
              {
@@ -703,5 +571,4 @@
         { // -------------- Target diffraction ----------------
          do {
-//G4cout<<"Targ difr"<<G4endl;
 //             Generate pt
 //             if (whilecount++ >= 500 && (whilecount%100)==0)
@@ -770,5 +637,4 @@
         else  //----------- Non-diffraction process ------------
         {
-//G4cout<<"Non difr"<<G4endl;
          do {
 //             Generate pt
@@ -841,7 +707,4 @@
 	   Ptarget     -= Qmomentum;
 
-//G4cout<<"Masses "<<Pprojectile.mag()<<" "<<Ptarget.mag()<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
-
 // Transform back and update SplitableHadron Participant.
 	   Pprojectile.transform(toLab);
@@ -865,6 +728,4 @@
 
 // ---------------------------------------------------------------------
-//G4ExcitedString * G4DiffractiveExcitation::
-//           String(G4VSplitableHadron * hadron, G4bool isProjectile) const
 void G4DiffractiveExcitation::CreateStrings(G4VSplitableHadron * hadron, 
                                             G4bool isProjectile,
@@ -886,11 +747,7 @@
 	  return;
 	}
+
         G4LorentzVector Phadron=hadron->Get4Momentum();
-/*
-G4cout<<"Create strings had "<<hadron->GetDefinition()->GetParticleName()<<" "<<Phadron<<" "<<Phadron.mag()<<G4endl;
-G4cout<<"isProjectile "<<isProjectile<<G4endl;
-G4cout<<"start Q "<<start->GetDefinition()->GetPDGEncoding()<<G4endl;
-G4cout<<"end   Q "<<end->GetDefinition()->GetPDGEncoding()<<G4endl;
-*/
+
         G4LorentzVector Pstart(0.,0.,0.,0.);
         G4LorentzVector Pend(0.,0.,0.,0.);
@@ -914,5 +771,5 @@
         G4double W = hadron->Get4Momentum().mag();
         G4double W2=W*W;
-//G4cout<<"W Wmin "<<W<<" "<<Wmin<<G4endl;
+
         G4double Pt(0.), x1(0.), x2(0.), x3(0.);
         G4bool Kink=false;
@@ -922,15 +779,14 @@
           G4double Pt2kink=theParameters->GetPt2Kink();
           Pt = std::sqrt(Pt2kink*(std::pow(W2/16./Pt2kink+1.,G4UniformRand()) - 1.));
-// Pt=0.;
-//G4cout<<"Pt2kink Pt Pt2 "<<Pt2kink<<" "<<Pt<<" "<<Pt*Pt<<G4endl;
+
           if(Pt > 500.*MeV)
           {
              G4double Ymax = std::log(W/2./Pt + std::sqrt(W2/4./Pt/Pt - 1.));
              G4double Y=Ymax*(1.- 2.*G4UniformRand());
-//G4cout<<"Ymax Y "<<Ymax<<" "<<Y<<G4endl;
+
              x1=1.-Pt/W*std::exp( Y);
              x3=1.-Pt/W*std::exp(-Y);
              x2=2.-x1-x3;
-//G4cout<<"X1 X2 X3 "<<x1<<" "<<x2<<" "<<x3<<G4endl;
+
              G4double Mass_startQ = 650.*MeV;
              if(PDGcode_startQ <  3) Mass_startQ =  325.*MeV;
@@ -947,6 +803,6 @@
      
              G4double P2_2=sqr((2.-x1-x3)*W/2.);
-//G4cout<<"P2_1 P2_2 P2_3 "<<P2_1<<" "<<P2_2<<" "<<P2_3<<G4endl;
-             if((P2_1 < 0.) || (P2_3 <0.))
+
+             if((P2_1 <= 0.) || (P2_3 <= 0.))
              { Kink=false;}
              else
@@ -955,8 +811,9 @@
                G4double P_2=std::sqrt(P2_2);
                G4double P_3=std::sqrt(P2_3);
-//G4cout<<"P_1 P_2 P_3 "<<P_1<<" "<<P_2<<" "<<P_3<<G4endl;
+
                G4double CosT12=(P2_3-P2_1-P2_2)/(2.*P_1*P_2);
                G4double CosT13=(P2_2-P2_1-P2_3)/(2.*P_1*P_3);
-//G4cout<<"CosT12 CosT13 "<<CosT12<<" "<<CosT13<<" "<<std::acos(CosT12)*180./3.14159<<" "<<std::acos(CosT13)*180./3.14159<<G4endl;
+//             Pt=P_2*std::sqrt(1.-CosT12*CosT12);  // because system was rotated 11.12.09
+
                if((std::abs(CosT12) >1.) || (std::abs(CosT13) > 1.)) 
                { Kink=false;}
@@ -964,4 +821,5 @@
                { 
                  Kink=true; 
+                 Pt=P_2*std::sqrt(1.-CosT12*CosT12);  // because system was rotated 11.12.09
                  Pstart.setPx(-Pt); Pstart.setPy(0.); Pstart.setPz(P_3*CosT13); 
                  Pend.setPx(   0.); Pend.setPy(  0.); Pend.setPz(          P_1); 
@@ -981,15 +839,8 @@
                  PkinkQ2=Pkink - PkinkQ1;
 //------------------------- Minimizing Pt1^2+Pt3^2 ------------------------------
-/*
-G4cout<<"Pstart "<<Pstart<<G4endl;
-G4cout<<"Pkink  "<<Pkink <<G4endl;
-G4cout<<"Pkink1 "<<PkinkQ1<<G4endl;
-G4cout<<"Pkink2 "<<PkinkQ2<<G4endl;
-G4cout<<"Pend   "<<Pend  <<G4endl;
-*/
+
                  G4double Cos2Psi=(sqr(x1) -sqr(x3)+2.*sqr(x3*CosT13))/
                           std::sqrt(sqr(sqr(x1)-sqr(x3)) + sqr(2.*x1*x3*CosT13));
                  G4double Psi=std::acos(Cos2Psi);
-//G4cout<<"Psi "<<Psi<<" "<<Psi*180./twopi<<G4endl;
 
 G4LorentzRotation Rotate;
@@ -997,6 +848,4 @@
 else             {Rotate.rotateY(pi-Psi);}                   
 Rotate.rotateZ(twopi*G4UniformRand());
-
-//G4cout<<"Rotate"<<G4endl;
 
 Pstart*=Rotate;
@@ -1005,10 +854,5 @@
 PkinkQ2*=Rotate;
 Pend*=Rotate;
-/*
-G4cout<<"Pstart "<<Pstart<<G4endl;
-G4cout<<"Pkink1 "<<PkinkQ1 <<G4endl;
-G4cout<<"Pkink2 "<<PkinkQ2 <<G4endl;
-G4cout<<"Pend   "<<Pend  <<G4endl;
-*/
+
                }
              }      // end of if((P2_1 < 0.) || (P2_3 <0.))
@@ -1018,6 +862,4 @@
 //--------------------------------------------------------------------------------
 
-//G4cout<<"Kink "<<Kink<<G4endl;
-
         if(Kink)
         {                                        // Kink is possible
@@ -1028,37 +870,13 @@
           for(unsigned int Iq=0; Iq <3; Iq++)
           {
-//G4cout<<Iq<<" "<<QuarkProbabilitiesAtGluonSplitUp[Iq]<<G4endl;
+
 if(Ksi > QuarkProbabilitiesAtGluonSplitUp[Iq]) QuarkInGluon++;}
 
-//G4cout<<"Gquark "<<QuarkInGluon<<G4endl;
           G4Parton * Gquark = new G4Parton(QuarkInGluon);
           G4Parton * Ganti_quark = new G4Parton(-QuarkInGluon);
-/*
-G4cout<<Gquark->GetDefinition()->GetParticleName()<<" "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->GetDefinition()->GetPDGMass()<<G4endl;
-G4cout<<Ganti_quark->GetDefinition()->GetParticleName()<<" "<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->GetDefinition()->GetPDGMass()<<G4endl;
-*/
-
-//G4int Uzhi; G4cin>>Uzhi;
 
 //-------------------------------------------------------------------------------
-/*
-DefineMomentumInZ(G4double aLightConeMomentum, G4bool aDirection); 
-      void Set4Momentum(const G4LorentzVector & aMomentum);
-      G4int PDGencoding;
-      G4ParticleDefinition * theDefinition;
-      G4LorentzVector theMomentum;
-      G4ThreeVector   thePosition;
-      
-      G4int theColour;
-      G4double theIsoSpinZ;
-      G4double theSpinZ;
-      
-      G4double theX;
-*/
-//-------------------------------------------------------------------------------
-
-//G4cout<<"Phadron "<<Phadron<<" mass "<<Phadron.mag()<<G4endl;
           G4LorentzRotation toCMS(-1*Phadron.boostVector());
-//G4cout<<"To lab"<<G4endl;
+
           G4LorentzRotation toLab(toCMS.inverse());
 
@@ -1067,14 +885,6 @@
           PkinkQ2.transform(toLab);
           Pend.transform(toLab);    end->Set4Momentum(Pend);
-/*
-G4cout<<"Pstart "<<start->GetDefinition()->GetPDGEncoding()<<Pstart<<G4endl;
-G4cout<<"Pkink1 "<<PkinkQ1 <<G4endl;
-G4cout<<"Pkink2 "<<PkinkQ2 <<G4endl;
-G4cout<<"Pend   "<<end->GetDefinition()->GetPDGEncoding()<<Pend  <<G4endl;
-*/
-// !!!	  G4ExcitedString * FirstString(0); G4ExcitedString * SecondString(0);
+
           G4int absPDGcode=std::abs(hadron->GetDefinition()->GetPDGEncoding());
-
-//G4cout<<"absPDGcode "<<absPDGcode<<G4endl;
 
           if(absPDGcode < 1000)
@@ -1088,16 +898,5 @@
                 Ganti_quark->Set4Momentum(PkinkQ1);
                 Gquark->Set4Momentum(PkinkQ2);
-/*
-G4cout<<" Proj Meson end Q"<<G4endl;
-G4cout<<"First string  ============ "<<G4endl;
-G4cout<<"end  Q "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"G antiQ"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"G    Q "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               } else
               {                            // Anti_Quark on the end
@@ -1106,15 +905,5 @@
                 Gquark->Set4Momentum(PkinkQ1);
                 Ganti_quark->Set4Momentum(PkinkQ2);
-/*
-G4cout<<" Proj Meson end Qbar"<<G4endl;
-G4cout<<"First string  ============ "<<G4endl;
-G4cout<<"end  Q "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"G     Q"<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"G antQ "<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               }   // end of if(end->GetPDGcode() > 0)
             } else {                      // Target
@@ -1125,15 +914,5 @@
                 Ganti_quark->Set4Momentum(PkinkQ2);
                 Gquark->Set4Momentum(PkinkQ1);
-/*
-G4cout<<" Targ Meson end Q"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"G antiQ"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"end  Q "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"G    Q "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               } else
               {                            // Anti_Quark on the end
@@ -1142,15 +921,5 @@
                 Gquark->Set4Momentum(PkinkQ2);
                 Ganti_quark->Set4Momentum(PkinkQ1);
-/*
-G4cout<<" Targ Meson end Qbar"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"G     Q"<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"end  Q "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"G antQ "<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               }   // end of if(end->GetPDGcode() > 0)
 	    }     // end of if ( isProjectile )
@@ -1166,15 +935,5 @@
                 Gquark->Set4Momentum(PkinkQ1);
                 Ganti_quark->Set4Momentum(PkinkQ2);
-/*
-G4cout<<" Proj baryon end QQ"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"end OQ "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"G    Q"<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"G  Qbar"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               } else
               {                            // Anti_DiQuark on the end or quark
@@ -1183,15 +942,5 @@
                 Ganti_quark->Set4Momentum(PkinkQ1);
                 Gquark->Set4Momentum(PkinkQ2);
-/*
-G4cout<<" Proj baryon end Q"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"end OQ "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"G antQ"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"G  Q   "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               }   // end of if(end->GetPDGcode() > 0)
             } else {                      // Target
@@ -1205,15 +954,5 @@
                 Gquark->Set4Momentum(PkinkQ1);
                 Ganti_quark->Set4Momentum(PkinkQ2);
-/*
-G4cout<<" Targ baryon end QQ"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"G  Q   "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"end OQ "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"G  Qbar"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               } else
               {                            // Anti_DiQuark on the end or Q
@@ -1222,15 +961,5 @@
                 Gquark->Set4Momentum(PkinkQ2);
                 Ganti_quark->Set4Momentum(PkinkQ1);
-/*
-G4cout<<" Targ baryon end Q"<<G4endl;
-G4cout<<"First string   ============ "<<G4endl;
-G4cout<<"G  Qbar"<<Ganti_quark->GetDefinition()->GetPDGEncoding()<<" "<<Ganti_quark->Get4Momentum()<<G4endl;
-G4cout<<"end O "<<end->GetDefinition()->GetPDGEncoding()<<" "<<end->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Ganti_quark->Get4Momentum()+end->Get4Momentum())<<G4endl;
-G4cout<<"Secondstring   ============ "<<G4endl;
-G4cout<<"startQ "<<start->GetDefinition()->GetPDGEncoding()<<" "<<start->Get4Momentum()<<G4endl;
-G4cout<<"G  Q   "<<Gquark->GetDefinition()->GetPDGEncoding()<<" "<<Gquark->Get4Momentum()<<G4endl;
-G4cout<<"Sum P  "<<(Gquark->Get4Momentum()+start->Get4Momentum())<<G4endl;
-*/
+
               }   // end of if(end->GetPDGcode() > 0)
 	    }     // end of if ( isProjectile )
@@ -1346,8 +1075,11 @@
 {            //  @@ this method is used in FTFModel as well. Should go somewhere common!
 
-	G4double Pt2;
-        Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
-                           (std::exp(-maxPtSquare/AveragePt2)-1.));
-
+	G4double Pt2(0.);
+        if(AveragePt2 <= 0.) {Pt2=0.;}
+        else
+        {
+         Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
+                            (std::exp(-maxPtSquare/AveragePt2)-1.));
+        }
 	G4double Pt=std::sqrt(Pt2);
 	G4double phi=G4UniformRand() * twopi;
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4DiffractiveSplitableHadron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4DiffractiveSplitableHadron.cc,v 1.8 2009/07/31 11:03:00 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4ElasticHNScattering.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4ElasticHNScattering.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4ElasticHNScattering.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4ElasticHNScattering.cc,v 1.11 2009/10/06 10:10:36 vuzhinsk Exp $
+// $Id: G4ElasticHNScattering.cc,v 1.14 2009/12/16 17:51:13 gunter Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
@@ -58,8 +58,7 @@
                               G4FTFParameters    *theParameters) const
 {
-//G4cout<<"G4ElasticHNScattering::ElasticScattering"<<G4endl;
 // -------------------- Projectile parameters -----------------------------------
 	   G4LorentzVector Pprojectile=projectile->Get4Momentum();
-//G4cout<<"Elastic P "<<Pprojectile<<G4endl;
+
            if(Pprojectile.z() < 0.)
            {
@@ -68,8 +67,4 @@
            } 
 
-//           G4double ProjectileRapidity = Pprojectile.rapidity();
-//           G4int    ProjectilePDGcode=projectile->GetDefinition()->GetPDGEncoding();
-//           G4ParticleDefinition * ProjectileDefinition = projectile->GetDefinition();
-
            G4bool PutOnMassShell(false);
 
@@ -86,9 +81,7 @@
 
 // -------------------- Target parameters ----------------------------------------------
-//           G4int    TargetPDGcode=target->GetDefinition()->GetPDGEncoding();
 
   	   G4LorentzVector Ptarget=target->Get4Momentum();
-//G4cout<<"Elastic T "<<Ptarget<<G4endl;
-//           G4double TargetRapidity = Ptarget.rapidity();
+
 	   G4double M0target = Ptarget.mag();
 
@@ -149,5 +142,5 @@
             else // if(M0projectile > projectile->GetDefinition()->GetPDGMass())
             {
-             target->SetStatus(2);                                   // Uzhi 17.07.09
+             target->SetStatus(2);                                   
              return false;                   // The projectile was not excited,
                                              // but the energy was too low to put
@@ -183,15 +176,4 @@
            G4double maxPtSquare = PZcms2;
 
-//----- Charge exchange between the projectile and the target, if possible 
-//        (G4UniformRand() < 0.5*std::exp(-0.5*(ProjectileRapidity - TargetRapidity))))
-/*
-           if((ProjectilePDGcode != TargetPDGcode) && 
-             ((ProjectilePDGcode > 1000) && (TargetPDGcode > 1000)) &&
-             (G4UniformRand() < 1.0*std::exp(-0.5*(ProjectileRapidity - TargetRapidity)))) 
-           {
-              projectile->SetDefinition(target->GetDefinition());
-              target->SetDefinition(ProjectileDefinition); 
-           }
-*/
 // ------ Now we can calculate the transfered Pt --------------------------
 	   G4double Pt2;                                                    
@@ -255,8 +237,11 @@
 {            //  @@ this method is used in FTFModel as well. Should go somewhere common!
 	
-	G4double Pt2;
-        Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
+	G4double Pt2(0.);
+        if(AveragePt2 <= 0.) {Pt2=0.;}
+        else
+        {
+         Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
                 (std::exp(-maxPtSquare/AveragePt2)-1.)); 
-	
+	}
 	G4double Pt=std::sqrt(Pt2);
 	G4double phi=G4UniformRand() * twopi;
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFModel.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4FTFModel.cc,v 1.28 2009/10/29 14:55:33 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4FTFModel.cc,v 1.34 2009/12/15 19:14:31 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
@@ -56,4 +56,5 @@
 	G4VPartonStringModel::SetThisPointer(this);
         theParameters=0;
+	NumberOfInvolvedNucleon=0;
 }
 
@@ -61,10 +62,19 @@
 G4FTFModel::~G4FTFModel()
 {
-   if( theParameters != 0 ) delete theParameters; 
 // Because FTF model can be called for various particles
 // theParameters must be erased at the end of each call.
 // Thus the delete is also in G4FTFModel::GetStrings() method
+   if( theParameters != 0 ) delete theParameters; 
    if( theExcitation != 0 ) delete theExcitation;
    if( theElastic    != 0 ) delete theElastic; 
+
+   if( NumberOfInvolvedNucleon != 0)
+   {
+    for(G4int i=0; i < NumberOfInvolvedNucleon; i++)
+    {
+     G4VSplitableHadron * aNucleon = TheInvolvedNucleon[i]->GetSplitableHadron();
+     if(aNucleon) delete aNucleon;
+    }
+   }
 }
 
@@ -93,16 +103,7 @@
 
 // --- cms energy
-
         G4double s = sqr( theProjectile.GetMass() ) +
                      sqr( G4Proton::Proton()->GetPDGMass() ) +
                      2*theProjectile.GetTotalEnergy()*G4Proton::Proton()->GetPDGMass();
-/*
-G4cout<<"----------------------------------------"<<G4endl;
-G4cout << " primary Total E (GeV): " << theProjectile.GetTotalEnergy()/GeV << G4endl;
-G4cout << " primary Mass    (GeV): " << theProjectile.GetMass() /GeV << G4endl;
-G4cout << " primary 3Mom           " << theProjectile.GetMomentum() << G4endl;
-G4cout << " primary space position " << theProjectile.GetPositionInNucleus() << G4endl;
-G4cout << "cms std::sqrt(s) (GeV) = " << std::sqrt(s) / GeV << G4endl;
-*/
 
       if( theParameters != 0 ) delete theParameters;
@@ -110,4 +111,5 @@
                                           aNucleus.GetN(),aNucleus.GetZ(),
                                           s);
+
 //theParameters->SetProbabilityOfElasticScatt(0.); 
 // To turn on/off (1/0) elastic scattering
@@ -116,46 +118,78 @@
 
 // ------------------------------------------------------------
+struct DeleteVSplitableHadron { void operator()(G4VSplitableHadron * aH){ delete aH;} };
+
+
+// ------------------------------------------------------------
 G4ExcitedStringVector * G4FTFModel::GetStrings()
-{
-//G4int Uzhi; G4cin>>Uzhi;
- 
-//G4cout<<"GetList"<<G4endl;
+{ 
+        G4ExcitedStringVector * theStrings(0);
+
 	theParticipants.GetList(theProjectile,theParameters);
-//G4cout<<"Regge"<<G4endl;
-        ReggeonCascade();                                     // Uzhi 26 July 09 
-//G4cout<<"On mass shell"<<G4endl;
-        if (! PutOnMassShell()    ) return NULL;              // Uzhi 26 July 09
-//G4cout<<"Excite"<<G4endl;
-	if (! ExciteParticipants()) return NULL;
-//G4cout<<"Strings"<<G4endl;
-	G4ExcitedStringVector * theStrings = BuildStrings();
-//G4cout<<"Out FTF N strings "<<theStrings->size()<<G4endl;
-//G4cout<<"GetResidualNucleus"<<G4endl;
-        GetResidualNucleus();
-//G4cout<<"Out of FTF"<<G4endl;
-        if( theParameters != 0 )
-        {
-          delete theParameters;
-          theParameters=0;
+
+        ReggeonCascade(); 
+
+        G4bool Success(true);
+        if( PutOnMassShell() )
+        {
+         if( ExciteParticipants() )
+         {
+	  theStrings = BuildStrings();
+
+          GetResidualNucleus();
+
+          if( theParameters != 0 )
+          {
+           delete theParameters;
+           theParameters=0;
+          }
+         } else                      // if( ExciteParticipants() )
+         {     Success=false;}
+        } else                       // if( PutOnMassShell() )
+        {      Success=false;}
+
+        if(!Success)   
+        {
+           // -------------- Erase the projectile ----------------
+	 std::vector<G4VSplitableHadron *> primaries;
+
+	 theParticipants.StartLoop();    // restart a loop 
+         while ( theParticipants.Next() ) 
+	 {
+	    const G4InteractionContent & interaction=theParticipants.GetInteraction();
+                	 //  do not allow for duplicates ...
+	    if ( primaries.end() == std::find(primaries.begin(), primaries.end(),
+                                                   interaction.GetProjectile()) )
+	    	primaries.push_back(interaction.GetProjectile());
+         }
+         std::for_each(primaries.begin(), primaries.end(), DeleteVSplitableHadron());
+         primaries.clear();
         }
-	return theStrings;
-}
-
-// ------------------------------------------------------------
-struct DeleteVSplitableHadron { void operator()(G4VSplitableHadron * aH){ delete aH;} };
-
-// ------------------------------------------------------------
-void G4FTFModel::ReggeonCascade()                             // Uzhi 26 July 2009
+
+// -------------- Cleaning of the memory --------------
+// -------------- Erase the target nucleons -----------
+        G4VSplitableHadron * aNucleon = 0;
+        for(G4int i=0; i < NumberOfInvolvedNucleon; i++)
+        {
+           aNucleon = TheInvolvedNucleon[i]->GetSplitableHadron();
+           if(aNucleon) delete aNucleon;
+        } 
+
+        NumberOfInvolvedNucleon=0;
+
+        return theStrings;
+
+}
+//-------------------------------------------------------------------
+void G4FTFModel::ReggeonCascade()                             
 { //--- Implementation of reggeon theory inspired model-------
         NumberOfInvolvedNucleon=0;
 
-//G4int PrimInt(0);
         theParticipants.StartLoop();
 	while (theParticipants.Next())
-	{
-//PrimInt++; 	   
+	{   
 	   const G4InteractionContent & collision=theParticipants.GetInteraction();
            G4Nucleon * TargetNucleon=collision.GetTargetNucleon();
-//G4cout<<"Prim Nnucl "<<TargetNucleon->Get4Momentum()<<G4endl;
+
            TheInvolvedNucleon[NumberOfInvolvedNucleon]=TargetNucleon;
            NumberOfInvolvedNucleon++;
@@ -165,6 +199,6 @@
 
            theParticipants.theNucleus->StartLoop();
-           G4Nucleon * Neighbour;
-//G4int NucleonNum(0);
+           G4Nucleon * Neighbour(0);
+
 	   while ( (Neighbour = theParticipants.theNucleus->GetNextNucleon()) )
            {
@@ -177,8 +211,7 @@
                 std::exp(-impact2/theParameters->GetR2ofNuclearDestruction()))  
              { // The neighbour nucleon is involved in the reggeon cascade
-//G4cout<<" involved "<<NucleonNum<<" "<<Neighbour->Get4Momentum()<<G4endl;
+
               TheInvolvedNucleon[NumberOfInvolvedNucleon]=Neighbour;
               NumberOfInvolvedNucleon++;
-//G4cout<<" PrimInt"<<" "<<NumberOfInvolvedNucleon<<G4endl;
 
               G4VSplitableHadron *targetSplitable; 
@@ -186,13 +219,9 @@
 
               Neighbour->Hit(targetSplitable);
-//              Neighbour->SetBindingEnergy(3.*Neighbour->GetBindingEnergy()); // Uzhi 5.10.09
               targetSplitable->SetStatus(2);     
              }
             }  // end of if(!Neighbour->AreYouHit())
-//NucleonNum++;
 	   }   // end of while (theParticipant.theNucleus->GetNextNucleon())
-//G4cout<<"Prim Int N Ninvolv "<<PrimInt<<" "<<NumberOfInvolvedNucleon<<G4endl;
 	}      // end of while (theParticipants.Next())
-//G4cout<<"At end "<<PrimInt<<" "<<NumberOfInvolvedNucleon<<G4endl;
 
 // ---------------- Calculation of creation time for each target nucleon -----------
@@ -240,10 +269,11 @@
 {
 // -------------- Properties of the projectile ----------------
-//G4cout<<"Put on Mass-shell"<<G4endl;
 	theParticipants.StartLoop();    // restart a loop
         theParticipants.Next();
 	G4VSplitableHadron * primary = theParticipants.GetInteraction().GetProjectile();
 	G4LorentzVector Pprojectile=primary->Get4Momentum();
-//G4cout<<"Proj "<<Pprojectile<<G4endl;
+
+// To get original projectile particle
+
         if(Pprojectile.z() < 0.){return false;}
 
@@ -252,5 +282,6 @@
 //-------------------------------------------------------------
 	G4LorentzVector Psum      = Pprojectile;
-        G4double        SumMasses = Mprojectile;
+        G4double        SumMasses = Mprojectile + 20.*MeV; // 13.12.09
+                                               // Separation energy for projectile
 
 //--------------- Target nucleus ------------------------------
@@ -259,5 +290,4 @@
         G4int ResidualMassNumber=theNucleus->GetMassNumber();
         G4int ResidualCharge    =theNucleus->GetCharge();
-//G4cout<<"Nucleus "<<ResidualMassNumber<<" "<<ResidualCharge<<G4endl;
         ResidualExcitationEnergy=0.;
 	G4LorentzVector PnuclearResidual(0.,0.,0.,0.);
@@ -267,12 +297,12 @@
 
         theNucleus->StartLoop();
-//G4int NucleonNum(0);
+
 	while ((aNucleon = theNucleus->GetNextNucleon()))
         {
          if(aNucleon->AreYouHit())
          {   // Involved nucleons
-//G4cout<<"          "<<NucleonNum<<" "<<aNucleon->Get4Momentum()<<G4endl;
           Psum += aNucleon->Get4Momentum();
           SumMasses += aNucleon->GetDefinition()->GetPDGMass();
+          SumMasses += 20.*MeV;   // 13.12.09 Separation energy for a nucleon
           ResidualMassNumber--;
           ResidualCharge-=(G4int) aNucleon->GetDefinition()->GetPDGCharge();
@@ -283,11 +313,8 @@
           PnuclearResidual += aNucleon->Get4Momentum();
          }  // end of if(!aNucleon->AreYouHit())
-//NucleonNum++;
 	}   // end of while (theNucleus->GetNextNucleon())
 
-//G4cout<<"Nucleus "<<ResidualMassNumber<<" "<<ResidualCharge<<G4endl;
-//G4cout<<"PResid "<<PnuclearResidual<<G4endl;
-
         Psum += PnuclearResidual;
+
         G4double ResidualMass(0.);
         if(ResidualMassNumber == 0)
@@ -303,5 +330,5 @@
         }
  
-//        ResidualMass +=ResidualExcitationEnergy; // Will be given after checks
+//      ResidualMass +=ResidualExcitationEnergy; // Will be given after checks
         SumMasses += ResidualMass;
 
@@ -310,14 +337,13 @@
         G4double SqrtS=Psum.mag();
         G4double     S=Psum.mag2();
-//G4cout<<" SqrtS SumMasses "<<SqrtS <<" "<< SumMasses<<G4endl;
-//G4cout<<"Res M E* "<<ResidualMass<<" "<<ResidualExcitationEnergy<<G4endl;
+
         if(SqrtS < SumMasses)      {return false;} // It is impossible to simulate
                                                    // after putting nuclear nucleons
                                                    // on mass-shell
+
         if(SqrtS < SumMasses+ResidualExcitationEnergy) {ResidualExcitationEnergy=0.;}
 
         ResidualMass +=ResidualExcitationEnergy;
         SumMasses    +=ResidualExcitationEnergy;
-//G4cout<<"Res M E* "<<ResidualMass<<" "<<ResidualExcitationEnergy<<G4endl;
 
 //-------------------------------------------------------------
@@ -325,8 +351,8 @@
         G4int MaxNumberOfDeltas = (int)((SqrtS - SumMasses)/(400.*MeV));
         G4int NumberOfDeltas(0);
-//SumMasses=Mprojectile;
+
         if(theNucleus->GetMassNumber() != 1)
         {
-          G4double ProbDeltaIsobar(0.);  // 1. *******************************
+          G4double ProbDeltaIsobar(0.);  // 1. *** Can be set if it is needed
 	  for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
           {
@@ -343,21 +369,10 @@
               targetSplitable->SetDefinition(ptr);
               SumMasses+=targetSplitable->GetDefinition()->GetPDGMass();
-//G4cout<<" i "<<i<<" Delta "<<targetSplitable->GetDefinition()->GetPDGMass()<<G4endl;
             } 
-            else 
-            {
-//              SumMasses+=TheInvolvedNucleon[i]->GetSplitableHadron()->
-//                         GetDefinition()->GetPDGMass();
-//G4cout<<" i "<<i<<" Nuclo "<<TheInvolvedNucleon[i]->GetSplitableHadron()->GetDefinition()->GetPDGMass()<<G4endl;
-            }
           }   // end of for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
         }   // end of if(theNucleus.GetMassNumber() != 1)
-//G4cout<<"MaxNumberOfDeltas NumberOfDeltas "<<MaxNumberOfDeltas<<" "<<NumberOfDeltas<<G4endl;
-//G4cout<<" SqrtS SumMasses "<<SqrtS <<" "<< SumMasses<<G4endl;
-//-------------------------------------------------------------
-
+//-------------------------------------------------------------
         G4LorentzRotation toCms(-1*Psum.boostVector());
         G4LorentzVector Ptmp=toCms*Pprojectile;
-
         if ( Ptmp.pz() <= 0. )                                
         {  // "String" moving backwards in  CMS, abort collision !!
@@ -366,48 +381,47 @@
         }
 
-        toCms.rotateZ(-1*Ptmp.phi());
-        toCms.rotateY(-1*Ptmp.theta());
+//        toCms.rotateZ(-1*Ptmp.phi());              // Uzhi 5.12.09
+//        toCms.rotateY(-1*Ptmp.theta());            // Uzhi 5.12.09
 	
         G4LorentzRotation toLab(toCms.inverse());
 
-//        Pprojectile.transform(toCms);
-//G4cout<<"Proj in CMS "<<Pprojectile<<G4endl;
-
-//G4cout<<"Main work"<<G4endl;
 //-------------------------------------------------------------
 //------- Ascribing of the involved nucleons Pt and Xminus ----
         G4double Dcor        = theParameters->GetDofNuclearDestruction()/
                                                theNucleus->GetMassNumber();
-//                                                  NumberOfInvolvedNucleon;
+
         G4double AveragePt2  = theParameters->GetPt2ofNuclearDestruction();
         G4double maxPtSquare = theParameters->GetMaxPt2ofNuclearDestruction();
-//G4cout<<" D Pt2 "<<Dcor<<" "<<AveragePt2<<G4endl;
 
         G4double M2target(0.);
+        G4double WminusTarget(0.);
+        G4double WplusProjectile(0.);
+
         G4int    NumberOfTries(0);
         G4double ScaleFactor(1.);
-        do    // while (SqrtS < Mprojectile + std::sqrt(M2target))
-        {     // while (DecayMomentum < 0.)
-
-          NumberOfTries++;
-//G4cout<<"NumberOfTries "<<NumberOfTries<<G4endl;
-          if(NumberOfTries == 100*(NumberOfTries/100))
-          { // At large number of tries it would be better to reduce the values
-            ScaleFactor/=2.;
-            Dcor       *=ScaleFactor;
-            AveragePt2 *=ScaleFactor;
-//G4cout<<"NumberOfTries "<<NumberOfTries<<" "<<Dcor<<" "<<AveragePt2<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
-          }
-//G4cout<<"Start Decay "<<G4endl; G4int Uzhi; G4cin>>Uzhi;
-          G4ThreeVector PtSum(0.,0.,0.);
-          G4double XminusSum(0.);
-          G4double Xminus(0.);
-          G4bool Success=true;
-
-          do      // while(Success == false);
-          {
-//G4cout<<"Sample Pt and X"<<" Ninv "<<NumberOfInvolvedNucleon<<G4endl; // G4int Uzhi1; G4cin>>Uzhi1;
-             Success=true;
+        G4bool OuterSuccess(true);
+        do    // while (!OuterSuccess)
+        {
+          OuterSuccess=true;
+
+          do    // while (SqrtS < Mprojectile + std::sqrt(M2target))
+          {     // while (DecayMomentum < 0.)
+
+            NumberOfTries++;
+            if(NumberOfTries == 100*(NumberOfTries/100))   // 100
+            { // At large number of tries it would be better to reduce the values
+              ScaleFactor/=2.;
+              Dcor       *=ScaleFactor;
+              AveragePt2 *=ScaleFactor;
+            }
+
+            G4ThreeVector PtSum(0.,0.,0.);
+            G4double XminusSum(0.);
+            G4double Xminus(0.);
+            G4bool InerSuccess=true;
+
+            do      // while(!InerSuccess);
+            {
+             InerSuccess=true;
 
              PtSum    =G4ThreeVector(0.,0.,0.);
@@ -420,5 +434,4 @@
                G4ThreeVector tmpPt = GaussianPt(AveragePt2, maxPtSquare);
                PtSum += tmpPt;
-
                G4ThreeVector tmpX=GaussianPt(Dcor*Dcor, 1.);
                Xminus=tmpX.x();
@@ -427,5 +440,4 @@
                G4LorentzVector tmp(tmpPt.x(),tmpPt.y(),Xminus,0.);
                aNucleon->SetMomentum(tmp);
-//G4cout<<"Nucl mom "<<aNucleon->GetMomentum()<<G4endl;
              }   // end of for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
 
@@ -445,9 +457,7 @@
               DeltaXminus = -1./theNucleus->GetMassNumber();
              }
-//G4cout<<"Deltas "<<DeltaX<<" "<<DeltaY<<" "<<DeltaXminus<<G4endl;
 
              XminusSum=1.;
              M2target =0.;
-
 
 	     for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
@@ -456,8 +466,8 @@
 
                Xminus = aNucleon->Get4Momentum().pz() - DeltaXminus;
-//G4cout<<i<<" "<<Xminus<<" "<<XminusSum<<G4endl;
                XminusSum-=Xminus;               
+
                if((Xminus <= 0.)   || (Xminus > 1.) || 
-                  (XminusSum <=0.) || (XminusSum > 1.)) {Success=false; break;}
+                  (XminusSum <=0.) || (XminusSum > 1.)) {InerSuccess=false; break;}
  
                G4double Px=aNucleon->Get4Momentum().px() - DeltaX;
@@ -472,43 +482,22 @@
              }   // end of for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
 
-             if(Success && (ResidualMassNumber != 0))
+             if(InerSuccess && (ResidualMassNumber != 0))
              {
               M2target +=(ResidualMass*ResidualMass + PtSum.mag2())/XminusSum;
              }
-//G4cout<<"Success "<<Success<<G4endl;
-//G4int Uzhi; G4cin>>Uzhi;
-          } while(Success == 0);
-
-//-------------------------------------------------------------
-//G4cout<<"SqrtS > Mprojectile + std::sqrt(M2target) "<<SqrtS<<" "<<Mprojectile<<" "<< std::sqrt(M2target)<<" "<<Mprojectile + std::sqrt(M2target)<<G4endl;
-//G4int Uzhi3; G4cin>>Uzhi3;
-        } while (SqrtS < Mprojectile + std::sqrt(M2target));
-
-//-------------------------------------------------------------
-        G4double DecayMomentum2= S*S+M2projectile*M2projectile+M2target*M2target
-                                -2.*S*M2projectile - 2.*S*M2target 
-                                       -2.*M2projectile*M2target;
-
-        G4double WminusTarget=(S-M2projectile+M2target+std::sqrt(DecayMomentum2))/2./SqrtS;
-        G4double WplusProjectile=SqrtS - M2target/WminusTarget;
-//G4cout<<"DecM W+ W- "<<DecayMomentum2<<" "<<WplusProjectile<<" "<<WminusTarget<<G4endl;
-//-------------------------------------------------------------
-        G4double Pzprojectile=WplusProjectile/2. - M2projectile/2./WplusProjectile;
-        G4double Eprojectile =WplusProjectile/2. + M2projectile/2./WplusProjectile;
-        Pprojectile.setPz(Pzprojectile);  Pprojectile.setE(Eprojectile);
-
-        Pprojectile.transform(toLab);       // The work with the projectile
-        primary->Set4Momentum(Pprojectile); // is finished at the moment.
-//G4cout<<"Proj After "<<Pprojectile<<G4endl;
-//-------------------------------------------------------------
-//Ninvolv=0;
-
-        G4ThreeVector Residual3Momentum(0.,0.,1.);
-
-	for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
-        {
+            } while(!InerSuccess);
+          } while (SqrtS < Mprojectile + std::sqrt(M2target));
+//-------------------------------------------------------------
+          G4double DecayMomentum2= S*S+M2projectile*M2projectile+M2target*M2target
+                                    -2.*S*M2projectile - 2.*S*M2target 
+                                         -2.*M2projectile*M2target;
+
+          WminusTarget=(S-M2projectile+M2target+std::sqrt(DecayMomentum2))/2./SqrtS;
+          WplusProjectile=SqrtS - M2target/WminusTarget;
+//-------------------------------------------------------------
+	  for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
+          {
            G4Nucleon * aNucleon = TheInvolvedNucleon[i];
            G4LorentzVector tmp=aNucleon->Get4Momentum();
-           Residual3Momentum-=tmp.vect();
 
            G4double Mt2 = sqr(tmp.x())+sqr(tmp.y())+
@@ -520,18 +509,47 @@
            G4double E = WminusTarget*Xminus/2. + Mt2/(2.*WminusTarget*Xminus);
 
+           if( E+Pz > WplusProjectile ){OuterSuccess=false; break;}
+          }   // end of for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
+        } while(!OuterSuccess);
+
+//-------------------------------------------------------------
+        G4double Pzprojectile=WplusProjectile/2. - M2projectile/2./WplusProjectile;
+        G4double Eprojectile =WplusProjectile/2. + M2projectile/2./WplusProjectile;
+        Pprojectile.setPz(Pzprojectile);  Pprojectile.setE(Eprojectile);
+
+        Pprojectile.transform(toLab);       // The work with the projectile
+        primary->Set4Momentum(Pprojectile); // is finished at the moment.
+
+//-------------------------------------------------------------
+        G4ThreeVector Residual3Momentum(0.,0.,1.);
+
+	for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
+        {
+           G4Nucleon * aNucleon = TheInvolvedNucleon[i];
+           G4LorentzVector tmp=aNucleon->Get4Momentum();
+           Residual3Momentum-=tmp.vect();
+
+           G4double Mt2 = sqr(tmp.x())+sqr(tmp.y())+
+                          aNucleon->GetSplitableHadron()->GetDefinition()->GetPDGMass()*
+                          aNucleon->GetSplitableHadron()->GetDefinition()->GetPDGMass();
+           G4double Xminus=tmp.z();
+
+           G4double Pz=-WminusTarget*Xminus/2. + Mt2/(2.*WminusTarget*Xminus);
+           G4double E = WminusTarget*Xminus/2. + Mt2/(2.*WminusTarget*Xminus);
+
            tmp.setPz(Pz); 
            tmp.setE(E);
+
            tmp.transform(toLab);
-//G4cout<<"invol  "<<Ninvolv<<" "<<tmp<<G4endl;
-//Ninvolv++;
+
            aNucleon->SetMomentum(tmp);
+
            G4VSplitableHadron * targetSplitable=aNucleon->GetSplitableHadron();
            targetSplitable->Set4Momentum(tmp);
-//G4cout<<"nucleon M "<<aNucleon->Get4Momentum()<<G4endl;
            
         }   // end of for(G4int i=0; i < NumberOfInvolvedNucleon; i++ )
 
         G4double Mt2Residual=sqr(ResidualMass) +
-                                 sqr(Residual3Momentum.x())+sqr(Residual3Momentum.x());
+                                 sqr(Residual3Momentum.x())+sqr(Residual3Momentum.y());
 
         G4double PzResidual=-WminusTarget*Residual3Momentum.z()/2. + 
@@ -540,17 +558,11 @@
                              Mt2Residual/(2.*WminusTarget*Residual3Momentum.z());
 
-//        G4LorentzVector Residual4Momentum(0.,0.,0.,0.);
         Residual4Momentum.setPx(Residual3Momentum.x());
         Residual4Momentum.setPy(Residual3Momentum.y());
         Residual4Momentum.setPz(PzResidual); 
         Residual4Momentum.setE(EResidual);
+
         Residual4Momentum.transform(toLab);
-
-//G4cout<<"Return Nucleus"<<G4endl;
-//-------------------------------------------------------------
-//-------------------------------------------------------------
-//-------------------------------------------------------------
-//G4int Uzhi2; G4cin>>Uzhi2;
-
+//-------------------------------------------------------------
  return true;
 }
@@ -559,53 +571,28 @@
 G4bool G4FTFModel::ExciteParticipants()
 {
-//    // Uzhi 29.03.08                     For elastic Scatt.
-//G4cout<<"  In ExciteParticipants() "<<theParticipants.theInteractions.size()<<G4endl;
-//G4cout<<" test Params Tot "<<theParameters->GetTotalCrossSection()<<G4endl;
-//G4cout<<" test Params Ela "<<theParameters->GetElasticCrossSection()<<G4endl;
-	
-//G4int counter=0;
-//   // Uzhi 29.03.08
-
-
-//G4int InterNumber=0; // Vova
-
-        G4bool Successfull=false;
-        theParticipants.StartLoop();                          //Uzhi 26 July 09
-
-//	while (theParticipants.Next()&& (InterNumber < 3)) // Vova
+    G4bool Successfull(false);
+//    do {                           // } while (Successfull == false) // Closed 15.12.09
+        Successfull=false;
+        theParticipants.StartLoop();
 	while (theParticipants.Next())
 	{	   
 	   const G4InteractionContent & collision=theParticipants.GetInteraction();
-//
-//counter++;
-//G4cout<<" Int num "<<counter<<G4endl;
-//
+
 	   G4VSplitableHadron * projectile=collision.GetProjectile();
 	   G4VSplitableHadron * target=collision.GetTarget();
-//         G4Nucleon * TargetNucleon=collision.GetTargetNucleon(); // Uzhi 16.07.09
-// Uzhi 16.07.09 ----------------------------
+
            if(G4UniformRand()< theParameters->GetProbabilityOfElasticScatt())
            { //   Elastic scattering -------------------------
-//G4cout<<"Elastic"<<G4endl;
             if(theElastic->ElasticScattering(projectile, target, theParameters))
             {
-             Successfull = Successfull || true;
+            Successfull = Successfull || true;
             } else
             {
-//G4cout<<"Elastic Not succes"<<G4endl;
              Successfull = Successfull || false;
              target->SetStatus(2);
-/*
-             if(target->GetStatus() == 0)                         // Uzhi 17.07.09
-             {
-              G4VSplitableHadron * aHit=0;                        // Uzhi 16.07.09
-              TargetNucleon->Hit(aHit);                           // Uzhi 16.07.09
-             };
-*/
-            };
+            }
            }
            else
            { //   Inelastic scattering ---------------------- 
-//G4cout<<"InElastic"<<G4endl;
             if(theExcitation->ExciteParticipants(projectile, target, 
                                                  theParameters, theElastic))
@@ -614,65 +601,11 @@
             } else
             {
-//G4cout<<"InElastic Non succes"<<G4endl;
              Successfull = Successfull || false;
              target->SetStatus(2);
-/*
-             if(target->GetStatus() == 0)                         // Uzhi 16.06.09
-             {
-              G4VSplitableHadron * aHit=0;                        // Uzhi 16.07.09
-              TargetNucleon->Hit(aHit);                           // Uzhi 16.07.09
-             };
-*/
-            };
+            }
            }
-        }       // end of the loop Uzhi 9.07.09
-// Uzhi 16.07.09 ----------------------------
-
-        if(!Successfull)
-	{
-//G4cout<<"Process not successfull"<<G4endl;
-//           give up, clean up
-	  std::vector<G4VSplitableHadron *> primaries;
-//	  std::vector<G4VSplitableHadron *> targets;        // Uzhi 31.07.09
-	  theParticipants.StartLoop();    // restart a loop 
-	  while ( theParticipants.Next() ) 
-	  {
-	    const G4InteractionContent & interaction=theParticipants.GetInteraction();
-                	 //  do not allow for duplicates ...
-	    if ( primaries.end() == std::find(primaries.begin(), primaries.end(),
-                                                   interaction.GetProjectile()) )
-	    	primaries.push_back(interaction.GetProjectile());
-/*  // Uzhi 31.07.09
-	    if ( targets.end()   == std::find(targets.begin(), targets.end(),
-                                                      interaction.GetTarget()) ) 
-	    	targets.push_back(interaction.GetTarget());
-*/  // Uzhi 31.07.09
-	  }
-	  std::for_each(primaries.begin(), primaries.end(), DeleteVSplitableHadron());
-	  primaries.clear();
-/*  // Uzhi 31.07.09	
-          std::for_each(targets.begin(), targets.end(), DeleteVSplitableHadron());
-	  targets.clear();
-*/  // Uzhi 31.07.09
-//          theParticipants.theNucleus->StartLoop();
-
-//G4cout<<"NumberOfInvolvedNucleon "<<NumberOfInvolvedNucleon<<G4endl;
-          G4VSplitableHadron * aNucleon = 0;
-          for(G4int i=0; i < NumberOfInvolvedNucleon; i++)
-          {
-           aNucleon = TheInvolvedNucleon[i]->GetSplitableHadron();
-           if(aNucleon)
-           { 
-             if(aNucleon->GetStatus() != 0) delete aNucleon;
-//           if(aNucleon->GetStatus() == 2)  DeleteVSplitableHadron()(aNucleon);
-           }
-          } 
-
-          NumberOfInvolvedNucleon=0;
-//G4cout<<"Out of Excit"<<G4endl; G4int Uzhi; G4cin>>Uzhi;
-	  return false;
-	}  // End of if(!Successfull)
-
-	return true;
+        }       // end of while (theParticipants.Next())
+//       } while (Successfull == false);                        // Closed 15.12.09
+	return Successfull;
 }
 // ------------------------------------------------------------
@@ -682,18 +615,14 @@
 //  be duplicate in the List ( to unique G4VSplitableHadrons)
 
-//G4cout<<"In build string"<<G4endl;
-
 	G4ExcitedStringVector * strings;
 	strings = new G4ExcitedStringVector();
 	
 	std::vector<G4VSplitableHadron *> primaries;
-	std::vector<G4VSplitableHadron *> targets;
-	std::vector<G4Nucleon          *> TargetNucleons;     // Uzhi 16.07.09
 	
         G4ExcitedString * FirstString(0);     // If there will be a kink,
-        G4ExcitedString * SecondString(0);    // two strings will be prodused.
+        G4ExcitedString * SecondString(0);    // two strings will be produced.
 
 	theParticipants.StartLoop();    // restart a loop 
-//G4int InterCount(0); // Uzhi
+
 	while ( theParticipants.Next() ) 
 	{
@@ -703,27 +632,10 @@
 	    if ( primaries.end() == std::find(primaries.begin(), primaries.end(),
                                                 interaction.GetProjectile()) )
-	    	primaries.push_back(interaction.GetProjectile());
-		
-	    if ( targets.end()   == std::find(targets.begin(), targets.end(),
-                                                interaction.GetTarget()) ) 
-	    	targets.push_back(interaction.GetTarget());
-
-	    if ( TargetNucleons.end()   == std::find(TargetNucleons.begin(),     
-                                                     TargetNucleons.end(),       
-                                                interaction.GetTargetNucleon()) )
-	    	TargetNucleons.push_back(interaction.GetTargetNucleon());        
-//InterCount++;
+	    	primaries.push_back(interaction.GetProjectile());     
 	}
 	    
-	
-//G4cout << "BuildStrings prim/targ/woundN " << primaries.size() << " , " <<targets.size() <<", "<<TargetNucleons.size()<< G4endl;
-
 	unsigned int ahadron;
-// Only for hA-interactions Uzhi -------------------------------------
-//G4int StringN(0);
-//G4cout<<"Proj strings -----------------------"<<G4endl;
 	for ( ahadron=0; ahadron < primaries.size() ; ahadron++)
 	{
-//G4cout<<" string# "<<ahadron<<" "<<primaries[ahadron]->Get4Momentum()<<G4endl;
             G4bool isProjectile(0);
             if(primaries[ahadron]->GetStatus() == 1) {isProjectile=true; }
@@ -734,47 +646,13 @@
                                          FirstString, SecondString,
                                          theParameters);
-//G4cout<<"1str 2str "<<FirstString<<" "<<SecondString<<G4endl;
+
 	    if(FirstString  != 0) strings->push_back(FirstString);
             if(SecondString != 0) strings->push_back(SecondString);
-
-//StringN++; G4cout<<"Proj string "<<strings->size()<<G4endl;
 	}
-//G4cout<<"Targ strings ------------------------------"<<G4endl;
-	for ( ahadron=0; ahadron < targets.size() ; ahadron++)
-	{
-//G4cout<<"targets[ahadron]->GetStatus() "<<targets[ahadron]->GetStatus()<<G4endl;
-            if(targets[ahadron]->GetStatus() == 1)   // Uzhi 17.07.09
-            {
-	     G4bool isProjectile=false;
-             FirstString=0; SecondString=0;
-             theExcitation->CreateStrings(targets[ahadron], isProjectile,
-                                          FirstString, SecondString,
-                                          theParameters);
-	     if(FirstString  != 0) strings->push_back(FirstString);
-             if(SecondString != 0) strings->push_back(SecondString);
-
-//StringN++; G4cout<<"Targ string"<<StringN<<G4endl;
-            } else
-            {
-             if(targets[ahadron]->GetStatus() == 0)// Uzhi 17.07.09 Nucleon was rejected
-             {
-              G4VSplitableHadron * aHit=0;          // Uzhi 16.07.09
-              TargetNucleons[ahadron]->Hit(aHit);   // Uzhi 16.07.09
-             }
-            }
-	}
-
-//G4cout<<"Proj + Targ string "<<strings->size()<<G4endl;
-//G4cout<<"Involv strings NumberOfInvolvedNucleon "<<NumberOfInvolvedNucleon<<G4endl;
+
 	for (G4int ahadron=0; ahadron < NumberOfInvolvedNucleon ; ahadron++)
 	{
-/*
-G4cout<<"ahadron "<<ahadron<<" Status "<<
-TheInvolvedNucleon[ahadron]->GetSplitableHadron()->GetStatus()<<
-TheInvolvedNucleon[ahadron]->GetSplitableHadron()->Get4Momentum()<<G4endl;
-*/
-            if(TheInvolvedNucleon[ahadron]->GetSplitableHadron()->GetStatus() == 2)
-            {
-//StringN++; G4cout<<"Invol string "<<StringN<<G4endl;
+            if(TheInvolvedNucleon[ahadron]->GetSplitableHadron()->GetStatus() !=0) //== 2)
+            {
 	     G4bool isProjectile=false;
              FirstString=0; SecondString=0;
@@ -786,30 +664,9 @@
 	     if(FirstString  != 0) strings->push_back(FirstString);
              if(SecondString != 0) strings->push_back(SecondString);
-
-//	     strings->push_back(theExcitation->String(
-//                      TheInvolvedNucleon[ahadron]->GetSplitableHadron(), 
-//                                                           isProjectile));
-            } 
-//G4cout<<"Proj + Targ+Involved string "<<strings->size()<<G4endl;
-/*
-else
-            {
-G4cout<<"Else ????????????"<<G4endl; 
-             if(targets[ahadron]->GetStatus() == 0)// Uzhi 17.07.09 Nucleon was rejected
-             {
-              G4VSplitableHadron * aHit=0;          // Uzhi 16.07.09
-              TargetNucleons[ahadron]->Hit(aHit);   // Uzhi 16.07.09
-             }
             }
-*/
 	}
-
-//G4int Uzhi; G4cin>>Uzhi;
 
 	std::for_each(primaries.begin(), primaries.end(), DeleteVSplitableHadron());
 	primaries.clear();
-
-	std::for_each(targets.begin(), targets.end(), DeleteVSplitableHadron());
-	targets.clear();
 
 	return strings;
@@ -826,5 +683,6 @@
         {
          G4Nucleon * aNucleon = TheInvolvedNucleon[i];
-         G4LorentzVector tmp=aNucleon->Get4Momentum()-DeltaPResidualNucleus;
+//         G4LorentzVector tmp=aNucleon->Get4Momentum()-DeltaPResidualNucleus;
+         G4LorentzVector tmp=-DeltaPResidualNucleus;
          aNucleon->SetMomentum(tmp);
          aNucleon->SetBindingEnergy(DeltaExcitationE);
@@ -837,8 +695,11 @@
 {            //  @@ this method is used in FTFModel as well. Should go somewhere common!
 	
-	G4double Pt2;
-        Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
+	G4double Pt2(0.);
+        if(AveragePt2 <= 0.) {Pt2=0.;}
+        else
+        {
+         Pt2 = -AveragePt2 * std::log(1. + G4UniformRand() * 
                 (std::exp(-maxPtSquare/AveragePt2)-1.)); 
-	
+	}
 	G4double Pt=std::sqrt(Pt2);
 	G4double phi=G4UniformRand() * twopi;
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParameters.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParameters.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParameters.cc	(revision 1228)
@@ -1,3 +1,4 @@
-//********************************************************************
+//
+// ********************************************************************
 // * License and Disclaimer                                           *
 // *                                                                  *
@@ -24,6 +25,6 @@
 //
 //
-// $Id: G4FTFParameters.cc,v 1.11 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4FTFParameters.cc,v 1.13 2009/12/16 17:51:15 gunter Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
@@ -31,5 +32,5 @@
 
 #include "G4ios.hh"
-#include <utility>                                        // Uzhi 29.03.08
+#include <utility>                                        
 
 G4FTFParameters::G4FTFParameters()
@@ -231,17 +232,10 @@
               SetProjMinNonDiffMass(0.3);                 // GeV
               SetProbabilityOfProjDiff(0.*0.62*std::pow(s/GeV/GeV,-0.51)); // 40/32 X-dif/X-inel
-//G4cout<<"Params "<<0.6*0.62*std::pow(s/GeV/GeV,-0.51)<<G4endl;
+
               SetTarMinDiffMass(1.1);                     // GeV
               SetTarMinNonDiffMass(1.1);                  // GeV
-//G4cout<<"       "<<2.7*0.62*std::pow(s/GeV/GeV,-0.51)<<G4endl; // was 2
-//G4int Uzhi; G4cin>>Uzhi;
+
               SetProbabilityOfTarDiff(2.*0.62*std::pow(s/GeV/GeV,-0.51)); // 40/32 X-dif/X-inel
 
-/*
-SetProjMinDiffMass(0.5);
-SetProjMinNonDiffMass(0.3);   // Uzhi 12.06.08
-SetProbabilityOfProjDiff(0.05); 
-SetProbabilityOfTarDiff(0.05);
-*/
               SetAveragePt2(0.3);                         // GeV^2
              }
Index: trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/diffraction/src/G4FTFParticipants.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4FTFParticipants.cc,v 1.15 2009/10/25 10:50:54 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4FTFParticipants.cc,v 1.16 2009/11/25 09:14:03 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
@@ -72,5 +72,5 @@
 
 void G4FTFParticipants::GetList(const G4ReactionProduct  &thePrimary,
-                                      G4FTFParameters    *theParameters) // Uzhi 29.03.08
+                                      G4FTFParameters    *theParameters) 
 {
     
@@ -96,33 +96,18 @@
 	G4double impactY = theImpactParameter.second;
 
-        G4ThreeVector thePosition(impactX, impactY, -DBL_MAX);     //Uzhi 24 July 09 
-        primarySplitable->SetPosition(thePosition);                //Uzhi 24 July 09
+        G4ThreeVector thePosition(impactX, impactY, -DBL_MAX);     
+        primarySplitable->SetPosition(thePosition);                
 
 	theNucleus->StartLoop();
 	G4Nucleon * nucleon;
-//G4int InterNumber=0;           // Uzhi
-G4int NucleonNumber(0);        // Uzhi
-//while ( (nucleon=theNucleus->GetNextNucleon())&& (InterNumber < 1) ) // Uzhi
-	while ( (nucleon=theNucleus->GetNextNucleon()) ) // Uzhi
+
+	while ( (nucleon=theNucleus->GetNextNucleon()) ) 
 	{
-//G4cout<<"Nucl# "<<NucleonNumber<<G4endl; // Vova
     	   G4double impact2= sqr(impactX - nucleon->GetPosition().x()) +
                              sqr(impactY - nucleon->GetPosition().y());
 
-//	   if ( theParameters->GetInelasticProbability(impact2/fermi/fermi) // Uzhi 29.03.08 
-	   if ( theParameters->GetProbabilityOfInteraction(impact2/fermi/fermi) // Uzhi 29.03.08 
+	   if ( theParameters->GetProbabilityOfInteraction(impact2/fermi/fermi) 
 		> G4UniformRand() )
 	   {
-//InterNumber++;
-/*                                                    // Uzhi 20 July 2009
-	   	if ( nucleusNeedsShift ) 
-	   	{			// on the first hit, shift nucleus 
-	   	     nucleusNeedsShift = false;
-	   	     theNucleus->DoTranslation(G4ThreeVector(-1*impactX,-1*impactY,0.));
-	   	     impactX=0;
-	   	     impactY=0;
-	   	}
-*/                                                    // Uzhi 20 July 2009
-//G4cout<<"          Interact"<<G4endl;
                 primarySplitable->SetStatus(1);        // It takes part in the interaction
 
@@ -130,8 +115,7 @@
 	   	if ( ! nucleon->AreYouHit() )
 	   	{
-//G4cout<<"Part "<<nucleon->Get4Momentum()<<G4endl;
 	   	    targetSplitable= new G4DiffractiveSplitableHadron(*nucleon);
 	   	    nucleon->Hit(targetSplitable);
-	   	    nucleon->SetBindingEnergy(3.*nucleon->GetBindingEnergy()); // Uzhi 5.10.09
+	   	    nucleon->SetBindingEnergy(3.*nucleon->GetBindingEnergy()); 
                     targetSplitable->SetStatus(1);     // It takes part in the interaction
 	   	}
@@ -142,11 +126,10 @@
 		theInteractions.push_back(aInteraction);
 	   }
-NucleonNumber++; // Uzhi
 	}    
-// // Uzhi
+
 //	G4cout << "Number of Hit nucleons " << theInteractions.size()<<G4endl; //  entries() 
 //		<< "\t" << impactX/fermi << "\t"<<impactY/fermi
 //		<< "\t" << std::sqrt(sqr(impactX)+sqr(impactY))/fermi <<G4endl;
-// // Uzhi
+
     }
    
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ExcitedStringDecay.hh,v 1.10 2009/10/05 12:52:48 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4ExcitedStringDecay_h
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FragmentingString.hh,v 1.4 2007/12/20 15:38:06 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4HadronBuilder.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronBuilder.hh,v 1.5 2009/05/18 09:43:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LundStringFragmentation.hh,v 1.6 2008/04/25 14:20:14 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $ Maxim Komogorov
+// GEANT4 tag $Name: geant4-09-03 $ Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QGSMFragmentation.hh,v 1.5 2007/12/20 15:38:07 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VKinkyStringDecay.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VKinkyStringDecay.hh,v 1.3 2006/06/29 20:54:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //  Maxim Komogorov
 //
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VLongitudinalStringDecay.hh,v 1.7 2009/05/22 16:35:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // Maxim Komogorov
 //
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4HadronBuilder.cc,v 1.10 2009/05/22 16:34:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LundStringFragmentation.cc,v 1.18 2009/10/05 12:52:48 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $ 1.8
+// GEANT4 tag $Name: geant4-09-03 $ 1.8
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QGSMFragmentation.cc,v 1.9 2008/06/23 08:35:55 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VKinkyStringDecay.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VKinkyStringDecay.cc,v 1.4 2008/04/25 14:20:14 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //  Maxim Komogorov
 //
Index: trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VLongitudinalStringDecay.cc,v 1.18 2009/08/03 13:21:25 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EventGenerator.hh,v 1.3 2006/06/29 20:55:13 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4EventGenerator_h
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InteractionCode.hh,v 1.3 2006/06/29 20:55:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4InteractionCode_h
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InteractionContent.hh,v 1.5 2009/07/17 12:36:41 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh	(revision 1228)
@@ -28,5 +28,5 @@
 //
 // $Id: G4PomeronCrossSection.hh,v 1.3 2006/06/29 20:55:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4Proton.hh"
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StringModel.hh,v 1.3 2006/06/29 20:55:23 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4StringModel_h
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VParticipants.hh,v 1.6 2009/11/19 14:23:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPartonStringModel.hh,v 1.3 2006/06/29 20:55:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VPartonStringModel_h
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSplitableHadron.hh,v 1.6 2009/07/17 12:36:41 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStringFragmentation.hh,v 1.3 2006/06/29 20:55:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VStringFragmentation_h
Index: trunk/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VertexCode.hh,v 1.3 2006/06/29 20:55:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #ifndef G4VertexCode_h
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4EventGenerator.cc,v 1.4 2006/06/29 20:55:37 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4EventGenerator
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4InteractionContent.cc,v 1.4 2006/06/29 20:55:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PomeronCrossSection.cc,v 1.6 2006/11/07 12:51:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StringModel.cc,v 1.4 2006/06/29 20:55:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4StringModel
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VParticipants.cc,v 1.3 2006/06/29 20:55:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPartonStringModel.cc,v 1.6 2009/10/05 12:52:48 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //// ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSplitableHadron.cc,v 1.7 2009/07/17 12:36:41 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VStringFragmentation.cc,v 1.4 2006/06/29 20:55:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VStringFragmentation
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.8 2009/02/06 08:58:20 vnivanch Exp $
+$Id: History,v 1.10 2009/11/20 19:37:15 vnivanch Exp $
 -------------------------------------------------------------------
 
@@ -15,4 +15,12 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+20 Nov 2009 V.Ivantchenko (hadr-munuclear-V09-02-03)
+----------------------------------------------------
+- Cleanup
+
+04 Mar 2009 V.Ivantchenko (hadr-munuclear-V09-02-02)
+----------------------------------------------------
+- move constructors, destructors and virtual methods to source
 
 06 Feb 2009 V.Ivantchenko (hadr-munuclear-V09-02-01)
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4LeptonHadronProcess.hh
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4LeptonHadronProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4LeptonHadronProcess.hh	(revision 1228)
@@ -45,17 +45,8 @@
 
       G4LeptonHadronProcess(const G4String &processName = "LeptonHadron");
-      ~G4LeptonHadronProcess();
+      virtual ~G4LeptonHadronProcess();
 
-      G4VParticleChange *PostStepDoIt( const G4Track &leptonTrack,
-                                       const G4Step &aStep )
-      {
-        return G4LeptonHadronProcess::GeneralPostStepDoIt(leptonTrack, aStep);
-      }
-
-      G4VParticleChange *GeneralPostStepDoIt( const G4Track &leptonTrack,
-                                              const G4Step &aStep );
-
-      virtual G4LeptonHadronInteractionModel *chooseInteractionModel() = 0;
-
+      virtual G4VParticleChange *PostStepDoIt( const G4Track &leptonTrack,
+					       const G4Step &aStep );
 
     protected:
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuNuclearInteraction.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4MuNuclearInteraction.hh,v 1.6 2008/10/02 21:04:35 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4MuNuclearInteraction.hh,v 1.7 2009/03/04 19:09:20 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
@@ -66,7 +66,7 @@
   virtual ~G4MuNuclearInteraction();
 
+  void SetPhysicsTableBining(G4double lowE, G4double highE, G4int nBins);
+
   virtual G4bool IsApplicable(const G4ParticleDefinition&);
-
-  void SetPhysicsTableBining(G4double lowE, G4double highE, G4int nBins);
 
   virtual void PreparePhysicsTable(const G4ParticleDefinition& ParticleType);
@@ -76,8 +76,4 @@
   virtual void PrintInfoDefinition() ;
 
-  virtual G4double GetMeanFreePath(const G4Track& track,
-				   G4double previousStepSize,
-				   G4ForceCondition* condition ) ;
- 
   virtual G4VParticleChange *PostStepDoIt(const G4Track& track,
 					  const G4Step& Step  ) ;
@@ -85,4 +81,8 @@
 protected:
 
+  virtual G4double GetMeanFreePath(const G4Track& track,
+				   G4double previousStepSize,
+				   G4ForceCondition* condition ) ;
+ 
   virtual G4double ComputeMeanFreePath( const G4ParticleDefinition* ParticleType,
 					G4double KineticEnergy,
@@ -142,6 +142,4 @@
   G4ParametrizedHadronicVertex theHadronicVertex;
 };
-
-#include "G4MuNuclearInteraction.icc"
   
 #endif
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusInteractionModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusInteractionModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusInteractionModel.hh	(revision 1228)
@@ -53,5 +53,5 @@
 
       G4MuonNucleusInteractionModel();
-      ~G4MuonNucleusInteractionModel();
+      virtual ~G4MuonNucleusInteractionModel();
 
       void makePhysicsVector();
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusProcess.hh
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4MuonNucleusProcess.hh	(revision 1228)
@@ -41,19 +41,9 @@
 
       G4MuonNucleusProcess(const G4String& processName ="MuonNucleus");
-      ~G4MuonNucleusProcess();
-
+      virtual ~G4MuonNucleusProcess();
 
       G4double GetMeanFreePath(const G4Track &muonTrack,
                                G4double previousStepSize,
                                G4ForceCondition *condition);
-
-      G4LeptonHadronInteractionModel *chooseInteractionModel();
-
-      G4VParticleChange *PostStepDoIt(const G4Track &muonTrack,
-                                      const G4Step &aStep)
-      { 
-        return G4LeptonHadronProcess::GeneralPostStepDoIt(muonTrack, aStep);
-      }
-
 
     private:
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4ParametrizedHadronicVertex.hh
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4ParametrizedHadronicVertex.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/include/G4ParametrizedHadronicVertex.hh	(revision 1228)
@@ -28,32 +28,33 @@
 
 #include "globals.hh"
-#include "G4ParticleChange.hh"
+#include "G4VParticleChange.hh"
+#include "G4HEInelastic.hh"
 #include "G4Nucleus.hh"
-#include "G4ReactionProduct.hh"
-#include "G4LEPionPlusInelastic.hh"
-#include "G4LEPionMinusInelastic.hh"
-#include "G4HEPionPlusInelastic.hh"
-#include "G4HEPionMinusInelastic.hh"
 #include "G4Track.hh"
+
+class G4LEPionPlusInelastic;
+class G4LEPionMinusInelastic;
+class G4HEPionPlusInelastic;
+class G4HEPionMinusInelastic;
 
 class G4ParametrizedHadronicVertex
 {
-  public:
-   G4ParametrizedHadronicVertex()
-   {
-     theLowEPionPlus = new G4LEPionPlusInelastic;
-     theLowEPionMinus = new G4LEPionMinusInelastic;
-     theHighEPionPlus = new G4HEPionPlusInelastic;
-     theHighEPionMinus = new G4HEPionMinusInelastic;
-   }
-   G4VParticleChange * ApplyYourself(G4Nucleus & theTarget, 
-                                     const G4Track &thePhoton);
+public:
 
-  private:
-   G4LEPionPlusInelastic  *theLowEPionPlus;
-   G4LEPionMinusInelastic *theLowEPionMinus;
-   G4HEPionPlusInelastic  *theHighEPionPlus;
-   G4HEPionMinusInelastic *theHighEPionMinus;
+  G4ParametrizedHadronicVertex();
+
+  ~G4ParametrizedHadronicVertex();
+
+  G4VParticleChange * ApplyYourself(G4Nucleus & theTarget, 
+				    const G4Track &thePhoton);
+
+private:
+
+  G4LEPionPlusInelastic  *theLowEPionPlus;
+  G4LEPionMinusInelastic *theLowEPionMinus;
+  G4HEPionPlusInelastic  *theHighEPionPlus;
+  G4HEPionMinusInelastic *theHighEPionMinus;
   
+  G4VParticleChange theTotalResult;
 };
 #endif
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4LeptonHadronProcess.cc
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4LeptonHadronProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4LeptonHadronProcess.cc	(revision 1228)
@@ -33,5 +33,5 @@
   G4LeptonHadronProcess::G4LeptonHadronProcess( const G4String &processName )
 //-----------------------------------------------------------------------------
-    : G4VDiscreteProcess( processName )
+    : G4VDiscreteProcess( processName ), theInteractionModel(0)
   {
   }
@@ -47,6 +47,6 @@
 //-----------------------------------------------------------------------------
   G4VParticleChange* 
-  G4LeptonHadronProcess::GeneralPostStepDoIt( const G4Track &leptonTrack,
-                                              const G4Step & )
+  G4LeptonHadronProcess::PostStepDoIt( const G4Track &leptonTrack,
+				       const G4Step & )
 //-----------------------------------------------------------------------------
   {
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4MuNuclearInteraction.cc,v 1.12 2009/01/24 11:59:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4MuNuclearInteraction.cc,v 1.13 2009/03/04 19:09:20 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
@@ -97,4 +97,10 @@
 }
 
+
+G4bool G4MuNuclearInteraction::IsApplicable(const G4ParticleDefinition& particle)
+{
+   return(   (&particle == theMuonMinus)||(&particle == theMuonPlus)) ;
+}
+
 void G4MuNuclearInteraction::PreparePhysicsTable(
                                     const G4ParticleDefinition& aParticleType)
@@ -522,19 +528,18 @@
    G4Nucleus theTarget(aMaterial);
 
-   G4VParticleChange* aHadronicFS;
-   aHadronicFS = theHadronicVertex.ApplyYourself(theTarget, gammaTrack);
-   // delete aGamma;
+   G4VParticleChange* aHadronicFS = theHadronicVertex.ApplyYourself(theTarget, gammaTrack);
+   //delete aGamma;
 
    G4int numSecondaries = aHadronicFS->GetNumberOfSecondaries();
    aParticleChange.SetNumberOfSecondaries(numSecondaries);
 
-   G4ParticleMomentum secondaryMomentum = G4ThreeVector(0.,0.,0.);
+   //   G4ParticleMomentum secondaryMomentum = G4ThreeVector(0.,0.,0.);
    for(G4int iSec=0; iSec<numSecondaries; iSec++) 
    {
-     secondaryMomentum 
-       = secondaryMomentum + aHadronicFS->GetSecondary(iSec)->GetMomentum();
+     //secondaryMomentum 
+     //  = secondaryMomentum + aHadronicFS->GetSecondary(iSec)->GetMomentum();
      aParticleChange.AddSecondary(aHadronicFS->GetSecondary(iSec));
    }
-   aHadronicFS->Clear();
+   //aHadronicFS->Clear();
 
    return G4VDiscreteProcess::PostStepDoIt(trackData,stepData);
@@ -574,2 +579,52 @@
 }
 
+G4double G4MuNuclearInteraction::GetMeanFreePath(const G4Track& trackData,
+						 G4double,
+						 G4ForceCondition* condition)
+{
+   const G4DynamicParticle* aDynamicParticle;
+   G4Material* aMaterial;
+   G4double MeanFreePath;
+   G4bool isOutRange ;
+ 
+   *condition = NotForced ;
+
+   aDynamicParticle = trackData.GetDynamicParticle();
+   aMaterial = trackData.GetMaterial();
+
+   G4double KineticEnergy = aDynamicParticle->GetKineticEnergy();
+
+   if (KineticEnergy <  LowestKineticEnergy)
+     MeanFreePath = DBL_MAX ;
+   else {
+     if (KineticEnergy > HighestKineticEnergy) 
+                                 KineticEnergy = 0.99*HighestKineticEnergy ;
+     MeanFreePath = (*theMeanFreePathTable)(aMaterial->GetIndex())->
+                                 GetValue( KineticEnergy, isOutRange );
+   }
+   return MeanFreePath; 
+} 
+
+G4double G4MuNuclearInteraction::ComputeMeanFreePath(
+                                     const G4ParticleDefinition* ParticleType,
+				     G4double KineticEnergy,
+				     const G4Material* aMaterial)
+{
+  const G4ElementVector* theElementVector = aMaterial->GetElementVector() ;
+  const G4double* theAtomNumDensityVector = 
+                                      aMaterial->GetAtomicNumDensityVector();
+
+  G4double SIGMA = 0 ;
+
+  for ( size_t i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
+  {             
+    SIGMA += theAtomNumDensityVector[i] * 
+             ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
+                                          (*theElementVector)[i]->GetZ(),
+                                          (*theElementVector)[i]->GetA()) ;
+  }       
+
+  return SIGMA<=0.0 ? DBL_MAX : 1./SIGMA ;
+}
+
+
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4MuonNucleusInteractionModel.cc,v 1.6 2006/06/29 20:57:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusProcess.cc
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusProcess.cc	(revision 1228)
@@ -36,5 +36,5 @@
     : G4LeptonHadronProcess( processName)
   {
-    theInteractionModel = chooseInteractionModel();
+    theInteractionModel = new G4MuonNucleusInteractionModel;
   }
 
@@ -46,15 +46,4 @@
     delete theInteractionModel;
   }
-
-
-//-----------------------------------------------------------------------------
-  G4LeptonHadronInteractionModel*
-  G4MuonNucleusProcess::chooseInteractionModel()
-//-----------------------------------------------------------------------------
-  {
-    G4MuonNucleusInteractionModel* aModel = new G4MuonNucleusInteractionModel;
-    return aModel;
-  }
-
 
 //-----------------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc
===================================================================
--- trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc	(revision 1228)
@@ -25,60 +25,58 @@
 //
 //
-// $Id: G4ParametrizedHadronicVertex.cc,v 1.6 2006/06/29 20:57:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4ParametrizedHadronicVertex.cc,v 1.7 2009/03/04 19:09:20 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
+
 #include "G4ParametrizedHadronicVertex.hh"
 #include "G4HadFinalState.hh"
-#include "G4ParticleChange.hh"
+#include "G4HadProjectile.hh"
+#include "G4LEPionPlusInelastic.hh"
+#include "G4LEPionMinusInelastic.hh"
+#include "G4HEPionPlusInelastic.hh"
+#include "G4HEPionMinusInelastic.hh"
 
-G4VParticleChange * G4ParametrizedHadronicVertex::
-ApplyYourself(G4Nucleus & theTarget, const G4Track &thePhoton)
+G4ParametrizedHadronicVertex::G4ParametrizedHadronicVertex()
+{
+  theLowEPionPlus = new G4LEPionPlusInelastic;
+  theLowEPionMinus = new G4LEPionMinusInelastic;
+  theHighEPionPlus = new G4HEPionPlusInelastic;
+  theHighEPionMinus = new G4HEPionMinusInelastic;
+}
+
+G4ParametrizedHadronicVertex::~G4ParametrizedHadronicVertex()
+{}
+
+G4VParticleChange* 
+G4ParametrizedHadronicVertex::ApplyYourself(G4Nucleus & theTarget, 
+					    const G4Track &thePhoton)
 {   
-    static G4ParticleChange theTotalResult; 
+  theTotalResult.Clear();
+  theTotalResult.Initialize(thePhoton);
 
-    theTotalResult.Clear();
-    theTotalResult.ProposeLocalEnergyDeposit(0.);
-    theTotalResult.Initialize(thePhoton);
-    theTotalResult.ProposeTrackStatus(fAlive);
-    G4double theKineticEnergy = thePhoton.GetKineticEnergy();
-    G4HadFinalState * aR = 0;
-    G4HadProjectile thePro(thePhoton);
-    if(CLHEP::RandBit::shootBit())
+  G4double theKineticEnergy = thePhoton.GetKineticEnergy();
+  G4HadFinalState * aR = 0;
+  G4HadProjectile thePro(thePhoton);
+  if(G4UniformRand() > 0.5)
     {
       if(theKineticEnergy<20*GeV) aR = theLowEPionMinus->ApplyYourself(thePro, theTarget);
       else aR = theHighEPionMinus->ApplyYourself(thePro, theTarget);
     }
-    else
+  else
     {
       if(theKineticEnergy<20*GeV) aR = theLowEPionPlus->ApplyYourself(thePro, theTarget);
       else aR = theHighEPionPlus->ApplyYourself(thePro, theTarget);
     }
-    aR->SetTrafoToLab(thePro.GetTrafoToLab());
-    if(aR->GetStatusChange()==stopAndKill)
-    {
-      theTotalResult.ProposeTrackStatus(fStopAndKill);
-      theTotalResult.ProposeEnergy( 0.0 );
-    }
-    if(aR->GetStatusChange()==suspend)
-    {
-      theTotalResult.ProposeTrackStatus(fSuspend);
-    }
-    if(aR->GetStatusChange()!=stopAndKill )
-    {
-      G4double newWeight = aR->GetWeightChange()*thePhoton.GetWeight();
-      theTotalResult.ProposeParentWeight(newWeight); 
-      if(aR->GetEnergyChange()>-.5) theTotalResult.ProposeEnergy(aR->GetEnergyChange());
-      G4LorentzVector newDirection(aR->GetMomentumChange().unit(), 1.);
-      newDirection*=aR->GetTrafoToLab();
-      theTotalResult.ProposeMomentumDirection(newDirection.vect());
-    }
+  if(!aR) return &theTotalResult;
 
-    theTotalResult.ProposeLocalEnergyDeposit(aR->GetLocalEnergyDeposit());
-    theTotalResult.SetNumberOfSecondaries(aR->GetNumberOfSecondaries());
+  aR->SetTrafoToLab(thePro.GetTrafoToLab());
 
-    G4ThreeVector it(0., 0., 1.);
-    G4double what = 2.*pi*G4UniformRand();
-    for(G4int i=0; i<aR->GetNumberOfSecondaries(); i++)
+  G4int nsec = aR->GetNumberOfSecondaries();
+  theTotalResult.SetNumberOfSecondaries(nsec);
+
+  G4ThreeVector it(0., 0., 1.);
+  G4double what = twopi*G4UniformRand();
+  for(G4int i=0; i<nsec; i++)
     {
       G4LorentzVector theM = aR->GetSecondary(i)->GetParticle()->Get4Momentum();
Index: trunk/source/processes/hadronic/models/pre_equilibrium/History
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/History	(revision 1228)
@@ -14,4 +14,8 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+21-November 2009 V.Ivanchenko   hadr-pre-V09-02-07
+---------------------------------------------------
+G4PreCompoundTransitions - return back transition probability
 
 19-November 2009 V.Ivanchenko   hadr-pre-V09-02-06
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4LowEIonFragmentation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4LowEIonFragmentation.hh,v 1.3 2006/06/29 20:58:04 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by H.P. Wellisch
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundEmission.hh,v 1.7 2009/11/12 14:33:44 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear Preequilibrium
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.icc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.icc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundEmission.icc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundEmission.icc,v 1.5 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundFragmentVector.hh,v 1.6 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear Preequilibrium
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundFragmentVector.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundFragmentVector.icc,v 1.4 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear Preequilibrium
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundModel.hh,v 1.7 2009/11/19 10:19:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundParameters.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundParameters.hh,v 1.5 2008/05/08 10:34:25 quesada Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4PreCompoundTransitions.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundTransitions.hh,v 1.6 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundFragment.hh,v 1.10 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // J. M. Quesada (August 2008).  
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundFragment.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundFragment.icc,v 1.7 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundIon.hh	(revision 1228)
@@ -27,5 +27,5 @@
 
 // $Id: G4VPreCompoundIon.hh,v 1.9 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/include/G4VPreCompoundNucleon.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundNucleon.hh,v 1.8 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundAlpha.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundAlpha.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundAlpha.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundAlpha.cc,v 1.5 2009/02/13 18:57:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundDeuteron.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundDeuteron.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundDeuteron.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundDeuteron.cc,v 1.5 2009/02/13 18:57:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundEmission.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundEmission.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundEmission.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundEmission.cc,v 1.22 2009/11/13 17:40:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragment.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundFragment.cc,v 1.8 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // J. M. Quesada (August 2008).  
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundFragmentVector.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundFragmentVector.cc,v 1.11 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Nuclear Preequilibrium
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundHe3.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundHe3.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundHe3.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundHe3.cc,v 1.5 2009/02/13 18:57:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundIon.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundIon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundIon.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PreCompoundIon.cc,v 1.16 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundModel.cc,v 1.18 2009/11/19 10:19:31 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNeutron.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNeutron.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNeutron.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundNeutron.cc,v 1.4 2009/02/11 18:06:00 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundNucleon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundNucleon.cc,v 1.13 2009/02/11 18:06:00 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundParameters.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundParameters.cc,v 1.3 2006/06/29 20:59:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundProton.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundProton.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundProton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundProton.cc,v 1.4 2009/02/11 18:06:00 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTransitions.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4PreCompoundTransitions.cc,v 1.21 2009/11/19 10:18:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4PreCompoundTransitions.cc,v 1.22 2009/11/21 18:03:13 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -159,6 +159,6 @@
 
 //JMQ 281009  phenomenological factor in order to increase equilibrium contribution
-   G4double factor=5.0;
-   TransitionProb1 *= factor;
+//   G4double factor=5.0;
+//   TransitionProb1 *= factor;
 //
     if (TransitionProb1 < 0.0) TransitionProb1 = 0.0; 
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTriton.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTriton.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4PreCompoundTriton.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PreCompoundTriton.cc,v 1.5 2009/02/13 18:57:32 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundFragment.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4VPreCompoundFragment.cc,v 1.12 2009/02/10 16:01:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // J. M. Quesada (August 2008).  
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundIon.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VPreCompoundIon.cc,v 1.9 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // by V. Lara
Index: trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc
===================================================================
--- trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/pre_equilibrium/exciton_model/src/G4VPreCompoundNucleon.cc	(revision 1228)
@@ -27,5 +27,5 @@
 
 // $Id: G4VPreCompoundNucleon.cc,v 1.9 2008/09/22 10:18:36 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 
 //
Index: trunk/source/processes/hadronic/models/qmd/GNUmakefile
===================================================================
--- trunk/source/processes/hadronic/models/qmd/GNUmakefile	(revision 1227)
+++ trunk/source/processes/hadronic/models/qmd/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.2 2008/11/22 06:30:46 tkoi Exp $
+# $Id: GNUmakefile,v 1.3 2009/11/20 23:33:38 tkoi Exp $
 # -----------------------------------------------------------
 # GNUmakefile for hadronic library.  Gabriele Cosmo, 18/9/96.
@@ -30,6 +30,4 @@
 	    -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
 	    -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
-	    -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
-	    -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
 	    -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
 	    -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
@@ -43,5 +41,4 @@
             -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
             -I$(G4BASE)/processes/hadronic/models/de_excitation/management/include \
-            -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
             -I$(G4BASE)/particles/management/include \
             -I$(G4BASE)/particles/leptons/include \
Index: trunk/source/processes/hadronic/models/qmd/History
===================================================================
--- trunk/source/processes/hadronic/models/qmd/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/qmd/History	(revision 1228)
@@ -13,4 +13,11 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+20-November-2009 Tatsumi Koi (hadr-qmd-V09-02-03)
+- Delete obviously unnecessary dependency in GNUMakefile 
+	GNUmakefile
+- Enable meson incidence (BETA)
+	include/G4QMDReaction.hh  
+	src/G4QMDReaction.cc  
 
 19-November-2009 Tatsumi Koi (hadr-qmd-V09-02-02)
Index: trunk/source/processes/hadronic/models/qmd/include/G4QMDReaction.hh
===================================================================
--- trunk/source/processes/hadronic/models/qmd/include/G4QMDReaction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/qmd/include/G4QMDReaction.hh	(revision 1228)
@@ -50,4 +50,5 @@
 #include "G4IonsShenCrossSection.hh"
 #include "G4GeneralSpaceNNCrossSection.hh"
+#include "G4PiNuclearCrossSection.hh"
 
 #include "G4HadronicInteraction.hh"
@@ -115,4 +116,6 @@
       G4GeneralSpaceNNCrossSection* genspaXS;
 
+      G4PiNuclearCrossSection* piNucXS;
+
       G4bool gem;
       G4bool frag;
Index: trunk/source/processes/hadronic/models/qmd/src/G4QMDReaction.cc
===================================================================
--- trunk/source/processes/hadronic/models/qmd/src/G4QMDReaction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/qmd/src/G4QMDReaction.cc	(revision 1228)
@@ -52,4 +52,5 @@
    shenXS = new G4IonsShenCrossSection();
    //genspaXS = new G4GeneralSpaceNNCrossSection();
+   piNucXS = new G4PiNuclearCrossSection();
    meanField = new G4QMDMeanField();
    collision = new G4QMDCollision();
@@ -107,5 +108,11 @@
 
      //090331
-     G4double xs_0 = shenXS->GetCrossSection ( proj_dp , targ_ele , aTemp );
+  
+   G4VCrossSectionDataSet* theXS = shenXS;
+
+   if ( proj_pd->GetParticleType() == "meson" ) theXS = piNucXS;
+
+   G4double xs_0 = theXS->GetCrossSection ( proj_dp , targ_ele , aTemp );
+
      //G4double xs_0 = genspaXS->GetCrossSection ( proj_dp , targ_ele , aTemp );
      G4double bmax_0 = std::sqrt( xs_0 / pi );
@@ -158,5 +165,5 @@
 
       G4double plab = projectile.GetTotalMomentum()/GeV;
-      G4double elab = (projectile.GetKineticEnergy() + proj_pd->GetPDGMass() + targ_pd->GetPDGMass() )/GeV;
+      G4double elab = ( projectile.GetKineticEnergy() + proj_pd->GetPDGMass() + targ_pd->GetPDGMass() )/GeV;
 
       calcOffSetOfCollision( b , proj_pd , targ_pd , plab , elab , bmax , boostCMtoNN );
@@ -177,9 +184,10 @@
          //proj->ShowParticipants();
 
-      }
-
-      meanField->SetSystem ( proj );
-      proj->SetTotalPotential( meanField->GetTotalPotential() );
-      proj->CalEnergyAndAngularMomentumInCM();
+
+         meanField->SetSystem ( proj );
+         proj->SetTotalPotential( meanField->GetTotalPotential() );
+         proj->CalEnergyAndAngularMomentumInCM();
+
+      }
 
 // Target
@@ -220,5 +228,4 @@
       G4LorentzVector targ4pCM = CLHEP::boostOf ( targ4p , boostToReac );
 
-
 //    Projectile
       if ( proj != NULL )
@@ -251,25 +258,31 @@
 //       projectile is particle
 
-         G4int i = targ->GetTotalNumberOfParticipant(); 
+         // avoid multiple set in "elastic" loop
+         if ( system->GetTotalNumberOfParticipant() == targ->GetTotalNumberOfParticipant() )
+         {
+
+            G4int i = targ->GetTotalNumberOfParticipant(); 
       
-         G4ThreeVector p0( 0 ); 
-         G4ThreeVector r0( 0 );
-
-
-         G4ThreeVector p ( p0.x() + coulomb_collision_px_proj 
-                         , p0.y() 
-                         , p0.z() * coulomb_collision_gamma_proj + coulomb_collision_pz_proj ); 
-
-         G4ThreeVector r ( r0.x() + coulomb_collision_rx_proj 
-                         , r0.y() 
-                         , r0.z() / coulomb_collision_gamma_proj + coulomb_collision_rz_proj ); 
-
-         system->SetParticipant( new G4QMDParticipant( (G4ParticleDefinition*)projectile.GetDefinition() , p , r ) );
-         system->GetParticipant ( i )->SetProjectile();
-      }
+            G4ThreeVector p0( 0 ); 
+            G4ThreeVector r0( 0 );
+
+            G4ThreeVector p ( p0.x() + coulomb_collision_px_proj 
+                            , p0.y() 
+                            , p0.z() * coulomb_collision_gamma_proj + coulomb_collision_pz_proj ); 
+
+            G4ThreeVector r ( r0.x() + coulomb_collision_rx_proj 
+                            , r0.y() 
+                            , r0.z() / coulomb_collision_gamma_proj + coulomb_collision_rz_proj ); 
+
+            system->SetParticipant( new G4QMDParticipant( (G4ParticleDefinition*)projectile.GetDefinition() , p , r ) );
+            // This is not important becase only 1 projectile particle.
+            system->GetParticipant ( i )->SetProjectile();
+         }
+
+      }
+      //system->ShowParticipants();
 
       delete targ;
       delete proj;
-
 
    meanField->SetSystem ( system );
@@ -611,4 +624,5 @@
 G4double ptot , G4double etot , G4double bmax , G4ThreeVector boostToCM )
 {
+
    G4double mass_proj = pd_proj->GetPDGMass()/GeV;
    G4double mass_targ = pd_targ->GetPDGMass()/GeV;
@@ -623,8 +637,22 @@
    G4double eccm = stot - ( mass_proj + mass_targ );
    
-   G4int zp = pd_proj->GetAtomicNumber();
-   G4int ap = pd_proj->GetAtomicMass();
+   G4int zp = 1;
+   G4int ap = 1;
+   if ( pd_proj->GetParticleType() == "nucleus" )
+   {
+      zp = pd_proj->GetAtomicNumber();
+      ap = pd_proj->GetAtomicMass();
+   }
+   else 
+   {
+      // proton, neutron, mesons
+      zp = int ( pd_proj->GetPDGCharge()/eplus + 0.5 );  
+      // ap = 1;
+   }
+   
+
    G4int zt = pd_targ->GetAtomicNumber();
    G4int at = pd_targ->GetAtomicMass();
+
 
    //G4double rmax0 = 8.0;  // T.K dicide parameter value  // for low energy
Index: trunk/source/processes/hadronic/models/rpg/History
===================================================================
--- trunk/source/processes/hadronic/models/rpg/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/History	(revision 1228)
@@ -14,4 +14,9 @@
    * Please list in reverse chronological order (last date on top)
    ---------------------------------------------------------------
+
+20 Nov 2009 - Dennis Wright (hadr-rpg-V09-02-01)
+------------------------------------------------
+G4RPGInelastic:  add temporary message stating the RPG model is
+   under development and should not be used
 
 25 May 2009 - Dennis Wright (hadr-rpg-V09-02-00)
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiKZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiKZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiKZeroInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiKZeroInelastic.hh,v 1.1 2007/07/18 20:51:36 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiLambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiLambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiLambdaInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiLambdaInelastic.hh,v 1.1 2007/07/18 20:51:36 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiNeutronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiNeutronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiNeutronInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiNeutronInelastic.hh,v 1.1 2007/07/18 20:51:36 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiOmegaMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiOmegaMinusInelastic.hh,v 1.1 2007/07/18 20:51:36 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiProtonInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiProtonInelastic.hh,v 1.1 2007/07/18 20:51:36 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiSigmaMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiSigmaPlusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiSigmaPlusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiXiMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGAntiXiZeroInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiXiZeroInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGFragmentation.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGFragmentation.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGFragmentation.hh,v 1.2 2008/02/22 22:02:13 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D.H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGInelastic.hh,v 1.4 2009/05/25 19:06:59 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGKLongInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGKLongInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGKLongInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RPGKLongInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGKMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGKMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGKMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGKMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGKPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGKPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGKPlusInelastic.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RPGKPlusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGKShortInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGKShortInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGKShortInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGKShortInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGKZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGKZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGKZeroInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGKZeroInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGLambdaInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGLambdaInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGLambdaInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGLambdaInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGNeutronInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGNeutronInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGNeutronInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGNeutronInelastic.hh,v 1.3 2008/05/05 21:21:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGNucleonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGNucleonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGNucleonInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGNucleonInelastic.hh,v 1.2 2009/05/25 19:05:19 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGOmegaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGOmegaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGOmegaMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGOmegaMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGPiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGPiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGPiMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPiMinusInelastic.hh,v 1.3 2008/05/05 21:21:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGPiPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGPiPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGPiPlusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPiPlusInelastic.hh,v 1.3 2008/05/05 21:21:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGPionInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGPionInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGPionInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPionInelastic.hh,v 1.2 2009/05/25 19:05:34 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGPionSuppression.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGPionSuppression.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGPionSuppression.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPionSuppression.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D.H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGProtonInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGProtonInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGProtonInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGProtonInelastic.hh,v 1.3 2008/05/05 21:21:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGReaction.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGReaction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGReaction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGReaction.hh,v 1.3 2008/05/05 21:21:54 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGSigmaMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaPlusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaPlusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGSigmaPlusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGSigmaPlusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGStrangeProduction.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGStrangeProduction.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGStrangeProduction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGStrangeProduction.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D.H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoBody.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoBody.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoBody.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGTwoBody.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D.H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoCluster.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoCluster.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGTwoCluster.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGTwoCluster.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D.H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGXiMinusInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGXiMinusInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGXiMinusInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGXiMinusInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright
Index: trunk/source/processes/hadronic/models/rpg/include/G4RPGXiZeroInelastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/rpg/include/G4RPGXiZeroInelastic.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/include/G4RPGXiZeroInelastic.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGXiZeroInelastic.hh,v 1.1 2007/07/18 20:51:37 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiKZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiKZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiKZeroInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiKZeroInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiLambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiLambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiLambdaInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiLambdaInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiNeutronInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiNeutronInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiNeutronInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiNeutronInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiOmegaMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiOmegaMinusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiProtonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiProtonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiProtonInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiProtonInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiSigmaMinusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiSigmaPlusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiSigmaPlusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiXiMinusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGAntiXiZeroInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGAntiXiZeroInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGFragmentation.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGFragmentation.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGFragmentation.cc,v 1.6 2008/06/09 18:13:16 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGInelastic.cc	(revision 1228)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4RPGInelastic.cc,v 1.7 2009/05/25 19:07:15 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RPGInelastic.cc,v 1.8 2009/11/20 16:39:38 dennis Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
@@ -57,4 +57,9 @@
   particleDef[16] = G4AntiProton::AntiProton();
   particleDef[17] = G4AntiNeutron::AntiNeutron();
+
+  G4cout << " **************************************************** " << G4endl; 
+  G4cout << " * The RPG model is currently under development and * " << G4endl; 
+  G4cout << " * should not be used.                              * " << G4endl; 
+  G4cout << " **************************************************** " << G4endl; 
 }
 
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGKMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGKMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGKMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGKMinusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGKPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGKPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGKPlusInelastic.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4RPGKPlusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGKZeroInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGKZeroInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGKZeroInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGKZeroInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGLambdaInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGLambdaInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGLambdaInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGLambdaInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGNeutronInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGNeutronInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGNeutronInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGNeutronInelastic.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGNucleonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGNucleonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGNucleonInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGNucleonInelastic.cc,v 1.2 2009/05/25 19:06:03 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGOmegaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGOmegaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGOmegaMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGOmegaMinusInelastic.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGPiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGPiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGPiMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPiMinusInelastic.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGPiPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGPiPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGPiPlusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPiPlusInelastic.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGPionInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGPionInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGPionInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPionInelastic.cc,v 1.2 2009/05/25 19:05:47 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGPionSuppression.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGPionSuppression.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGPionSuppression.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGPionSuppression.cc,v 1.1 2007/07/18 21:04:20 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGProtonInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGProtonInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGProtonInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGProtonInelastic.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGReaction.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGReaction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGReaction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGReaction.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGSigmaMinusInelastic.cc,v 1.1 2007/07/18 21:04:21 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaPlusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaPlusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGSigmaPlusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGSigmaPlusInelastic.cc,v 1.1 2007/07/18 21:04:21 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGStrangeProduction.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGStrangeProduction.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGStrangeProduction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGStrangeProduction.cc,v 1.1 2007/07/18 21:04:21 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoBody.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoBody.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoBody.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGTwoBody.cc,v 1.4 2008/05/05 21:21:55 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoCluster.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoCluster.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGTwoCluster.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGTwoCluster.cc,v 1.5 2008/06/09 18:13:35 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/rpg/src/G4RPGXiMinusInelastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/rpg/src/G4RPGXiMinusInelastic.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/rpg/src/G4RPGXiMinusInelastic.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4RPGXiMinusInelastic.cc,v 1.1 2007/07/18 21:04:21 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
Index: trunk/source/processes/hadronic/models/theo_high_energy/include/G4ProjectileDiffractiveChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/include/G4ProjectileDiffractiveChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/include/G4ProjectileDiffractiveChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProjectileDiffractiveChannel.hh,v 1.1 2007/11/13 16:01:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/theo_high_energy/include/G4QuasiElasticChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/include/G4QuasiElasticChannel.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/include/G4QuasiElasticChannel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasiElasticChannel.hh,v 1.2 2008/04/08 15:41:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/include/G4TheoFSGenerator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TheoFSGenerator.hh,v 1.6 2007/11/13 16:01:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/theo_high_energy/src/G4ProjectileDiffractiveChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/src/G4ProjectileDiffractiveChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/src/G4ProjectileDiffractiveChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProjectileDiffractiveChannel.cc,v 1.2 2007/11/15 16:07:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/theo_high_energy/src/G4QuasiElasticChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/src/G4QuasiElasticChannel.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/src/G4QuasiElasticChannel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasiElasticChannel.cc,v 1.7 2009/04/09 08:28:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc
===================================================================
--- trunk/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/theo_high_energy/src/G4TheoFSGenerator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TheoFSGenerator.cc,v 1.11 2009/04/09 08:28:42 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4TheoFSGenerator
Index: trunk/source/processes/hadronic/models/util/History
===================================================================
--- trunk/source/processes/hadronic/models/util/History	(revision 1227)
+++ trunk/source/processes/hadronic/models/util/History	(revision 1228)
@@ -15,5 +15,20 @@
      ---------------------------------------------------------------
 
+10 December 2009 Gunter Folger     hadr-mod-util-V09-02-07
+- G4NuclearFermiDensity.hh: chnage value of prtection in GetDeriv() to lower
+    value
+    
+09 December 2009 Gunter Folger     hadr-mod-util-V09-02-06
+--------------------------------------------------------
+- G4NuclearFermiDensity.hh: Protect GetDeriv(pos) for positions far 
+   outside the nucleus causing an FP overflow in exp.
+
+09 December 2009 Gunter Folger     hadr-mod-util-V09-02-05
+--------------------------------------------------------
+- G4WilsonRadius.cc change provided by M.Mendenhall via P.Truscott:
+   Data vector r[] made static const
+   
 19 November 2009 Gunter Folger     hadr-mod-util-V09-02-04
+--------------------------------------------------------
 -  Restore methods storing/retrieving G4SplitableHadron*, 
    now in use in FTF
Index: trunk/source/processes/hadronic/models/util/include/G4NuclearFermiDensity.hh
===================================================================
--- trunk/source/processes/hadronic/models/util/include/G4NuclearFermiDensity.hh	(revision 1227)
+++ trunk/source/processes/hadronic/models/util/include/G4NuclearFermiDensity.hh	(revision 1228)
@@ -56,5 +56,7 @@
     G4double GetDeriv(const G4ThreeVector & aPosition) const
     {
-      return -std::exp((aPosition.mag()-theR)/a) * sqr(GetDensity(aPosition)) / (a*Getrho0());
+      G4double currentR=aPosition.mag();
+      if (currentR > 40*theR  ) {return 0;}
+      else return -std::exp((currentR-theR)/a) * sqr(GetDensity(aPosition)) / (a*Getrho0());
     }   
    
Index: trunk/source/processes/hadronic/models/util/src/G4WilsonRadius.cc
===================================================================
--- trunk/source/processes/hadronic/models/util/src/G4WilsonRadius.cc	(revision 1227)
+++ trunk/source/processes/hadronic/models/util/src/G4WilsonRadius.cc	(revision 1228)
@@ -84,5 +84,8 @@
   else
   {
-    G4double r[27] = {0.0, 0.85,  2.095, 1.976, 1.671, 1.986,
+	// this was changed from just G4double to static const G4double
+	// to make sure that time wasn't being wasted on every call reloading a stack variable
+	// by MHM 20050119
+    static const G4double r[27] = {0.0, 0.85,  2.095, 1.976, 1.671, 1.986,
                            2.57,  2.41,  2.23,  2.519, 2.45,
                            2.42,  2.471, 2.440, 2.58,  2.611,
Index: trunk/source/processes/hadronic/processes/include/G4ElectronNuclearProcess.hh
===================================================================
--- trunk/source/processes/hadronic/processes/include/G4ElectronNuclearProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/processes/include/G4ElectronNuclearProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElectronNuclearProcess.hh,v 1.6 2009/03/31 19:16:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description:
Index: trunk/source/processes/hadronic/processes/include/G4PhotoNuclearProcess.hh
===================================================================
--- trunk/source/processes/hadronic/processes/include/G4PhotoNuclearProcess.hh	(revision 1227)
+++ trunk/source/processes/hadronic/processes/include/G4PhotoNuclearProcess.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4PhotoNuclearProcess.hh,v 1.9 2009/03/31 19:16:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Class Description
Index: trunk/source/processes/hadronic/processes/src/G4ElectronNuclearProcess.cc
===================================================================
--- trunk/source/processes/hadronic/processes/src/G4ElectronNuclearProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/processes/src/G4ElectronNuclearProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ElectronNuclearProcess.cc,v 1.3 2009/03/31 19:16:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/processes/src/G4PhotoNuclearProcess.cc
===================================================================
--- trunk/source/processes/hadronic/processes/src/G4PhotoNuclearProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/processes/src/G4PhotoNuclearProcess.cc	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4PhotoNuclearProcess.cc,v 1.3 2009/03/31 19:16:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/processes/src/G4PositronNuclearProcess.cc
===================================================================
--- trunk/source/processes/hadronic/processes/src/G4PositronNuclearProcess.cc	(revision 1227)
+++ trunk/source/processes/hadronic/processes/src/G4PositronNuclearProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4PositronNuclearProcess.cc,v 1.1 2009/03/31 19:16:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh
===================================================================
--- trunk/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuMinusCaptureCascade.hh,v 1.10 2007/07/05 18:19:14 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //   G4MuMinusCaptureCascade physics process --------
Index: trunk/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
===================================================================
--- trunk/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuonMinusCaptureAtRest.hh,v 1.23 2008/10/02 20:57:52 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  G4MuonMinusCaptureAtRest physics process
Index: trunk/source/processes/hadronic/stopping/include/G4StopElementSelector.hh
===================================================================
--- trunk/source/processes/hadronic/stopping/include/G4StopElementSelector.hh	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/include/G4StopElementSelector.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StopElementSelector.hh,v 1.10 2007/07/05 18:19:14 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author:        V.Ivanchenko (Vladimir.Ivantchenko@cern.ch)
Index: trunk/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc
===================================================================
--- trunk/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuMinusCaptureCascade.cc,v 1.16 2008/05/05 09:09:06 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //   G4MuonMinusCaptureAtRest physics process
Index: trunk/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
===================================================================
--- trunk/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4MuonMinusCaptureAtRest.cc,v 1.54 2009/01/24 11:55:38 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //   G4MuonMinusCaptureAtRest physics process
Index: trunk/source/processes/hadronic/stopping/src/G4StopElementSelector.cc
===================================================================
--- trunk/source/processes/hadronic/stopping/src/G4StopElementSelector.cc	(revision 1227)
+++ trunk/source/processes/hadronic/stopping/src/G4StopElementSelector.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4StopElementSelector.cc,v 1.16 2007/10/02 18:27:43 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // File: G4StopElementSelector
Index: trunk/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4IVContinuousDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4IVContinuousDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IVContinuousDiscreteProcess.hh,v 1.8 2006/06/29 21:07:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
Index: trunk/source/processes/management/include/G4IVRestDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4IVRestDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4IVRestDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IVRestDiscreteProcess.hh,v 1.8 2006/06/29 21:07:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
Index: trunk/source/processes/management/include/G4ParticleTypes.hh
===================================================================
--- trunk/source/processes/management/include/G4ParticleTypes.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ParticleTypes.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParticleTypes.hh,v 1.6 2006/06/29 21:07:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcTblElement.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcTblElement.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcTblElement.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcTblElement.hh,v 1.11 2006/06/29 21:07:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcTblElement.icc
===================================================================
--- trunk/source/processes/management/include/G4ProcTblElement.icc	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcTblElement.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcTblElement.icc,v 1.8 2006/06/29 21:07:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessAttribute.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessAttribute.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessAttribute.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessAttribute.hh,v 1.5 2006/06/29 21:07:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessManager.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessManager.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessManager.hh,v 1.16 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessManager.icc
===================================================================
--- trunk/source/processes/management/include/G4ProcessManager.icc	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessManager.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessManager.icc,v 1.6 2007/03/30 01:02:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessManagerMessenger.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessManagerMessenger.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessManagerMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessManagerMessenger.hh,v 1.7 2006/06/29 21:07:30 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/management/include/G4ProcessTable.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessTable.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessTable.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4ProcessTable.hh,v 1.10 2006/06/29 21:07:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessTable.icc
===================================================================
--- trunk/source/processes/management/include/G4ProcessTable.icc	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessTable.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessTable.icc,v 1.5 2006/06/29 21:07:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  History:
Index: trunk/source/processes/management/include/G4ProcessTableMessenger.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessTableMessenger.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessTableMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessTableMessenger.hh,v 1.7 2006/06/29 21:07:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/management/include/G4ProcessType.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessType.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessType.hh,v 1.5 2006/06/29 21:07:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/management/include/G4ProcessVector.hh
===================================================================
--- trunk/source/processes/management/include/G4ProcessVector.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessVector.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessVector.hh,v 1.10 2006/06/29 21:07:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4ProcessVector.icc
===================================================================
--- trunk/source/processes/management/include/G4ProcessVector.icc	(revision 1227)
+++ trunk/source/processes/management/include/G4ProcessVector.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessVector.icc,v 1.5 2006/06/29 21:07:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 inline G4bool G4ProcessVector::operator==(const G4ProcessVector &right) const
Index: trunk/source/processes/management/include/G4VContinuousDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VContinuousDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VContinuousDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VContinuousDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VContinuousProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VContinuousProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VContinuousProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VContinuousProcess.hh,v 1.6 2006/06/29 21:07:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VDiscreteProcess.hh	(revision 1228)
@@ -27,5 +27,5 @@
 //
 // $Id: G4VDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VProcess.hh,v 1.25 2007/11/15 04:09:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestContinuousDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VRestContinuousProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VRestContinuousProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VRestContinuousProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestContinuousProcess.hh,v 1.6 2006/06/29 21:07:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VRestDiscreteProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VRestDiscreteProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VRestDiscreteProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4VRestProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4VRestProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4VRestProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestProcess.hh,v 1.6 2006/06/29 21:07:58 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/include/G4WrapperProcess.hh
===================================================================
--- trunk/source/processes/management/include/G4WrapperProcess.hh	(revision 1227)
+++ trunk/source/processes/management/include/G4WrapperProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WrapperProcess.hh,v 1.9 2007/12/12 10:09:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4IVContinuousDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4IVContinuousDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IVContinuousDiscreteProcess.cc,v 1.10 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
Index: trunk/source/processes/management/src/G4IVRestDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4IVRestDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4IVRestDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4IVRestDiscreteProcess.cc,v 1.10 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: 
Index: trunk/source/processes/management/src/G4ProcTblElement.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcTblElement.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcTblElement.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcTblElement.cc,v 1.7 2006/06/29 21:08:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4ProcessAttribute.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessAttribute.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessAttribute.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessAttribute.cc,v 1.5 2006/06/29 21:08:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4ProcessManager.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessManager.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessManager.cc,v 1.36 2008/03/20 02:57:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4ProcessManagerMessenger.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessManagerMessenger.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessManagerMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessManagerMessenger.cc,v 1.10 2006/06/29 21:08:12 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/management/src/G4ProcessTable.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessTable.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessTable.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessTable.cc,v 1.13 2007/10/06 05:33:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4ProcessTableMessenger.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessTableMessenger.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessTableMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessTableMessenger.cc,v 1.18 2008/03/14 02:55:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/management/src/G4ProcessVector.cc
===================================================================
--- trunk/source/processes/management/src/G4ProcessVector.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4ProcessVector.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ProcessVector.cc,v 1.5 2008/06/23 08:58:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VContinuousDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VContinuousDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VContinuousDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VContinuousDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VContinuousProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VContinuousProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VContinuousProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VContinuousProcess.cc,v 1.5 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VProcess.cc,v 1.16 2007/11/15 04:10:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestContinuousDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VRestContinuousProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VRestContinuousProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VRestContinuousProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestContinuousProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VRestDiscreteProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VRestDiscreteProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VRestDiscreteProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4VRestProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4VRestProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4VRestProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VRestProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/management/src/G4WrapperProcess.cc
===================================================================
--- trunk/source/processes/management/src/G4WrapperProcess.cc	(revision 1227)
+++ trunk/source/processes/management/src/G4WrapperProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4WrapperProcess.cc,v 1.1 2007/12/12 10:09:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/optical/include/G4OpAbsorption.hh
===================================================================
--- trunk/source/processes/optical/include/G4OpAbsorption.hh	(revision 1227)
+++ trunk/source/processes/optical/include/G4OpAbsorption.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpAbsorption.hh,v 1.9 2006/06/29 21:08:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/optical/include/G4OpBoundaryProcess.hh
===================================================================
--- trunk/source/processes/optical/include/G4OpBoundaryProcess.hh	(revision 1227)
+++ trunk/source/processes/optical/include/G4OpBoundaryProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpBoundaryProcess.hh,v 1.22 2009/11/20 01:06:45 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/optical/include/G4OpProcessSubType.hh
===================================================================
--- trunk/source/processes/optical/include/G4OpProcessSubType.hh	(revision 1227)
+++ trunk/source/processes/optical/include/G4OpProcessSubType.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpProcessSubType.hh,v 1.3 2008/12/18 13:02:46 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/optical/include/G4OpRayleigh.hh
===================================================================
--- trunk/source/processes/optical/include/G4OpRayleigh.hh	(revision 1227)
+++ trunk/source/processes/optical/include/G4OpRayleigh.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpRayleigh.hh,v 1.9 2006/06/29 21:08:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/optical/include/G4OpWLS.hh
===================================================================
--- trunk/source/processes/optical/include/G4OpWLS.hh	(revision 1227)
+++ trunk/source/processes/optical/include/G4OpWLS.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpWLS.hh,v 1.4 2006/06/29 21:08:42 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/optical/src/G4OpAbsorption.cc
===================================================================
--- trunk/source/processes/optical/src/G4OpAbsorption.cc	(revision 1227)
+++ trunk/source/processes/optical/src/G4OpAbsorption.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpAbsorption.cc,v 1.9 2008/10/24 19:52:28 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/optical/src/G4OpBoundaryProcess.cc
===================================================================
--- trunk/source/processes/optical/src/G4OpBoundaryProcess.cc	(revision 1227)
+++ trunk/source/processes/optical/src/G4OpBoundaryProcess.cc	(revision 1228)
@@ -722,5 +722,5 @@
                                           OldMomentum.angle(-theGlobalNormal);
               // Round it to closest integer
-              G4int angleIncident = G4int(floor(180/pi*anglePhotonToNormal+0.5));
+              G4int angleIncident = G4int(std::floor(180/pi*anglePhotonToNormal+0.5));
 
               // Take random angles THETA and PHI, 
Index: trunk/source/processes/optical/src/G4OpRayleigh.cc
===================================================================
--- trunk/source/processes/optical/src/G4OpRayleigh.cc	(revision 1227)
+++ trunk/source/processes/optical/src/G4OpRayleigh.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpRayleigh.cc,v 1.17 2008/10/24 19:51:12 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/optical/src/G4OpWLS.cc
===================================================================
--- trunk/source/processes/optical/src/G4OpWLS.cc	(revision 1227)
+++ trunk/source/processes/optical/src/G4OpWLS.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4OpWLS.cc,v 1.13 2008/10/24 19:50:50 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 ////////////////////////////////////////////////////////////////////////
Index: trunk/source/processes/parameterisation/include/G4FastSimulationManager.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastSimulationManager.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastSimulationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationManager.hh,v 1.13 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationManagerProcess.hh,v 1.16 2007/11/30 18:05:14 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastSimulationMessenger.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastSimulationMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationMessenger.hh,v 1.7 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/parameterisation/include/G4FastStep.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastStep.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastStep.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastStep.hh,v 1.8 2006/06/29 21:09:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/parameterisation/include/G4FastStep.icc
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastStep.icc	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastStep.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastStep.icc,v 1.5 2006/06/29 21:09:16 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $id: G4ParticleChange.icc,v 1.6 1998/04/14 02:25:54 kurasige Exp $
Index: trunk/source/processes/parameterisation/include/G4FastTrack.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4FastTrack.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4FastTrack.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastTrack.hh,v 1.8 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id:
Index: trunk/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GlobalFastSimulationManager.hh,v 1.13 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  
Index: trunk/source/processes/parameterisation/include/G4VFastSimulationModel.hh
===================================================================
--- trunk/source/processes/parameterisation/include/G4VFastSimulationModel.hh	(revision 1227)
+++ trunk/source/processes/parameterisation/include/G4VFastSimulationModel.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFastSimulationModel.hh,v 1.7 2006/06/29 21:09:24 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/parameterisation/src/G4FastSimulationManager.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4FastSimulationManager.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4FastSimulationManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationManager.cc,v 1.13 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationManagerProcess.cc,v 1.18 2008/03/13 16:03:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4FastSimulationMessenger.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4FastSimulationMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastSimulationMessenger.cc,v 1.9 2008/03/13 16:03:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/parameterisation/src/G4FastStep.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4FastStep.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4FastStep.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastStep.cc,v 1.16 2006/06/29 21:09:32 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/parameterisation/src/G4FastTrack.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4FastTrack.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4FastTrack.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4FastTrack.cc,v 1.10 2006/06/29 21:09:34 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4GlobalFastSimulationManager.cc,v 1.20 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //  
Index: trunk/source/processes/parameterisation/src/G4VFastSimulationModel.cc
===================================================================
--- trunk/source/processes/parameterisation/src/G4VFastSimulationModel.cc	(revision 1227)
+++ trunk/source/processes/parameterisation/src/G4VFastSimulationModel.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VFastSimulationModel.cc,v 1.7 2007/05/11 13:50:20 mverderi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh
===================================================================
--- trunk/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh	(revision 1227)
+++ trunk/source/processes/scoring/include/G4ParallelWorldScoringProcess.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParallelWorldScoringProcess.hh,v 1.4 2007/05/30 17:47:10 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc
===================================================================
--- trunk/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc	(revision 1227)
+++ trunk/source/processes/scoring/src/G4ParallelWorldScoringProcess.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4ParallelWorldScoringProcess.cc,v 1.11 2008/09/06 06:18:12 asaim Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/processes/transportation/include/G4CoupledTransportation.hh
===================================================================
--- trunk/source/processes/transportation/include/G4CoupledTransportation.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4CoupledTransportation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CoupledTransportation.hh,v 1.7 2008/11/21 18:27:42 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/transportation/include/G4CoupledTransportation.icc
===================================================================
--- trunk/source/processes/transportation/include/G4CoupledTransportation.icc	(revision 1227)
+++ trunk/source/processes/transportation/include/G4CoupledTransportation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4CoupledTransportation.icc,v 1.4 2007/05/29 13:50:15 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/transportation/include/G4NeutronKiller.hh
===================================================================
--- trunk/source/processes/transportation/include/G4NeutronKiller.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4NeutronKiller.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronKiller.hh,v 1.2 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/transportation/include/G4NeutronKillerMessenger.hh
===================================================================
--- trunk/source/processes/transportation/include/G4NeutronKillerMessenger.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4NeutronKillerMessenger.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronKillerMessenger.hh,v 1.2 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/transportation/include/G4StepLimiter.hh
===================================================================
--- trunk/source/processes/transportation/include/G4StepLimiter.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4StepLimiter.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StepLimiter.hh,v 1.4 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class description
Index: trunk/source/processes/transportation/include/G4TrackTerminator.hh
===================================================================
--- trunk/source/processes/transportation/include/G4TrackTerminator.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4TrackTerminator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackTerminator.hh,v 1.4 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/transportation/include/G4Transportation.hh
===================================================================
--- trunk/source/processes/transportation/include/G4Transportation.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4Transportation.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Transportation.hh,v 1.17 2007/11/09 15:39:20 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 
Index: trunk/source/processes/transportation/include/G4Transportation.icc
===================================================================
--- trunk/source/processes/transportation/include/G4Transportation.icc	(revision 1227)
+++ trunk/source/processes/transportation/include/G4Transportation.icc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Transportation.icc,v 1.11 2007/11/08 17:59:52 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 
Index: trunk/source/processes/transportation/include/G4UserSpecialCuts.hh
===================================================================
--- trunk/source/processes/transportation/include/G4UserSpecialCuts.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4UserSpecialCuts.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4UserSpecialCuts.hh,v 1.11 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // class description
Index: trunk/source/processes/transportation/include/G4VTrackTerminator.hh
===================================================================
--- trunk/source/processes/transportation/include/G4VTrackTerminator.hh	(revision 1227)
+++ trunk/source/processes/transportation/include/G4VTrackTerminator.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrackTerminator.hh,v 1.8 2007/06/01 07:53:26 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4CoupledTransportation.cc
===================================================================
--- trunk/source/processes/transportation/src/G4CoupledTransportation.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4CoupledTransportation.cc	(revision 1228)
@@ -27,5 +27,5 @@
 // $Id: G4CoupledTransportation.cc,v 1.27 2008/11/26 13:01:28 japost Exp $
 // --> Merged with 1.60.4.2.2.3 2007/05/09 09:30:28 japost 
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // ------------------------------------------------------------
 //  GEANT 4 class implementation
Index: trunk/source/processes/transportation/src/G4NeutronKiller.cc
===================================================================
--- trunk/source/processes/transportation/src/G4NeutronKiller.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4NeutronKiller.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronKiller.cc,v 1.2 2007/06/01 07:53:27 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4NeutronKillerMessenger.cc
===================================================================
--- trunk/source/processes/transportation/src/G4NeutronKillerMessenger.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4NeutronKillerMessenger.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4NeutronKillerMessenger.cc,v 1.2 2007/06/01 07:53:27 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4StepLimiter.cc
===================================================================
--- trunk/source/processes/transportation/src/G4StepLimiter.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4StepLimiter.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4StepLimiter.cc,v 1.4 2007/06/01 07:53:27 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4Transportation.cc
===================================================================
--- trunk/source/processes/transportation/src/G4Transportation.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4Transportation.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Transportation.cc,v 1.72.2.3 2008/11/21 18:35:15 japost Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 // ------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4UserSpecialCuts.cc
===================================================================
--- trunk/source/processes/transportation/src/G4UserSpecialCuts.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4UserSpecialCuts.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserSpecialCuts.cc,v 1.17 2007/06/01 07:53:27 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // --------------------------------------------------------------
Index: trunk/source/processes/transportation/src/G4VTrackTerminator.cc
===================================================================
--- trunk/source/processes/transportation/src/G4VTrackTerminator.cc	(revision 1227)
+++ trunk/source/processes/transportation/src/G4VTrackTerminator.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrackTerminator.cc,v 1.7 2007/06/01 07:53:27 ahoward Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ----------------------------------------------------------------------
Index: trunk/source/tracking/History
===================================================================
--- trunk/source/tracking/History	(revision 1227)
+++ trunk/source/tracking/History	(revision 1228)
@@ -1,4 +1,4 @@
-$Id: History,v 1.126 2008/12/09 01:37:25 asaim Exp $
-$Name: geant4-09-02-ref-02 $ 
+$Id: History,v 1.137 2009/11/24 10:04:14 perl Exp $
+$Name: geant4-09-03 $ 
 -------------------------------------------------------------------
 
@@ -18,4 +18,47 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+24 Nov 2009 Joseph Perl (tracking-V09-02-07)
+- G4RichTrajectory: add additional attributes
+- G4RichTrajectoryPoint: add additional attributes
+
+20 Nov 2009 L.Desorgher (tracking-V09-02-06)
+- Small correction in G4AdjointSteppingAction to stop the reverse tracking
+  when adjoint particles reenter the adjoint source. 
+  Reput the Nan test removed in  tracking-V09-02-05 but now as (x<0 && x>=0).
+  This Nan test is still needed in very rare case where the weight of a
+  particle goes to Nan. As such the code is stable! The reason for the Nan
+  weight is till under investigation.
+
+18 Nov 2009 G.Cosmo (tracking-V09-02-05)
+- Fixes to "Adjoint" classes to allow build of DLLs on Windows: renamed all
+  methods and data holding "External" as keyword to "Ext".
+  Cleanup of the code: use "const G4String&" instead of "G4String" wherever
+  possible; use G4 types in consistent way; avoid usage of "isNan"; code
+  formatting cleanup; added Geant4 disclaimer.
+
+12 Nov 2009 J.Allison (tracking-V09-02-04)
+- G4Trajectory, G4SmoothTrajectory, G4RichTrajectory:
+  o Added initial kinetic energy.
+- G4RichTrajectory:
+  o Added final kinetic energy.
+- G4RichTrajectoryPoint:
+  o Added "remaining energy" at each step.
+
+10 Nov 2009 L. Desorgher(tracking-V09-02-03)
+- First commit of Adjoint classes in the tracking category
+  New classes are: - G4AdjointCrossSurfChecker and G4AdjointSteppingAction
+
+24 Sep 2009 P.Gumplinger (tracking-V09-02-02)
+- Correction to G4SteppingManager::InvokeAtRestDoItProcs so G4Scintillation
+  process (with an AtRestDoIt and 'Forced') will not be set to 'NotForced' when
+  NofInactiveProc<MAXofAtRestLoops and when the user inactivated it on the fly.
+
+21 Sep 2009 T.Sasaki (tracking-V09-02-01)
+- Takashi's first iteration of the above
+
+27 Feb 2009 T.Sasaki(tracking-V09-02-00)
+- Fixing the problem in the the special cases of skipping voxel boundaries in
+G4RegularNavigation
 
 08 Doc 2008  M.Asai (tracking-V09-01-04)
Index: trunk/source/tracking/include/G4AdjointCrossSurfChecker.hh
===================================================================
--- trunk/source/tracking/include/G4AdjointCrossSurfChecker.hh	(revision 1227)
+++ trunk/source/tracking/include/G4AdjointCrossSurfChecker.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCrossSurfChecker.hh,v 1.2 2009/11/18 18:04:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/tracking/include/G4AdjointSteppingAction.hh
===================================================================
--- trunk/source/tracking/include/G4AdjointSteppingAction.hh	(revision 1227)
+++ trunk/source/tracking/include/G4AdjointSteppingAction.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointSteppingAction.hh,v 1.3 2009/11/20 14:24:34 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////////
Index: trunk/source/tracking/include/G4RichTrajectory.hh
===================================================================
--- trunk/source/tracking/include/G4RichTrajectory.hh	(revision 1227)
+++ trunk/source/tracking/include/G4RichTrajectory.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4RichTrajectory.hh,v 1.5 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RichTrajectory.hh,v 1.6 2009/11/24 10:04:14 perl Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
@@ -42,4 +42,5 @@
 //     4) physical volume and next physical volume;
 //     5) creator process;
+//   ...and much more.
 //
 // Contact:
@@ -58,4 +59,6 @@
 
 #include "G4Trajectory.hh"
+
+#include "G4TouchableHandle.hh"
 
 typedef std::vector<G4VTrajectoryPoint*>  RichTrajectoryPointsContainer;
@@ -92,8 +95,11 @@
   // Extended information (only publicly accessible through AttValues)...
   RichTrajectoryPointsContainer* fpRichPointsContainer;
-  G4VPhysicalVolume* fpInitialVolume;
-  G4VPhysicalVolume* fpInitialNextVolume;
-  const G4VProcess*  fpCreatorProcess;
-  G4double           fFinalKineticEnergy;
+  G4TouchableHandle fpInitialVolume;
+  G4TouchableHandle fpInitialNextVolume;
+  const G4VProcess* fpCreatorProcess;
+  G4TouchableHandle fpFinalVolume;
+  G4TouchableHandle fpFinalNextVolume;
+  const G4VProcess* fpEndingProcess;
+  G4double          fFinalKineticEnergy;
 
 };
Index: trunk/source/tracking/include/G4RichTrajectoryPoint.hh
===================================================================
--- trunk/source/tracking/include/G4RichTrajectoryPoint.hh	(revision 1227)
+++ trunk/source/tracking/include/G4RichTrajectoryPoint.hh	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4RichTrajectoryPoint.hh,v 1.6 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RichTrajectoryPoint.hh,v 1.7 2009/11/24 10:04:14 perl Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
@@ -40,6 +40,8 @@
 //     2) Auxiliary points, as in G4SmoothTrajectory.
 //     3) Total energy deposit.
-//     4) Procees defining end of step.
-//     5) Global time (from start of event) at pre- amd post-step.
+//     4) Remaining energy.
+//     5) Process defining end of step.
+//     6) Global time (from start of event) at pre- amd post-step.
+//   ...and more.
 //
 // Contact:
@@ -59,4 +61,5 @@
 #include "G4TrajectoryPoint.hh"
 
+#include "G4TouchableHandle.hh"
 #include "G4ThreeVector.hh"
 #include <vector>
@@ -101,4 +104,6 @@
   G4double fPreStepPointGlobalTime;
   G4double fPostStepPointGlobalTime;
+  G4TouchableHandle fpPreStepPointVolume;
+  G4TouchableHandle fpPostStepPointVolume;
 };
 
Index: trunk/source/tracking/include/G4SmoothTrajectory.hh
===================================================================
--- trunk/source/tracking/include/G4SmoothTrajectory.hh	(revision 1227)
+++ trunk/source/tracking/include/G4SmoothTrajectory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmoothTrajectory.hh,v 1.12 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh
===================================================================
--- trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh	(revision 1227)
+++ trunk/source/tracking/include/G4SmoothTrajectoryPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmoothTrajectoryPoint.hh,v 1.13 2006/06/29 21:15:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4SteppingManager.hh
===================================================================
--- trunk/source/tracking/include/G4SteppingManager.hh	(revision 1227)
+++ trunk/source/tracking/include/G4SteppingManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SteppingManager.hh,v 1.31 2007/10/09 03:51:06 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 // 
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4SteppingVerbose.hh
===================================================================
--- trunk/source/tracking/include/G4SteppingVerbose.hh	(revision 1227)
+++ trunk/source/tracking/include/G4SteppingVerbose.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SteppingVerbose.hh,v 1.12 2006/06/29 21:15:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4TrackingManager.hh
===================================================================
--- trunk/source/tracking/include/G4TrackingManager.hh	(revision 1227)
+++ trunk/source/tracking/include/G4TrackingManager.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackingManager.hh,v 1.21 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4TrackingMessenger.hh
===================================================================
--- trunk/source/tracking/include/G4TrackingMessenger.hh	(revision 1227)
+++ trunk/source/tracking/include/G4TrackingMessenger.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackingMessenger.hh,v 1.10 2006/06/29 21:15:39 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4Trajectory.hh
===================================================================
--- trunk/source/tracking/include/G4Trajectory.hh	(revision 1227)
+++ trunk/source/tracking/include/G4Trajectory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trajectory.hh,v 1.25 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4TrajectoryPoint.hh
===================================================================
--- trunk/source/tracking/include/G4TrajectoryPoint.hh	(revision 1227)
+++ trunk/source/tracking/include/G4TrajectoryPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrajectoryPoint.hh,v 1.17 2006/06/29 21:15:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4UserSteppingAction.hh
===================================================================
--- trunk/source/tracking/include/G4UserSteppingAction.hh	(revision 1227)
+++ trunk/source/tracking/include/G4UserSteppingAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserSteppingAction.hh,v 1.12 2006/06/29 21:15:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4UserTrackingAction.hh
===================================================================
--- trunk/source/tracking/include/G4UserTrackingAction.hh	(revision 1227)
+++ trunk/source/tracking/include/G4UserTrackingAction.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserTrackingAction.hh,v 1.11 2006/06/29 21:15:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/tracking/include/G4VSteppingVerbose.hh
===================================================================
--- trunk/source/tracking/include/G4VSteppingVerbose.hh	(revision 1227)
+++ trunk/source/tracking/include/G4VSteppingVerbose.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSteppingVerbose.hh,v 1.24 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4VTrajectory.hh
===================================================================
--- trunk/source/tracking/include/G4VTrajectory.hh	(revision 1227)
+++ trunk/source/tracking/include/G4VTrajectory.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/include/G4VTrajectoryPoint.hh
===================================================================
--- trunk/source/tracking/include/G4VTrajectoryPoint.hh	(revision 1227)
+++ trunk/source/tracking/include/G4VTrajectoryPoint.hh	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrajectoryPoint.hh,v 1.15 2006/06/29 21:15:53 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4AdjointCrossSurfChecker.cc
===================================================================
--- trunk/source/tracking/src/G4AdjointCrossSurfChecker.cc	(revision 1227)
+++ trunk/source/tracking/src/G4AdjointCrossSurfChecker.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointCrossSurfChecker.cc,v 1.2 2009/11/18 18:04:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////
Index: trunk/source/tracking/src/G4AdjointSteppingAction.cc
===================================================================
--- trunk/source/tracking/src/G4AdjointSteppingAction.cc	(revision 1227)
+++ trunk/source/tracking/src/G4AdjointSteppingAction.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 // $Id: G4AdjointSteppingAction.cc,v 1.3 2009/11/20 14:24:34 ldesorgh Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 /////////////////////////////////////////////////////////////////////////////
Index: trunk/source/tracking/src/G4RichTrajectory.cc
===================================================================
--- trunk/source/tracking/src/G4RichTrajectory.cc	(revision 1227)
+++ trunk/source/tracking/src/G4RichTrajectory.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4RichTrajectory.cc,v 1.7 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RichTrajectory.cc,v 1.8 2009/11/24 10:04:14 perl Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
@@ -57,11 +57,12 @@
 #endif
 
+#include <sstream>
+
 G4Allocator<G4RichTrajectory> aRichTrajectoryAllocator;
 
 G4RichTrajectory::G4RichTrajectory():
   fpRichPointsContainer(0),
-  fpInitialVolume(0),
-  fpInitialNextVolume(0),
   fpCreatorProcess(0),
+  fpEndingProcess(0),
   fFinalKineticEnergy(0.)
 {}
@@ -77,13 +78,16 @@
 			// RichTrajectoryPointsContainer
 {
-  fpInitialVolume = aTrack->GetVolume();
-  fpInitialNextVolume = aTrack->GetNextVolume();
+  fpInitialVolume = aTrack->GetTouchableHandle();
+  fpInitialNextVolume = aTrack->GetNextTouchableHandle();
   fpCreatorProcess = aTrack->GetCreatorProcess();
+  // On construction, set final values to initial values.
+  // Final values are updated at the addition of every step - see AppendStep.
+  fpFinalVolume = aTrack->GetTouchableHandle();
+  fpFinalNextVolume = aTrack->GetNextTouchableHandle();
+  fpEndingProcess = aTrack->GetCreatorProcess();
+  fFinalKineticEnergy = aTrack->GetKineticEnergy();
+  // Insert the first rich trajectory point (see note above)...
   fpRichPointsContainer = new RichTrajectoryPointsContainer;
-  // Insert the first rich trajectory point (see note above)...
   fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aTrack));
-  // On construction, set final KE to initial KE.
-  // Final KE is updated at the addition of every step - see AppendStep.
-  fFinalKineticEnergy = aTrack->GetKineticEnergy();
 }
 
@@ -94,6 +98,9 @@
   fpInitialNextVolume = right.fpInitialNextVolume;
   fpCreatorProcess = right.fpCreatorProcess;
+  fpFinalVolume = right.fpFinalVolume;
+  fpFinalNextVolume = right.fpFinalNextVolume;
+  fpEndingProcess = right.fpEndingProcess;
+  fFinalKineticEnergy = right.fFinalKineticEnergy;
   fpRichPointsContainer = new RichTrajectoryPointsContainer;
-  fFinalKineticEnergy = right.fFinalKineticEnergy;
   for(size_t i=0;i<right.fpRichPointsContainer->size();i++)
   {
@@ -121,6 +128,11 @@
   fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aStep));
   // Except for first step, which is a sort of virtual step to start
-  // the track, compute the final energy.
-  if (aStep->GetTrack()->GetCurrentStepNumber() > 0) {
+  // the track, compute the final values...
+  const G4Track* track = aStep->GetTrack();
+  const G4StepPoint* postStepPoint = aStep->GetPostStepPoint();
+  if (track->GetCurrentStepNumber() > 0) {
+    fpFinalVolume = track->GetTouchableHandle();
+    fpFinalNextVolume = track->GetNextTouchableHandle();
+    fpEndingProcess = postStepPoint->GetProcessDefinedStep();
     fFinalKineticEnergy =
       aStep->GetPreStepPoint()->GetKineticEnergy() -
@@ -158,10 +170,10 @@
     G4String ID;
 
-    ID = "IVN";
-    (*store)[ID] = G4AttDef(ID,"Initial Volume Name",
-			    "Physics","","G4String");
-
-    ID = "INVN";
-    (*store)[ID] = G4AttDef(ID,"Initial Next Volume Name",
+    ID = "IVPath";
+    (*store)[ID] = G4AttDef(ID,"Initial Volume Path",
+			    "Physics","","G4String");
+
+    ID = "INVPath";
+    (*store)[ID] = G4AttDef(ID,"Initial Next Volume Path",
 			    "Physics","","G4String");
 
@@ -172,4 +184,20 @@
     ID = "CPTN";
     (*store)[ID] = G4AttDef(ID,"Creator Process Type Name",
+			    "Physics","","G4String");
+
+    ID = "FVPath";
+    (*store)[ID] = G4AttDef(ID,"Final Volume Path",
+			    "Physics","","G4String");
+
+    ID = "FNVPath";
+    (*store)[ID] = G4AttDef(ID,"Final Next Volume Path",
+			    "Physics","","G4String");
+
+    ID = "EPN";
+    (*store)[ID] = G4AttDef(ID,"Ending Process Name",
+			    "Physics","","G4String");
+
+    ID = "EPTN";
+    (*store)[ID] = G4AttDef(ID,"Ending Process Type Name",
 			    "Physics","","G4String");
 
@@ -183,4 +211,16 @@
 }
 
+static G4String Path(const G4TouchableHandle& th)
+{
+  std::ostringstream oss;
+  G4int depth = th->GetHistoryDepth();
+  for (G4int i = depth; i >= 0; --i) {
+    oss << th->GetVolume(i)->GetName()
+	<< ':' << th->GetCopyNumber(i);
+    if (i != 0) oss << '/';
+  }
+  return oss.str();
+}
+
 std::vector<G4AttValue>* G4RichTrajectory::CreateAttValues() const
 {
@@ -188,7 +228,15 @@
   std::vector<G4AttValue>* values = G4Trajectory::CreateAttValues();
 
-  values->push_back(G4AttValue("IVN",fpInitialVolume->GetName(),""));
-
-  values->push_back(G4AttValue("INVN",fpInitialNextVolume->GetName(),""));
+  if (fpInitialVolume && fpInitialVolume->GetVolume()) {
+    values->push_back(G4AttValue("IVPath",Path(fpInitialVolume),""));
+  } else {
+    values->push_back(G4AttValue("IVPath","None",""));
+  }
+
+  if (fpInitialNextVolume && fpInitialNextVolume->GetVolume()) {
+    values->push_back(G4AttValue("INVPath",Path(fpInitialNextVolume),""));
+  } else {
+    values->push_back(G4AttValue("INVPath","None",""));
+  }
 
   if (fpCreatorProcess) {
@@ -201,4 +249,25 @@
   }
 
+  if (fpFinalVolume && fpFinalVolume->GetVolume()) {
+    values->push_back(G4AttValue("FVPath",Path(fpFinalVolume),""));
+  } else {
+    values->push_back(G4AttValue("FVPath","None",""));
+  }
+
+  if (fpFinalNextVolume && fpFinalNextVolume->GetVolume()) {
+    values->push_back(G4AttValue("FNVPath",Path(fpFinalNextVolume),""));
+  } else {
+    values->push_back(G4AttValue("FNVPath","None",""));
+  }
+
+  if (fpEndingProcess) {
+    values->push_back(G4AttValue("EPN",fpEndingProcess->GetProcessName(),""));
+    G4ProcessType type = fpEndingProcess->GetProcessType();
+    values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),""));
+  } else {
+    values->push_back(G4AttValue("EPN","User Defined",""));
+    values->push_back(G4AttValue("EPTN","User",""));
+  }
+
   values->push_back
     (G4AttValue("FKE",G4BestUnit(fFinalKineticEnergy,"Energy"),""));
Index: trunk/source/tracking/src/G4RichTrajectoryPoint.cc
===================================================================
--- trunk/source/tracking/src/G4RichTrajectoryPoint.cc	(revision 1227)
+++ trunk/source/tracking/src/G4RichTrajectoryPoint.cc	(revision 1228)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4RichTrajectoryPoint.cc,v 1.4 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4RichTrajectoryPoint.cc,v 1.5 2009/11/24 10:04:14 perl Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
@@ -61,4 +61,6 @@
 #endif
 
+#include <sstream>
+
 G4Allocator<G4RichTrajectoryPoint> aRichTrajectoryPointAllocator;
 
@@ -79,5 +81,7 @@
   fpProcess(0),
   fPreStepPointGlobalTime(aTrack->GetGlobalTime()),
-  fPostStepPointGlobalTime(aTrack->GetGlobalTime())
+  fPostStepPointGlobalTime(aTrack->GetGlobalTime()),
+  fpPreStepPointVolume(aTrack->GetTouchableHandle()),
+  fpPostStepPointVolume(aTrack->GetNextTouchableHandle())
 {}
 
@@ -97,4 +101,6 @@
   fPreStepPointGlobalTime = preStepPoint->GetGlobalTime();
   fPostStepPointGlobalTime = postStepPoint->GetGlobalTime();
+  fpPreStepPointVolume = preStepPoint->GetTouchableHandle();
+  fpPostStepPointVolume = postStepPoint->GetTouchableHandle();
 
   /*
@@ -183,6 +189,24 @@
     (*store)[ID] = G4AttDef(ID,"Post-step-point global time",
 			    "Physics","G4BestUnit","G4double");
+    ID = "PreVPath";
+    (*store)[ID] = G4AttDef(ID,"Pre-step Volume Path",
+                            "Physics","","G4String");
+    ID = "PostVPath";
+    (*store)[ID] = G4AttDef(ID,"Post-step Volume Path",
+                            "Physics","","G4String");
   }
   return store;
+}
+
+static G4String Path(const G4TouchableHandle& th)
+{
+  std::ostringstream oss;
+  G4int depth = th->GetHistoryDepth();
+  for (G4int i = depth; i >= 0; --i) {
+    oss << th->GetVolume(i)->GetName()
+	<< ':' << th->GetCopyNumber(i);
+    if (i != 0) oss << '/';
+  }
+  return oss.str();
 }
 
@@ -223,4 +247,16 @@
     (G4AttValue("PostT",G4BestUnit(fPostStepPointGlobalTime,"Time"),""));
 
+  if (fpPreStepPointVolume && fpPreStepPointVolume->GetVolume()) {
+    values->push_back(G4AttValue("PreVPath",Path(fpPreStepPointVolume),""));
+  } else {
+    values->push_back(G4AttValue("PreVPath","None",""));
+  }
+
+  if (fpPostStepPointVolume && fpPostStepPointVolume->GetVolume()) {
+    values->push_back(G4AttValue("PostVPath",Path(fpPostStepPointVolume),""));
+  } else {
+    values->push_back(G4AttValue("PostVPath","None",""));
+  }
+
 #ifdef G4ATTDEBUG
   G4cout << G4AttCheck(values,GetAttDefs());
Index: trunk/source/tracking/src/G4SmoothTrajectory.cc
===================================================================
--- trunk/source/tracking/src/G4SmoothTrajectory.cc	(revision 1227)
+++ trunk/source/tracking/src/G4SmoothTrajectory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmoothTrajectory.cc,v 1.19 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc
===================================================================
--- trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc	(revision 1227)
+++ trunk/source/tracking/src/G4SmoothTrajectoryPoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SmoothTrajectoryPoint.cc,v 1.15 2006/06/29 21:16:01 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //
Index: trunk/source/tracking/src/G4SteppingManager.cc
===================================================================
--- trunk/source/tracking/src/G4SteppingManager.cc	(revision 1227)
+++ trunk/source/tracking/src/G4SteppingManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SteppingManager.cc,v 1.50 2009/02/27 08:09:50 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4SteppingManager2.cc
===================================================================
--- trunk/source/tracking/src/G4SteppingManager2.cc	(revision 1227)
+++ trunk/source/tracking/src/G4SteppingManager2.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SteppingManager2.cc,v 1.37 2009/09/25 00:23:41 gum Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4SteppingVerbose.cc
===================================================================
--- trunk/source/tracking/src/G4SteppingVerbose.cc	(revision 1227)
+++ trunk/source/tracking/src/G4SteppingVerbose.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4SteppingVerbose.cc,v 1.23 2006/07/14 14:13:57 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4TrackingManager.cc
===================================================================
--- trunk/source/tracking/src/G4TrackingManager.cc	(revision 1227)
+++ trunk/source/tracking/src/G4TrackingManager.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackingManager.cc,v 1.22 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4TrackingMessenger.cc
===================================================================
--- trunk/source/tracking/src/G4TrackingMessenger.cc	(revision 1227)
+++ trunk/source/tracking/src/G4TrackingMessenger.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrackingMessenger.cc,v 1.15 2006/11/03 11:13:38 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4Trajectory.cc
===================================================================
--- trunk/source/tracking/src/G4Trajectory.cc	(revision 1227)
+++ trunk/source/tracking/src/G4Trajectory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Trajectory.cc,v 1.33 2009/11/12 09:09:56 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/tracking/src/G4TrajectoryPoint.cc
===================================================================
--- trunk/source/tracking/src/G4TrajectoryPoint.cc	(revision 1227)
+++ trunk/source/tracking/src/G4TrajectoryPoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4TrajectoryPoint.cc,v 1.19 2006/06/29 21:16:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/tracking/src/G4UserSteppingAction.cc
===================================================================
--- trunk/source/tracking/src/G4UserSteppingAction.cc	(revision 1227)
+++ trunk/source/tracking/src/G4UserSteppingAction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserSteppingAction.cc,v 1.10 2006/06/29 21:16:17 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/tracking/src/G4UserTrackingAction.cc
===================================================================
--- trunk/source/tracking/src/G4UserTrackingAction.cc	(revision 1227)
+++ trunk/source/tracking/src/G4UserTrackingAction.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4UserTrackingAction.cc,v 1.10 2006/06/29 21:16:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/tracking/src/G4VSteppingVerbose.cc
===================================================================
--- trunk/source/tracking/src/G4VSteppingVerbose.cc	(revision 1227)
+++ trunk/source/tracking/src/G4VSteppingVerbose.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VSteppingVerbose.cc,v 1.18 2006/11/14 10:58:47 tsasaki Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/tracking/src/G4VTrajectory.cc
===================================================================
--- trunk/source/tracking/src/G4VTrajectory.cc	(revision 1227)
+++ trunk/source/tracking/src/G4VTrajectory.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // ---------------------------------------------------------------
Index: trunk/source/tracking/src/G4VTrajectoryPoint.cc
===================================================================
--- trunk/source/tracking/src/G4VTrajectoryPoint.cc	(revision 1227)
+++ trunk/source/tracking/src/G4VTrajectoryPoint.cc	(revision 1228)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VTrajectoryPoint.cc,v 1.4 2006/06/29 21:16:26 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //---------------------------------------------------------------
Index: trunk/source/visualization/GNUmakefile
===================================================================
--- trunk/source/visualization/GNUmakefile	(revision 1227)
+++ trunk/source/visualization/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.24 2009/10/12 10:28:38 akimura Exp $
+# $Id: GNUmakefile,v 1.26 2009/11/17 11:31:20 gcosmo Exp $
 # -----------------------------------------------------------------------
 # GNUmakefile for visualization and modeling.  John Allison, 5/7/95.
@@ -30,6 +30,6 @@
 # CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
 
-# Libraries which can be used without external packages or libraries...
 ifdef G4VIS_BUILD
+# Drivers that can be used without external libraries...
   SUBDIRS += management
   SUBLIBS += G4vis_management
@@ -48,9 +48,10 @@
   SUBDIRS += gMocren
   SUBLIBS += G4GMocren
-
+# Drivers needing external libraries...
 ifdef G4VIS_BUILD_OPENGL_DRIVER
   SUBDIRS += externals/gl2ps
   SUBDIRS += OpenGL
   SUBLIBS += G4OpenGL
+  SUBLIBS += G4gl2ps
 endif
 ifdef G4VIS_BUILD_OI_DRIVER
@@ -58,4 +59,5 @@
   SUBDIRS += OpenInventor
   SUBLIBS += G4OpenInventor
+  SUBLIBS += G4gl2ps
 endif
 endif #G4VIS_BUILD
Index: trunk/source/visualization/HepRep/History
===================================================================
--- trunk/source/visualization/HepRep/History	(revision 1227)
+++ trunk/source/visualization/HepRep/History	(revision 1228)
@@ -1,3 +1,3 @@
-.$Id: History,v 1.131 2009/10/21 15:13:36 allison Exp $
+.$Id: History,v 1.132 2009/11/23 05:42:28 perl Exp $
 -------------------------------------------------------------------
 
@@ -20,4 +20,9 @@
 History file for visualization/HepRep sub-category
 --------------------------------------------------
+
+22nd November 2009  Joseph Perl  (vis-HepRep-V09-02-03)
+- Changed messenger to a singleton.
+- Added messenger commands to HepRepFile.
+- Render G4Tubs as polygons if G4Tubs is not at a standard angle.
 
 21st October 2009  John Allison  (vis-HepRep-V09-02-02 coworks greps-V09-02-02)
Index: trunk/source/visualization/HepRep/include/G4HepRep.hh
===================================================================
--- trunk/source/visualization/HepRep/include/G4HepRep.hh	(revision 1227)
+++ trunk/source/visualization/HepRep/include/G4HepRep.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRep.hh,v 1.17 2006/06/29 21:17:04 gunter Exp $
+// $Id: G4HepRep.hh,v 1.18 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36,6 +36,4 @@
 //G4
 #include "G4VGraphicsSystem.hh"
-
-class G4HepRepMessenger;
 
 class G4HepRep: public G4VGraphicsSystem {
@@ -52,5 +50,4 @@
         G4VSceneHandler* sceneHandler;
         G4VViewer* viewer;
-        G4HepRepMessenger* messenger;        
 };
 
Index: trunk/source/visualization/HepRep/include/G4HepRepMessenger.hh
===================================================================
--- trunk/source/visualization/HepRep/include/G4HepRepMessenger.hh	(revision 1227)
+++ trunk/source/visualization/HepRep/include/G4HepRepMessenger.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepMessenger.hh,v 1.7 2006/06/29 21:17:14 gunter Exp $
+// $Id: G4HepRepMessenger.hh,v 1.8 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -40,5 +40,5 @@
     
     public:
-        G4HepRepMessenger();
+		static G4HepRepMessenger* GetInstance();  // Singleton constructor.
         virtual ~G4HepRepMessenger();
 
@@ -46,4 +46,11 @@
         virtual void SetNewValue(G4UIcommand * command, G4String newValue);
         
+	// Used by HepRepFile
+        virtual G4String getFileDir();
+        virtual G4String getFileName();
+        virtual G4bool getOverwrite();
+        virtual G4bool getCullInvisibles();
+	
+	// Used by HepRepXML
         virtual G4String getEventNumberSuffix();
         virtual G4bool appendGeometry();
@@ -53,5 +60,20 @@
 
     private:            
+		G4HepRepMessenger();  // Private constructor.
+		static G4HepRepMessenger* fpInstance;
+        
         G4UIdirectory* heprepDirectory;
+        
+		G4String fileDir;
+		G4UIcmdWithAString* setFileDirCommand;
+        
+		G4String fileName;
+		G4UIcmdWithAString* setFileNameCommand;
+        
+		G4bool overwrite;
+		G4UIcmdWithABool* setOverwriteCommand;
+        
+		G4bool cullInvisibles;
+		G4UIcmdWithABool* setCullInvisiblesCommand;
         
         G4String suffix;
@@ -66,5 +88,5 @@
         G4bool solids;
         G4UIcmdWithABool* useSolidsCommand;
-
+        
         G4bool invisibles;
         G4UIcmdWithABool* writeInvisiblesCommand;
Index: trunk/source/visualization/HepRep/include/G4HepRepSceneHandler.hh
===================================================================
--- trunk/source/visualization/HepRep/include/G4HepRepSceneHandler.hh	(revision 1227)
+++ trunk/source/visualization/HepRep/include/G4HepRepSceneHandler.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepSceneHandler.hh,v 1.43 2009/10/21 15:08:35 allison Exp $
+// $Id: G4HepRepSceneHandler.hh,v 1.44 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -63,10 +63,8 @@
 #include "G4PhysicalVolumeModel.hh"
 
-#include "G4HepRepMessenger.hh"
-
 class G4HepRepSceneHandler: public G4VSceneHandler {
 
     public:
-        G4HepRepSceneHandler (G4VGraphicsSystem& system, G4HepRepMessenger& messenger, const G4String& name = "");
+        G4HepRepSceneHandler (G4VGraphicsSystem& system, const G4String& name = "");
         virtual ~G4HepRepSceneHandler ();
 
@@ -187,5 +185,4 @@
 
         // initialized Member Variables
-        G4HepRepMessenger& messenger;
         G4String geometryLayer, eventLayer, calHitLayer;
         G4String trajectoryLayer, hitLayer;
Index: trunk/source/visualization/HepRep/include/G4HepRepViewer.hh
===================================================================
--- trunk/source/visualization/HepRep/include/G4HepRepViewer.hh	(revision 1227)
+++ trunk/source/visualization/HepRep/include/G4HepRepViewer.hh	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepViewer.hh,v 1.18 2006/06/29 21:17:18 gunter Exp $
+// $Id: G4HepRepViewer.hh,v 1.19 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -41,9 +41,7 @@
 #include "G4VViewer.hh"
 
-#include "G4HepRepMessenger.hh"
-
 class G4HepRepViewer: public G4VViewer {
     public:
-        G4HepRepViewer (G4VSceneHandler& scene, G4HepRepMessenger& messenger, const G4String& name = "");
+        G4HepRepViewer (G4VSceneHandler& scene, const G4String& name = "");
         virtual ~G4HepRepViewer ();
         void SetView ();
@@ -57,5 +55,4 @@
     private:
         bool geometryIncluded;
-        G4HepRepMessenger& messenger;
 };
 
Index: trunk/source/visualization/HepRep/src/G4HepRep.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRep.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRep.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRep.cc,v 1.22 2006/06/29 21:17:20 gunter Exp $
+// $Id: G4HepRep.cc,v 1.23 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -54,9 +54,8 @@
           sceneHandler(NULL),
           viewer(NULL) {
-    messenger = new G4HepRepMessenger();
+		G4HepRepMessenger::GetInstance();
 }
 
 G4HepRep::~G4HepRep () {
-    delete messenger;
 }
 
@@ -66,5 +65,5 @@
         return NULL;
     }
-    sceneHandler = new G4HepRepSceneHandler (*this, *messenger, name);
+    sceneHandler = new G4HepRepSceneHandler (*this, name);
     return sceneHandler;
 }
@@ -75,5 +74,5 @@
         return NULL;
     }
-    viewer  = new G4HepRepViewer ((G4HepRepSceneHandler&)scene, *messenger, name);
+    viewer  = new G4HepRepViewer ((G4HepRepSceneHandler&)scene, name);
     return viewer;
 }
Index: trunk/source/visualization/HepRep/src/G4HepRepFile.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRepFile.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRepFile.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepFile.cc,v 1.11 2007/05/22 17:05:26 allison Exp $
+// $Id: G4HepRepFile.cc,v 1.12 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -38,4 +38,5 @@
 #include "G4HepRepFileSceneHandler.hh"
 #include "G4HepRepFileViewer.hh"
+#include "G4HepRepMessenger.hh"
 
 static G4HepRepFileXMLWriter* hepRepXMLWriter;
@@ -46,4 +47,5 @@
 		    "A HepRep (format 1) ascii file driver",
 		    G4VGraphicsSystem::threeD) {
+		G4HepRepMessenger::GetInstance();
         hepRepXMLWriter = new G4HepRepFileXMLWriter();
 }
Index: trunk/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepFileSceneHandler.cc,v 1.66 2008/01/04 22:11:31 allison Exp $
+// $Id: G4HepRepFileSceneHandler.cc,v 1.68 2009/12/16 17:51:21 gunter Exp $
 // GEANT4 tag $Name:  $
 //
@@ -34,4 +34,6 @@
 #include "G4HepRepFileSceneHandler.hh"
 #include "G4HepRepFile.hh"
+#include "G4HepRepMessenger.hh"
+#include "G4UIcommand.hh"
 
 #include "G4Version.hh"
@@ -71,25 +73,4 @@
 	hepRepXMLWriter = ((G4HepRepFile*)(&system))->GetHepRepXMLWriter();
 	fileCounter = 0;
-	int length;
-	
-	if (getenv("G4HEPREPFILE_DIR") == NULL)
-		strcpy(fileDir, "");
-	else
-		length = sprintf (fileDir, "%s%s", getenv("G4HEPREPFILE_DIR"),"/");
-	
-	if (getenv("G4HEPREPFILE_NAME") == NULL)
-		strcpy(fileName, "G4Data");
-	else
-		strcpy(fileName, getenv("G4HEPREPFILE_NAME"));
-	
-	if (getenv("G4HEPREPFILE_OVERWRITE") == NULL)
-		fileOverwrite = false;
-	else
-		fileOverwrite = strcmp(getenv("G4HEPREPFILE_OVERWRITE"),"0");
-	
-	if (getenv("G4HEPREPFILE_CULL") == NULL)
-		cullInvisibleObjects = false;
-	else
-		cullInvisibleObjects = strcmp(getenv("G4HEPREPFILE_CULL"),"0");
 	
 	inPrimitives2D = false;
@@ -180,5 +161,7 @@
 	AddHepRepInstance("Prism", NULL);
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -243,5 +226,7 @@
 		AddHepRepInstance("Cylinder", NULL);
 		
-		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+		
+		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 			return;
 		
@@ -278,8 +263,21 @@
 #endif
 	
+	// HepRApp does not correctly represent the end faces of cylinders at
+	// non-standard angles, let the base class convert these solids to polygons.	
+	CLHEP::HepRotation r = fpObjectTransformation->getRotation();	
+	G4bool linedUpWithAnAxis = (std::fabs(r.phiX())<=.001 ||  
+								std::fabs(r.phiY())<=.001 || 
+								std::fabs(r.phiZ())<=.001 ||
+								std::fabs(r.phiX()-pi)<=.001 ||
+								std::fabs(r.phiY()-pi)<=.001 ||
+								std::fabs(r.phiZ()-pi)<=.001);	
+	//G4cout << "Angle X:" << r.phiX() << ", Angle Y:" << r.phiY() << ", Angle Z:" << r.phiZ() << G4endl;
+	//G4cout << "linedUpWithAnAxis:" << linedUpWithAnAxis << G4endl;
+	
 	// HepRep does not have a primitive for a cut cylinder,
 	// so if this cylinder is cut, let the base class convert this
 	// solid to polygons.
-	if (tubs.GetDeltaPhiAngle() < twopi) {
+	if (tubs.GetDeltaPhiAngle() < twopi || !linedUpWithAnAxis)
+	{
 		G4VSceneHandler::AddSolid(tubs);  // Invoke default action.
 	} else {
@@ -294,5 +292,7 @@
 		AddHepRepInstance("Cylinder", NULL);
 		
-		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+		
+		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 			return;
 		
@@ -340,5 +340,7 @@
 	AddHepRepInstance("Prism", NULL);
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1004,5 +1006,7 @@
 #endif
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1042,5 +1046,7 @@
 #endif
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1144,5 +1150,7 @@
 #endif
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1188,5 +1196,7 @@
 #endif
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1231,5 +1241,7 @@
 #endif
 	
-	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+	
+	if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 		return;
 	
@@ -1430,5 +1442,7 @@
 		hepRepXMLWriter->addInstance();
 		
-		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && cullInvisibleObjects)
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+		
+		if (fpVisAttribs && (fpVisAttribs->IsVisible()==0) && messenger->getCullInvisibles())
 			return;
 		
@@ -1512,16 +1526,20 @@
 	
 	if (!hepRepXMLWriter->isOpen) {
-		char* newFileSpec;
-		newFileSpec = new char [256];
-		int length;
-		
-		if (fileOverwrite)
-			length = sprintf (newFileSpec, "%s%s%s",fileDir,fileName,".heprep");
-		else
-			length = sprintf (newFileSpec, "%s%s%d%s",fileDir,fileName,fileCounter,".heprep");
+		G4String newFileSpec;
+
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+		
+		if (messenger->getOverwrite()) {
+			newFileSpec = messenger->getFileDir()+messenger->getFileName()+".heprep";
+		} else {
+			newFileSpec = messenger->getFileDir()+messenger->getFileName()+G4UIcommand::ConvertToString(fileCounter)+".heprep";
+		}
+		
 		G4cout << "HepRepFile writing to " << newFileSpec << G4endl;
 		
 		hepRepXMLWriter->open(newFileSpec);
-		fileCounter++;
+		
+		if (!messenger->getOverwrite())
+			fileCounter++;
 		
 		hepRepXMLWriter->addAttDef("Generator", "HepRep Data Generator", "Physics","");
Index: trunk/source/visualization/HepRep/src/G4HepRepMessenger.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRepMessenger.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRepMessenger.cc	(revision 1228)
@@ -24,10 +24,24 @@
 // ********************************************************************
 //
-// $Id: G4HepRepMessenger.cc,v 1.10 2006/06/29 21:17:30 gunter Exp $
+// $Id: G4HepRepMessenger.cc,v 1.11 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
 #include "G4HepRepMessenger.hh"
 
+G4HepRepMessenger*
+G4HepRepMessenger::fpInstance = 0;
+
+G4HepRepMessenger*
+G4HepRepMessenger::GetInstance()
+{
+	if (!fpInstance) fpInstance = new G4HepRepMessenger;
+	return fpInstance;
+}
+
 G4HepRepMessenger::G4HepRepMessenger() :
+    fileDir(""),
+	fileName("G4Data"),
+	overwrite(false),
+	cullInvisibles(false),
     suffix (""),
     geometry(true),
@@ -37,8 +51,58 @@
     heprepDirectory = new G4UIdirectory("/vis/heprep/");
     heprepDirectory->SetGuidance("HepRep commands.");
-
+		
+	setFileDirCommand = new G4UIcmdWithAString("/vis/heprep/setFileDir", this);
+	setFileDirCommand->SetGuidance("Set directory for output.");
+	setFileDirCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
+	setFileDirCommand->SetParameterName("directory",false);
+	if ( getenv( "G4HEPREPFILE_DIR" ) == NULL ) {
+		setFileDirCommand->SetDefaultValue("");
+	} else {
+		setFileDirCommand->SetDefaultValue(getenv("G4HEPREPFILE_DIR"));
+		fileDir = getenv("G4HEPREPFILE_DIR");
+	}
+	setFileDirCommand->AvailableForStates(G4State_Idle);
+		
+	setFileNameCommand = new G4UIcmdWithAString("/vis/heprep/setFileName", this);
+	setFileNameCommand->SetGuidance("Set file name for output.");
+	setFileNameCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
+	setFileNameCommand->SetParameterName("directory",false);
+	if ( getenv( "G4HEPREPFILE_NAME" ) == NULL ) {
+		setFileNameCommand->SetDefaultValue("G4Data");
+	} else {
+		setFileNameCommand->SetDefaultValue(getenv("G4HEPREPFILE_NAME"));
+		fileName = getenv("G4HEPREPFILE_NAME");
+	}
+	setFileNameCommand->AvailableForStates(G4State_Idle);
+
+	setOverwriteCommand = new G4UIcmdWithABool("/vis/heprep/setOverwrite", this);
+	setOverwriteCommand->SetGuidance("Set true to write all output to exact same file name.");
+	setOverwriteCommand->SetGuidance("Set false to increment the file name for each new output.");
+	setOverwriteCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
+	setOverwriteCommand->SetParameterName("flag",false);
+	if ( getenv( "G4HEPREPFILE_OVERWRITE" ) == NULL ) {
+		setOverwriteCommand->SetDefaultValue(false);
+	} else {
+		setOverwriteCommand->SetDefaultValue(getenv("G4HEPREPFILE_OVERWRITE"));
+		overwrite = setOverwriteCommand->ConvertToBool(getenv("G4HEPREPFILE_OVERWRITE"));
+	}
+	setOverwriteCommand->AvailableForStates(G4State_Idle);
+		
+	setCullInvisiblesCommand = new G4UIcmdWithABool("/vis/heprep/setCullInvisibles", this);
+	setCullInvisiblesCommand->SetGuidance("Remove invisible objects from output file.");
+	setCullInvisiblesCommand->SetGuidance("This command is used by HepRepFile, not by HepRepXML.");
+	setCullInvisiblesCommand->SetParameterName("flag",false);
+	if ( getenv( "G4HEPREPFILE_CULL" ) == NULL ) {
+		setCullInvisiblesCommand->SetDefaultValue(false);
+	} else {
+		setCullInvisiblesCommand->SetDefaultValue(getenv("G4HEPREPFILE_CULL"));
+		cullInvisibles = setCullInvisiblesCommand->ConvertToBool(getenv("G4HEPREPFILE_CULL"));
+	}
+	setCullInvisiblesCommand->AvailableForStates(G4State_Idle);
+		
     setEventNumberSuffixCommand = new G4UIcmdWithAString("/vis/heprep/setEventNumberSuffix", this);
     setEventNumberSuffixCommand->SetGuidance("Write separate event files, appended with given suffix.");
     setEventNumberSuffixCommand->SetGuidance("Define the suffix with a pattern such as '-0000'.");
+	setEventNumberSuffixCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile.");
     setEventNumberSuffixCommand->SetParameterName("suffix",false);
     setEventNumberSuffixCommand->SetDefaultValue("");
@@ -47,4 +111,5 @@
     appendGeometryCommand = new G4UIcmdWithABool("/vis/heprep/appendGeometry", this);
     appendGeometryCommand->SetGuidance("Appends copy of geometry to every event.");
+	appendGeometryCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile.");
     appendGeometryCommand->SetParameterName("flag",false);
     appendGeometryCommand->SetDefaultValue(true);
@@ -53,4 +118,5 @@
     addPointAttributesCommand = new G4UIcmdWithABool("/vis/heprep/addPointAttributes", this);
     addPointAttributesCommand->SetGuidance("Adds point attributes to the points of trajectories.");
+	addPointAttributesCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile.");
     addPointAttributesCommand->SetParameterName("flag",false);
     addPointAttributesCommand->SetDefaultValue(false);
@@ -59,29 +125,33 @@
     useSolidsCommand = new G4UIcmdWithABool("/vis/heprep/useSolids", this);
     useSolidsCommand->SetGuidance("Use HepRep Solids, rather than Geant4 Primitives.");
+	useSolidsCommand->SetGuidance("This command is used by HepRepXML, not by HepRepFile.");
     useSolidsCommand->SetParameterName("flag",false);
     useSolidsCommand->SetDefaultValue(true);
     useSolidsCommand->AvailableForStates(G4State_Idle);
-
-/* Not Enabled Yet
-    writeInvisiblesCommand = new G4UIcmdWithABool("/vis/heprep/writeInvisibles", this);
-    writeInvisiblesCommand->SetGuidance("Write invisible objects.");
-    writeInvisiblesCommand->SetParameterName("flag",false);
-    writeInvisiblesCommand->SetDefaultValue(true);
-    writeInvisiblesCommand->AvailableForStates(G4State_Idle);
-*/
 }
 
 G4HepRepMessenger::~G4HepRepMessenger() {
+	delete setFileDirCommand;
+	delete setFileNameCommand;
+	delete setOverwriteCommand;
+	delete setCullInvisiblesCommand;
     delete setEventNumberSuffixCommand;
     delete appendGeometryCommand;
     delete addPointAttributesCommand;
     delete useSolidsCommand;
-//    delete writeInvisiblesCommand;
     delete heprepDirectory;
 }
 
 G4String G4HepRepMessenger::GetCurrentValue(G4UIcommand * command) {
-    if (command==setEventNumberSuffixCommand) {
-        return suffix;
+    if (command==setFileDirCommand) {
+        return fileDir;
+    } else if (command==setFileNameCommand) {
+        return fileName; 
+    } else if (command==setOverwriteCommand) {
+        return overwrite; 
+    } else if (command==setCullInvisiblesCommand) {
+        return cullInvisibles; 
+    } else if (command==setEventNumberSuffixCommand) {
+        return suffix; 
     } else if (command==appendGeometryCommand) {
         return appendGeometryCommand->ConvertToString(geometry); 
@@ -90,6 +160,4 @@
     } else if (command==useSolidsCommand) {
         return useSolidsCommand->ConvertToString(solids);
-//    } else if (command==writeInvisiblesCommand) {
-//        return writeInvisiblesCommand->ConvertToString(invisibles);
     } else {
         return "";
@@ -98,5 +166,13 @@
 
 void G4HepRepMessenger::SetNewValue(G4UIcommand * command, G4String newValue) {
-    if (command==setEventNumberSuffixCommand) {
+    if (command==setFileDirCommand) {
+        fileDir = newValue;
+    } else if (command==setFileNameCommand) {
+        fileName = newValue;
+    } else if (command==setOverwriteCommand) {
+        overwrite = setOverwriteCommand->GetNewBoolValue(newValue);
+    } else if (command==setCullInvisiblesCommand) {
+		cullInvisibles = setCullInvisiblesCommand->GetNewBoolValue(newValue);
+    } else if (command==setEventNumberSuffixCommand) {
         suffix = newValue;
     } else if (command==appendGeometryCommand) {
@@ -106,7 +182,21 @@
     } else if (command==useSolidsCommand) {
         solids = useSolidsCommand->GetNewBoolValue(newValue);
-//    } else if (command==writeInvisiblesCommand) {
-//        invisibles = writeInvisiblesCommand->GetNewBoolValue(newValue);
     } 
+}
+
+G4String G4HepRepMessenger::getFileDir() {
+    return fileDir;
+}
+
+G4String G4HepRepMessenger::getFileName() {
+    return fileName;
+}
+
+G4bool G4HepRepMessenger::getOverwrite() {
+    return overwrite;
+}
+
+G4bool G4HepRepMessenger::getCullInvisibles() {
+    return cullInvisibles;
 }
 
Index: trunk/source/visualization/HepRep/src/G4HepRepSceneHandler.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRepSceneHandler.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRepSceneHandler.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepSceneHandler.cc,v 1.101 2007/11/16 20:29:04 perl Exp $
+// $Id: G4HepRepSceneHandler.cc,v 1.102 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -45,4 +45,5 @@
 //HepRep
 #include "HEPREP/HepRep.h"
+#include "G4HepRepMessenger.hh"
 
 //G4
@@ -90,7 +91,6 @@
 //#define PDEBUG 1
 
-G4HepRepSceneHandler::G4HepRepSceneHandler (G4VGraphicsSystem& system, G4HepRepMessenger& heprepMessenger, const G4String& name)
+G4HepRepSceneHandler::G4HepRepSceneHandler (G4VGraphicsSystem& system, const G4String& name)
         : G4VSceneHandler (system, sceneIdCount++, name),
-          messenger             (heprepMessenger),
           geometryLayer         ("Geometry"),
           eventLayer            ("Event"),
@@ -247,5 +247,8 @@
             writeMultipleFiles = false;
             int startDigit = -1; int endDigit = -1;
-            string suffix = messenger.getEventNumberSuffix();
+
+			G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+
+            string suffix = messenger->getEventNumberSuffix();
             if (suffix != "") {
                 // look for 0000 pattern in suffix
@@ -331,4 +334,6 @@
         }
     } else {
+		
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
 
         // add geometry to the heprep if there is an event (separate geometries are written
@@ -338,5 +343,6 @@
         
             // couple geometry
-            if (messenger.appendGeometry()) {
+
+            if ( messenger->appendGeometry()) {
                 // couple geometry to event if geometry was written
                 if ((_geometryInstanceTree != NULL)) {
@@ -374,5 +380,5 @@
 
         // write out separate geometry
-        if (!messenger.appendGeometry() && (_heprepGeometry != NULL)) {
+        if (! messenger->appendGeometry() && (_heprepGeometry != NULL)) {
             if (writeMultipleFiles) {
                 char fileName[128];
@@ -493,6 +499,8 @@
 
     if (dontWrite()) return;
-
-    if (!messenger.useSolids()) {
+	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+
+    if (! messenger->useSolids()) {
         G4VSceneHandler::AddSolid(box);
         return;
@@ -547,6 +555,8 @@
 
     if (dontWrite()) return;
-
-    if (!messenger.useSolids() || (cons.GetDeltaPhiAngle() < twopi)) {
+	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+
+    if (! messenger->useSolids() || (cons.GetDeltaPhiAngle() < twopi)) {
         G4VSceneHandler::AddSolid(cons);
         return;
@@ -609,6 +619,8 @@
 
     if (dontWrite()) return;
-
-    if (!messenger.useSolids() || (tubs.GetDeltaPhiAngle() < twopi)) {
+	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+
+    if (! messenger->useSolids() || (tubs.GetDeltaPhiAngle() < twopi)) {
         G4VSceneHandler::AddSolid(tubs);
         return;
@@ -666,6 +678,8 @@
 #endif
     if (dontWrite()) return;
-
-    if (!messenger.useSolids()) {
+	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+
+    if (! messenger->useSolids()) {
         G4VSceneHandler::AddSolid(trd);
         return;
@@ -994,6 +1008,7 @@
 
 
-G4bool G4HepRepSceneHandler::dontWrite() {
-    return !(messenger.writeInvisibles() || (fpVisAttribs ? (bool)fpVisAttribs->IsVisible() : true));
+G4bool G4HepRepSceneHandler::dontWrite() {	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+    return !( messenger->writeInvisibles() || (fpVisAttribs ? (bool)fpVisAttribs->IsVisible() : true));
 }
 
@@ -1367,10 +1382,12 @@
     type->addAttDef(  "PointUnit", "Length", "Physics", "");
     type->addAttValue("PointUnit", G4String("m"));
+	
+	G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
 
     type->addAttDef(  "UseSolids", "Use HepRep Solids rather than Geant4 Primitives", "Draw", "");
-    type->addAttValue("UseSolids", messenger.useSolids());
+    type->addAttValue("UseSolids", messenger->useSolids());
 
     type->addAttDef(  "WriteInvisibles", "Write Invisible Objects", "Draw", "");
-    type->addAttValue("WriteInvisibles", messenger.writeInvisibles());
+    type->addAttValue("WriteInvisibles", messenger->writeInvisibles());
 }           
 
@@ -1409,5 +1426,7 @@
         // Create the Geometry InstanceTree.
         _geometryInstanceTree = factory->createHepRepInstanceTree("G4GeometryData", "1.0", getGeometryTypeTree());
-        if (messenger.appendGeometry()) {
+		
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+        if ( messenger->appendGeometry()) {
             getHepRep()->addInstanceTree(_geometryInstanceTree);
         } else {
@@ -1476,5 +1495,7 @@
         HepRepTreeID* geometryTreeID = factory->createHepRepTreeID("G4GeometryTypes", "1.0");
         _geometryTypeTree = factory->createHepRepTypeTree(geometryTreeID);
-        if (messenger.appendGeometry()) {
+		
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+        if ( messenger->appendGeometry()) {
             getHepRep()->addTypeTree(_geometryTypeTree);
         } else {
Index: trunk/source/visualization/HepRep/src/G4HepRepViewer.cc
===================================================================
--- trunk/source/visualization/HepRep/src/G4HepRepViewer.cc	(revision 1227)
+++ trunk/source/visualization/HepRep/src/G4HepRepViewer.cc	(revision 1228)
@@ -24,5 +24,5 @@
 // ********************************************************************
 //
-// $Id: G4HepRepViewer.cc,v 1.26 2006/06/29 21:17:34 gunter Exp $
+// $Id: G4HepRepViewer.cc,v 1.27 2009/11/23 05:42:28 perl Exp $
 // GEANT4 tag $Name:  $
 //
@@ -40,4 +40,5 @@
 #include "G4Scene.hh"
 #include "G4HepRep.hh"
+#include "G4HepRepMessenger.hh"
 #include "G4HepRepSceneHandler.hh"
 //This
@@ -47,8 +48,7 @@
 using namespace std;
 
-G4HepRepViewer::G4HepRepViewer (G4VSceneHandler& sceneHandler, G4HepRepMessenger& heprepMessenger, const G4String& name)
+G4HepRepViewer::G4HepRepViewer (G4VSceneHandler& sceneHandler, const G4String& name)
         : G4VViewer (sceneHandler, sceneHandler.IncrementViewCount(), name),
-        geometryIncluded(false),
-        messenger(heprepMessenger) {
+        geometryIncluded(false) {
 
 #ifdef SDEBUG
@@ -111,5 +111,7 @@
     if (sceneHandler->closeHepRep()) {
         sceneHandler->openHepRep();
-        if (messenger.appendGeometry()) geometryIncluded = false;
+		
+		G4HepRepMessenger* messenger = G4HepRepMessenger::GetInstance();
+        if (messenger->appendGeometry()) geometryIncluded = false;
     }
 }
Index: trunk/source/visualization/History
===================================================================
--- trunk/source/visualization/History	(revision 1227)
+++ trunk/source/visualization/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.456 2009/11/17 14:37:06 lgarnier Exp $
+$Id: History,v 1.460 2009/11/23 05:56:37 perl Exp $
 -------------------------------------------------------------------
 
@@ -25,10 +25,41 @@
 ---------------------------------------
 
+22nd November 2009  Joseph Perl (vis-V09-02-12)
+- vis-HepRep-V09-02-03
+  o Changed messenger to a singleton.
+  o Added messenger commands to HepRepFile.
+  o Render G4Tubs as polygons if G4Tubs is not at a standard angle.
+
+22nd November 2009  John Allison
+- visman-V09-02-08: /vis/scene/add/trajectories rich:
+  o Added G4RichTrajectoryPoint().GetAttDefs() to informational.
+
+18th November 2009  Gabriele Cosmo
+- visexternal-V09-02-06:
+  o Added GLOBLIBS dependencies.
+  o Re-instated fix to gl2ps.cc (always #define GL2PS_HAVE_ZLIB).
+
+17th November 2009  John Allison  (vis-V09-02-11)
+- visman-V09-02-07:
+  o Many small bug fixes.
+  o Enhanced functionality for gMocren driver:
+    . Introduced the concept of end-of-run model.
+- opengl-V09-02-10: Fixes build problem with gl2ps on Windows.
+- openinventor-V09-02-03: Fixes build problem with gl2ps on Windows.
+- Tagged for vis tag.
+- visexternal-V09-02-05:
+  o gl2ps: Added dependency on zlib if G4LIB_BUILD_ZLIB is set.
+
 17th November 2009  Laurent Garnier
-- Fix SceneHandler removing viewer if class destructor call 
-  before G4VSceneHandler calls it
+- Allow arbitrary viewer deletion (fixes crash)
+
+17th November 2009  Gabriele Cosmo
+- GNUmakefile: Added SUBLIBS += G4gl2ps for OPENGL and OI.
+
+15th November 2009  John Allison
+- raytracer-V09-02-02: Formal tag to record fixing of bugzilla Problem 1072.
 
 6th November 2009  John Allison
- - vistest-V09-02-01: test19.cc: Use G4UIExecutive.
+- vistest-V09-02-01: test19.cc: Use G4UIExecutive.
 
 3rd November 2009  John Allison  (vis-V09-02-10, greps-V09-02-03, digits_hits-V09-02-02)
Index: trunk/source/visualization/OpenGL/GNUmakefile
===================================================================
--- trunk/source/visualization/OpenGL/GNUmakefile	(revision 1227)
+++ trunk/source/visualization/OpenGL/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.10 2009/03/05 11:17:42 lgarnier Exp $
+# $Id: GNUmakefile,v 1.12 2010/01/06 15:05:29 lgarnier Exp $
 
 name := G4OpenGL
@@ -39,6 +39,4 @@
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 
-#INTYLIBS += -L$(G4LIBDIR)
-
 include $(G4INSTALL)/config/moc.gmk
 include $(G4INSTALL)/config/common.gmk
Index: trunk/source/visualization/OpenGL/History
===================================================================
--- trunk/source/visualization/OpenGL/History	(revision 1227)
+++ trunk/source/visualization/OpenGL/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.160 2009/11/17 11:52:51 gcosmo Exp $
+$Id: History,v 1.162 2010/01/06 15:05:29 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,11 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+6th January 2010  Laurent Garnier (needs interfaces-V09-02-07 + laurent-QtUI_with_tabs_v1)
+- GNUMakefile : Add include for interfaces/basic
+- G4OpenGLQtWiewer : Integration into QtUI Tab
+
+17th November 2009  John Allison  (opengl-V09-02-10)
+- Tagged for vis tag.
 
 17th November 2009  Gabriele Cosmo
Index: trunk/source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh
===================================================================
--- trunk/source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh	(revision 1227)
+++ trunk/source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh	(revision 1228)
@@ -56,5 +56,5 @@
   void initializeGL ();
   void DrawView ();
-  void FinishView ();
+  //  void FinishView ();
   void resizeGL(int width,int height);
   void paintGL();
@@ -70,4 +70,5 @@
   void contextMenuEvent(QContextMenuEvent *e);
   void keyPressEvent (QKeyEvent * event); 
+  void paintEvent(QPaintEvent *event);
 private:
   void ComputeView ();
Index: trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh
===================================================================
--- trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh	(revision 1227)
+++ trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.20 2009/10/21 08:14:44 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.21 2010/01/06 15:05:29 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
Index: trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
===================================================================
--- trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc	(revision 1227)
+++ trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc	(revision 1228)
@@ -107,4 +107,5 @@
 
   updateQWidget();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -150,16 +151,4 @@
 #endif
   fHasToRepaint = true;
-}
-
-void G4OpenGLImmediateQtViewer::FinishView()
-{
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::FinishView() BEGIN\n");
-#endif
-  glFlush ();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::FinishView() END\n");
-#endif
-
 }
 
@@ -172,6 +161,12 @@
 ,int aHeight)
 {  
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVV\n");
+#endif
   ResizeWindow(aWidth,aHeight);
   fHasToRepaint = sizeHasChanged();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL ^^^^^\n");
+#endif
 }
 
@@ -180,5 +175,5 @@
 {
 #ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
+  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ?? %d W:%d H:%d \n",fHasToRepaint,getWinWidth(),getWinHeight());
 #endif
   if (!fReadyToPaint) {
@@ -186,4 +181,8 @@
     return;
   }
+  if ((getWinWidth() == 0) && (getWinHeight() == 0)) {
+      return;
+  }
+
   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
   if ( !fHasToRepaint) {
@@ -209,5 +208,5 @@
     } else if ((sw == 0) && (sh == 0)) { // NOT A TOP LEVEL WIDGET
       if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) { 
-        //        return;
+        return;
       }
     }
@@ -270,7 +269,25 @@
 }
 
+void G4OpenGLImmediateQtViewer::paintEvent(QPaintEvent *event) {
+  //  fHasToRepaint= false;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent VVVVVVVVV\n");
+#endif
+  updateGL();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::paintEvent ^^^^^^^^^\n");
+#endif
+}
+
+
 void G4OpenGLImmediateQtViewer::updateQWidget() {
   fHasToRepaint= true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::updateQWidget VVVVVVVVV\n");
+#endif
   updateGL();
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::updateQWidget ^^^^^^^^^\n");
+#endif
   fHasToRepaint= false;
 }
@@ -282,4 +299,7 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::ShowView VVVV\n");
+#endif
 #if QT_VERSION < 0x040000
   setActiveWindow();
@@ -287,4 +307,7 @@
   activateWindow();
 #endif
-}
-#endif
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::ShowView ^^^^^\n");
+#endif
+}
+#endif
Index: trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc
===================================================================
--- trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc	(revision 1227)
+++ trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.45 2009/10/21 08:14:44 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.46 2010/01/06 15:05:29 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -104,9 +104,5 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  // G4Qt* interactorManager = G4Qt::getInstance ();
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow :: BEGIN \n");
-#endif
+
   if(fWindow) return; //Done.
 
@@ -133,7 +129,4 @@
   if (!res) { // we have to do a dialog
 
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow :: NO UI get Parent ? \n");
-#endif
     QWidget *myParent = getParentWidget();
 #ifdef G4DEBUG_VIS_OGL
@@ -149,7 +142,4 @@
     QHBoxLayout *mainLayout = new QHBoxLayout(fGLWindow);
     
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow :: After create Layout fGLWindow:%d \n",fGLWindow);
-#endif
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);   
@@ -160,13 +150,7 @@
 #else
       fGLWindow->setWindowTitle( name);
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLQtViewer::CreateMainWindow :: is QMainWindow \n");
-#endif
 #endif
     }
 #if QT_VERSION >= 0x040000
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::CreateMainWindow ::  set layout to fGLWindow:%d \n",fGLWindow);
-#endif
     fGLWindow->setLayout(mainLayout);
 #endif
@@ -190,15 +174,10 @@
     fGLWindow = fWindow;
   }
-  
-  
-  
+
   if(!fWindow) return;
   
   if (!fContextMenu) 
     createPopupMenu();
-  
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer::CreateMainWindow :: END \n");
-#endif
+
 }
 
@@ -257,9 +236,4 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  G4UImanager* UI = G4UImanager::GetUIpointer();
-  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d++++++++++++\n",UI);
-#endif
-
-#ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
@@ -2669,13 +2643,4 @@
 #endif
   
-  //   if (interactorManager) {
-  //     if (interactorManager->GetUIVisWidget()) {
-  //       fGLWindow = interactorManager->GetUIVisWidget();
-  //       return interactorManager->GetUIVisWidget(); 
-  //     }
-  //   }
-  //
-
-
   bool found = false;
   
Index: trunk/source/visualization/OpenInventor/GNUmakefile
===================================================================
--- trunk/source/visualization/OpenInventor/GNUmakefile	(revision 1227)
+++ trunk/source/visualization/OpenInventor/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.9 2009/02/16 15:31:05 lgarnier Exp $
+# $Id: GNUmakefile,v 1.10 2009/11/17 11:33:18 gcosmo Exp $
 
 name := G4OpenInventor
@@ -7,9 +7,6 @@
 endif
 
-# For debug mode
-CPPFLAGS += -DG4DEBUG_VIS_OI
-
-GLOBLIBS  = libG4vis_management.lib libG4modeling.lib
-GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
+GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib
+GLOBLIBS += libG4zlib.lib libG4interfaces.lib libG4run.lib libG4event.lib
 GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
 GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
@@ -37,6 +34,4 @@
 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
 
-INTYLIBS += -L$(G4LIBDIR) -lG4gl2ps
-
 include $(G4INSTALL)/config/common.gmk
 
Index: trunk/source/visualization/OpenInventor/History
===================================================================
--- trunk/source/visualization/OpenInventor/History	(revision 1227)
+++ trunk/source/visualization/OpenInventor/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.102 2009/09/29 21:23:36 allison Exp $
+$Id: History,v 1.104 2009/11/17 17:47:49 allison Exp $
 -------------------------------------------------------------------
 
@@ -20,4 +20,10 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+17th November 2009  John Allison  (openinventor-V09-02-03)
+- Tagged for vis tag.
+
+17th November 2009  Gabriele Cosmo
+- Fixed GNUmakefile.  Fixes build problem with gl2ps on Windows.
 
 29 September 2009  John Allison  (openinventor-V09-02-02)
Index: trunk/source/visualization/RayTracer/History
===================================================================
--- trunk/source/visualization/RayTracer/History	(revision 1227)
+++ trunk/source/visualization/RayTracer/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.59 2009/10/21 15:24:53 allison Exp $
+$Id: History,v 1.60 2009/11/15 12:33:54 allison Exp $
 -------------------------------------------------------------------
 
@@ -25,4 +25,9 @@
 ---------------------------------------
 
+15th November 2009  John Allison  (raytracer-V09-02-02)
+- Formal tag to record fixing of bugzilla Problem 1072.
+  o There is no change of source code.
+  o This was actullay fixed in raytracer-V09-02-00, which is already accepted.
+
 21st October 2009  John Allison  (raytracer-V09-02-01 coworks greps-V09-02-02)
 - Added AddCompound (const G4THitsMap<G4double>&) methods.
@@ -34,5 +39,5 @@
 19 August 2009 Laurent Garnier
 - G4RayTracerViewer.cc, G4RayTracerXViewer.cc : Fix an bad use of fVP
-  parameters
+  parameters [bugzilla Problem 1072]
 
 18 August 2009 Laurent Garnier
Index: trunk/source/visualization/externals/gl2ps/GNUmakefile
===================================================================
--- trunk/source/visualization/externals/gl2ps/GNUmakefile	(revision 1227)
+++ trunk/source/visualization/externals/gl2ps/GNUmakefile	(revision 1228)
@@ -1,3 +1,3 @@
-# $Id: GNUmakefile,v 1.2 2009/11/02 14:54:31 lgarnier Exp $
+# $Id: GNUmakefile,v 1.5 2009/11/18 17:15:11 gcosmo Exp $
 # -------------------------------------------------------------
 # GNUmakefile for gl2ps.  Laurent Garnier, 6/2/09.
@@ -12,7 +12,5 @@
 endif
 
-ifdef G4LIB_BUILD_ZLIB
-  CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include
-endif
+GLOBLIBS = libG4zlib.lib
 
 include $(G4INSTALL)/config/architecture.gmk
@@ -20,3 +18,7 @@
 include $(G4INSTALL)/config/interactivity.gmk
 
+ifdef G4LIB_BUILD_ZLIB
+  CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include
+endif
+
 include $(G4INSTALL)/config/common.gmk
Index: trunk/source/visualization/externals/gl2ps/History
===================================================================
--- trunk/source/visualization/externals/gl2ps/History	(revision 1227)
+++ trunk/source/visualization/externals/gl2ps/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.10 2009/11/02 14:54:31 lgarnier Exp $
+$Id: History,v 1.15 2009/11/18 17:23:36 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17,4 +17,13 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+18 Nov 2009, Gabriele Cosmo (visexternal-V09-02-06)
+ - Added GLOBLIBS dependencies to GNUmakefile to allow for building
+   DLLs on Windows. Removed redundant CPPFLAGS addition.
+ - Re-instated fix to gl2ps.cc.
+
+17 Nov 2009, John Allison, Gabriele Cosmo (visexternal-V09-02-05)
+ - Added dependency on zlib if G4LIB_BUILD_ZLIB is set and corrected
+   inclusion of zlib.h in gl2ps.cc
 
 2 Nov 2009, Laurent Garnier 
Index: trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc
===================================================================
--- trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc	(revision 1227)
+++ trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc	(revision 1228)
@@ -125,5 +125,5 @@
      GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
   int sort = GL2PS_BSP_SORT;
-  sort = GL2PS_SIMPLE_SORT;
+  //int sort = GL2PS_SIMPLE_SORT;
   GLint buffsize = 0;
   buffsize += 1024*1024;
Index: trunk/source/visualization/externals/gl2ps/src/gl2ps.cc
===================================================================
--- trunk/source/visualization/externals/gl2ps/src/gl2ps.cc	(revision 1227)
+++ trunk/source/visualization/externals/gl2ps/src/gl2ps.cc	(revision 1228)
@@ -92,5 +92,5 @@
 #include "Geant4_gl2ps.h"
 
-#include <math.h>
+#include <cmath>
 #include <string.h>
 #include <sys/types.h>
@@ -99,8 +99,6 @@
 #include <float.h>
 
-#if defined(G4LIB_USE_ZLIB)
 #define GL2PS_HAVE_ZLIB
 #include <zlib.h>
-#endif
 
 #if defined(GL2PS_HAVE_LIBPNG)
@@ -121,5 +119,5 @@
 #define GL2PS_ZOFFSET       5.0e-2F
 #define GL2PS_ZOFFSET_LARGE 20.0F
-#define GL2PS_ZERO(arg)     (fabs(arg) < 1.e-20)
+#define GL2PS_ZERO(arg)     (std::fabs(arg) < 1.e-20)
 
 /* Primitive types */
@@ -749,7 +747,7 @@
   
   for(i = 1; i < n; i++){
-    if(fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
-       fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
-       fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
+    if(std::fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
+       std::fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
+       std::fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
       return GL_FALSE;
   }
Index: trunk/source/visualization/gMocren/History
===================================================================
--- trunk/source/visualization/gMocren/History	(revision 1227)
+++ trunk/source/visualization/gMocren/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.7 2009/11/05 11:37:12 gcosmo Exp $
+$Id: History,v 1.9 2009/12/03 11:44:42 akimura Exp $
 -------------------------------------------------------------------
 
@@ -20,4 +20,12 @@
 History file for visualization/gMocren sub-category
 ---------------------------------------------------
+
+3 December 2009  Akinori Kimura
+Line 363 of G4GMocrenFileSceneHandler.cc was deleted.
+It was a debug code with G4cout.
+Another file I/O bug was fixed. The following files were committed.
+G4GMocrenFileViewer.cc
+G4GMocrenFileSceneHandler.cc
+G4GMocrenIO.{cc,hh}
 
 5 November 2009  Gabriele Cosmo (gMocren-V09-02-03)
Index: trunk/source/visualization/gMocren/include/G4GMocrenIO.hh
===================================================================
--- trunk/source/visualization/gMocren/include/G4GMocrenIO.hh	(revision 1227)
+++ trunk/source/visualization/gMocren/include/G4GMocrenIO.hh	(revision 1228)
@@ -43,4 +43,5 @@
 
   void clear();
+  void clearImage();
   void setSize(int _size[3]);
   void getSize(int _size[3]);
@@ -292,4 +293,5 @@
   void setModalityImage(short * _image);
   short * getModalityImage(int _z);
+  void clearModalityImage();
   // set/get the modality image density map
   void setModalityImageDensityMap(std::vector<float> & _map);
Index: trunk/source/visualization/gMocren/src/G4GMocrenFileCTtoDensityMap.cc
===================================================================
--- trunk/source/visualization/gMocren/src/G4GMocrenFileCTtoDensityMap.cc	(revision 1227)
+++ trunk/source/visualization/gMocren/src/G4GMocrenFileCTtoDensityMap.cc	(revision 1228)
@@ -1,2 +1,27 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
 #include "G4GMocrenFileCTtoDensityMap.hh"
 
Index: trunk/source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc
===================================================================
--- trunk/source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc	(revision 1227)
+++ trunk/source/visualization/gMocren/src/G4GMocrenFileSceneHandler.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4GMocrenFileSceneHandler.cc,v 1.10 2009/11/05 11:34:01 gcosmo Exp $
+// $Id: G4GMocrenFileSceneHandler.cc,v 1.12 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -301,4 +301,5 @@
     
     // initializations
+    //kgMocrenIO->clearModalityImage();
     kgMocrenIO->clearDoseDistAll();
     kgMocrenIO->clearROIAll();
@@ -361,5 +362,4 @@
 	    modality[ixy] = kgMocrenIO->convertDensityToHU(itr->second);
 	  } else {
-	    G4cout << "ABC : " << x << ", " <<  y << ", " << z << G4endl;
 	    modality[ixy] = -1024;
 	  }
Index: trunk/source/visualization/gMocren/src/G4GMocrenFileViewer.cc
===================================================================
--- trunk/source/visualization/gMocren/src/G4GMocrenFileViewer.cc	(revision 1227)
+++ trunk/source/visualization/gMocren/src/G4GMocrenFileViewer.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4GMocrenFileViewer.cc,v 1.2 2009/10/12 10:04:35 akimura Exp $
+// $Id: G4GMocrenFileViewer.cc,v 1.3 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -107,11 +107,11 @@
     G4cerr << "***** G4GMocrenFileViewer::ClearView (): No effects " << G4endl;
 
-  if(kSceneHandler.kGddDest) {
-    kSceneHandler.kGddDest.close();
+  //if(kSceneHandler.kGddDest) {
+    //kSceneHandler.kGddDest.close();
     // Re-open with same filename...
-    kSceneHandler.kGddDest.open(kSceneHandler.kGddFileName);
+    //kSceneHandler.kGddDest.open(kSceneHandler.kGddFileName);
     kSceneHandler.kFlagInModeling = false;
     kSceneHandler.GFBeginModeling();
-  }
+    //}
 }
 
Index: trunk/source/visualization/gMocren/src/G4GMocrenIO.cc
===================================================================
--- trunk/source/visualization/gMocren/src/G4GMocrenIO.cc	(revision 1227)
+++ trunk/source/visualization/gMocren/src/G4GMocrenIO.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4GMocrenIO.cc,v 1.4 2009/11/05 03:14:12 akimura Exp $
+// $Id: G4GMocrenIO.cc,v 1.5 2009/12/03 11:44:42 akimura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -170,12 +170,12 @@
   kMinmax[1] = (T)-32109;
 
-  /*
-    if(!image.empty()) {
-    typename std::vector<T *>::iterator itr;
-    for(itr = image.begin(); itr != image.end(); itr++) {
+  clearImage();
+}
+template <typename T> 
+void GMocrenDataPrimitive<T>::clearImage() {
+  typename std::vector<T *>::iterator itr;
+  for(itr = kImage.begin(); itr != kImage.end(); itr++) {
     delete [] *itr;
-    }
-    }
-  */
+  }
   kImage.clear();
 }
@@ -3368,4 +3368,8 @@
   return kModality.getImage(_z);
 }
+void G4GMocrenIO::clearModalityImage() {
+  
+  kModality.clearImage();
+}
 // set/get the modality image density map
 void G4GMocrenIO::setModalityImageDensityMap(std::vector<float> & _map) {
Index: trunk/source/visualization/management/History
===================================================================
--- trunk/source/visualization/management/History	(revision 1227)
+++ trunk/source/visualization/management/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.134 2009/11/17 14:37:06 lgarnier Exp $
+$Id: History,v 1.137 2009/11/22 14:08:09 allison Exp $
 
 -------------------------------------------------------------------
@@ -27,7 +27,16 @@
 ------------------------------------------------------
 
+22nd November 2009  John Allison  (visman-V09-02-08)
+- G4VisCommandsSceneAdd.cc: /vis/scene/add/trajectories rich:
+  o Added G4RichTrajectoryPoint().GetAttDefs() to informational.
+
+17th November 2009  John Allison  (visman-V09-02-07)
+- Tagged.
+
 17th November 2009  Laurent Garnier
-- G4VViewer::Fix SceneHandler removing viewer if class destructor call 
-  before G4VSceneHandler calls it
+- Allow arbitrary viewer deletion (fixes crash).
+  o G4VViewer::~G4VViewer: Removes itself from viewer list.
+  o G4VSceneHandler::~G4VSceneHandler: better algorithm for removing viewers
+  to handle viewer self removal.
 
 16th November 2009  Laurent Garnier
Index: trunk/source/visualization/management/include/G4VisExecutive.hh
===================================================================
--- trunk/source/visualization/management/include/G4VisExecutive.hh	(revision 1227)
+++ trunk/source/visualization/management/include/G4VisExecutive.hh	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4VisExecutive.hh,v 1.8 2009/03/14 11:43:42 allison Exp $
+// $Id: G4VisExecutive.hh,v 1.9 2009/11/17 15:34:06 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -69,5 +69,4 @@
 //
 // Notes:
-
 // (a) After instantiation, all references to this object should be as
 //     a G4VisManager.  The functions RegisterGraphicsSystems and
Index: trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc
===================================================================
--- trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc	(revision 1227)
+++ trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.77 2009/11/04 13:15:02 allison Exp $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.78 2009/11/22 14:02:30 allison Exp $
 // GEANT4 tag $Name:  $
 // /vis/scene commands - John Allison  9th August 1998
@@ -66,4 +66,5 @@
 #include "G4PropagatorInField.hh"
 #include "G4RichTrajectory.hh"
+#include "G4RichTrajectoryPoint.hh"
 #include "G4AttDef.hh"
 #include "G4ios.hh"
@@ -1415,5 +1416,6 @@
 	"\n\"/vis/modeling/trajectories/create/drawByAttribute\" and"
 	"\n\"/vis/filtering/trajectories/create/attributeFilter\" commands:\n"
-	     << G4RichTrajectory().GetAttDefs();
+	     << G4RichTrajectory().GetAttDefs()
+	     << G4RichTrajectoryPoint().GetAttDefs();
     }
   }
Index: trunk/source/visualization/test/History
===================================================================
--- trunk/source/visualization/test/History	(revision 1227)
+++ trunk/source/visualization/test/History	(revision 1228)
@@ -1,3 +1,3 @@
-$Id: History,v 1.119 2009/09/29 21:36:38 allison Exp $
+$Id: History,v 1.121 2009/11/06 16:02:33 allison Exp $
 
 History file for visualization/test subdirectory
@@ -5,4 +5,10 @@
 
 $Log: History,v $
+Revision 1.121  2009/11/06 16:02:33  allison
+vistest-V09-02-01
+
+Revision 1.120  2009/11/06 16:01:57  allison
+Use G4UIExecutive in a more refined way.
+
 Revision 1.119  2009/09/29 21:36:38  allison
 vistest-V09-02-00
Index: trunk/source/visualization/test/test19.cc
===================================================================
--- trunk/source/visualization/test/test19.cc	(revision 1227)
+++ trunk/source/visualization/test/test19.cc	(revision 1228)
@@ -25,5 +25,5 @@
 //
 //
-// $Id: test19.cc,v 1.31 2009/09/29 21:35:56 allison Exp $
+// $Id: test19.cc,v 1.32 2009/11/06 16:01:57 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -32,6 +32,4 @@
 // Usage: test19 [<session>] [<verbosity>]
 // Without verbosity, verbosity=warnings.
-// Without session, session=new G4UIterminal(), or if G4UI_USE_TCSH is set
-//                  session=new G4UIterminal(new G4UItcsh),
 
 #include <stdio.h>
@@ -82,6 +80,5 @@
 #ifdef G4UI_USE
   // Choose (G)UI.
-  G4UIExecutive* UIexecutive = new G4UIExecutive(argc, argv);
-  G4UImanager::GetUIpointer()->SetSession(UIexecutive->GetSession());  //So that Pause works..
+  G4UIExecutive* ui = new G4UIExecutive(argc, argv);
 #endif
 
@@ -119,11 +116,11 @@
 #endif
 
-  G4UImanager* UI = G4UImanager::GetUIpointer ();
+  G4UImanager* UImanager = G4UImanager::GetUIpointer ();
 #ifdef G4UI_USE_WIN32
   G4cout << "Reading win32.g4m file...." << G4endl;
-  UI -> ApplyCommand ("/control/execute win32.g4m");
+  UImanager -> ApplyCommand ("/control/execute win32.g4m");
 #else
   G4cout << "Reading test19.g4m file...." << G4endl;
-  UI -> ApplyCommand ("/control/execute test19.g4m");
+  UImanager -> ApplyCommand ("/control/execute test19.g4m");
 #endif
 
@@ -135,5 +132,5 @@
 #ifdef G4UI_USE
   // Start an interactive session.
-  UIexecutive -> SessionStart();
+  ui -> SessionStart();
 #endif
 
@@ -148,5 +145,5 @@
   G4cout << "vis_test19: Deleting session..." << G4endl;
 #ifdef G4UI_USE
-  delete UIexecutive;
+  delete ui;
   G4cout << "vis_test19: Session deleted." << G4endl;
 #endif
