Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/History	(revision 962)
@@ -13,11 +13,7 @@
      ---------------------------------------------------------------
 
-23-Apr-2008 Gabriele Cosmo              (hadr-chips-body-V09-00-20)
--------------------------------------------------------------------
-- Tag for release 9.1.p02.
-
 31-Mar-2008 Dennis Wright               (hadr-chips-body-V09-01-04)
 -------------------------------------------------------------------
-- Added more parentheses around && within || to satisfy gcc-4.3 compiler
+- add more parentheses around && within || to satisfy gcc-4.3 compiler
   files affected:
     G4QChipolino.cc
@@ -28,5 +24,5 @@
 19-Mar-2008 Dennis Wright               (hadr-chips-body-V09-01-03)
 -------------------------------------------------------------------
-- Added parentheses around && within || to satisfy gcc-4.3 compiler
+- add parentheses around && within || to satisfy gcc-4.3 compiler
   files affected:
     G4QChipolino.cc
@@ -36,9 +32,9 @@
     G4QPDGCode.cc
     G4Quasmon.cc
-- Added braces and ; for empty while blocks to satisfy gcc-4.3
+
+- add braces and ; for empty while blocks to satisfy gcc-4.3
   files affected:
     G4QHadron.cc
 
 18-Mar-2008 Vladimir Ivanchenko         (hadr-chips-body-V09-01-02)
--------------------------------------------------------------------
-- G4QNucleus: fixed compillation warnings at Windows for constructors
+- G4QNucleus - fixed compillation warnings at Windows for constructors
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QBesIKJY.hh,v 1.2 2006/06/29 20:05:55 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCHIPSWorld.hh,v 1.25 2006/06/29 20:05:57 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidate.hh,v 1.28 2006/06/29 20:05:59 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidateVector.hh,v 1.21 2006/06/29 20:06:01 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QChipolino.hh,v 1.23 2006/06/29 20:06:03 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QContent.hh,v 1.28 2006/06/29 20:06:05 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChan.hh,v 1.23 2006/06/29 20:06:07 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChanVector.hh,v 1.19 2006/06/29 20:06:09 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QEnvironment.hh,v 1.32 2007/10/07 13:31:41 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QException.hh,v 1.10 2006/06/29 20:06:13 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QException ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QFragmentation.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadron.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadron.hh,v 1.36 2008/01/09 09:37:24 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QHadron ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronBuilder.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronBuilder.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronBuilder.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadronBuilder.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -37,5 +37,5 @@
 //
 // $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteraction.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteractionVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -38,5 +38,5 @@
 //
 // $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QIsotope.hh,v 1.5 2006/06/29 20:06:19 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QNucleus.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNucleus.hh,v 1.33 2007/10/31 13:23:07 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QNucleus ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPDGCode.hh,v 1.26 2006/06/29 20:06:23 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPDGCodeVector.hh,v 1.19 2006/06/29 20:06:25 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCandidateVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPDGToG4Particle.hh,v 1.4 2006/06/29 20:06:27 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QPDGToG4Particle header ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentCluster.hh,v 1.23 2006/06/29 20:06:29 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentClusterVector.hh,v 1.18 2006/06/29 20:06:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticle.hh,v 1.24 2006/06/29 20:06:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticleVector.hh,v 1.19 2006/06/29 20:06:35 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh	(revision 962)
@@ -29,5 +29,5 @@
 
 // $Id: G4QParton.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh	(revision 962)
@@ -28,5 +28,5 @@
 //
 // $Id: G4QPartonPair.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPartonPairVector.hh,v 1.1 2006/11/16 11:36:09 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCandidateVector ----------------
@@ -37,5 +37,5 @@
 //
 // $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh	(revision 962)
@@ -28,5 +28,5 @@
 //
 // $Id: G4QPomeron.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QSplitter.hh,v 1.2 2006/06/29 20:06:37 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QSplitter ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh	(revision 962)
@@ -27,5 +27,5 @@
 //
 // $Id: G4QString.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 
 #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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QStringVector.hh,v 1.1 2006/10/30 10:40:35 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4Quasmon.hh,v 1.39 2007/08/09 13:07:47 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4Quasmon ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasmonString.hh,v 1.4 2006/06/29 20:06:41 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QuasmonString ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QuasmonVector.hh,v 1.19 2006/06/29 20:06:43 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QBesIKJY.cc,v 1.2 2006/06/29 20:06:45 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCHIPSWorld.cc,v 1.32 2006/06/29 20:06:47 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QCandidate.cc,v 1.34 2006/11/27 10:44:53 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QChipolino.cc,v 1.32.4.1 2008/04/23 14:47:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QChipolino.cc,v 1.34 2008/03/31 20:29:33 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QContent.cc,v 1.43.4.1 2008/04/23 14:47:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QContent.cc,v 1.44 2008/03/20 20:11:37 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDecayChan.cc,v 1.27 2006/11/27 10:44:54 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc	(revision 962)
@@ -28,6 +28,6 @@
 //
 //
-// $Id: G4QEnvironment.cc,v 1.135.2.1 2008/04/23 14:47:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QEnvironment.cc,v 1.137 2008/03/31 20:30:00 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QEnvironment ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QException.cc,v 1.9 2006/06/29 20:06:59 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QException ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QFragmentation.cc,v 1.3 2007/05/02 14:59:55 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QHadron.cc,v 1.52.2.1 2008/04/23 14:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QHadron.cc,v 1.53 2008/03/20 20:11:38 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QHadron ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QHadronBuilder.cc,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QInteraction.cc,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QIsotope.cc,v 1.10 2007/11/28 14:14:36 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QNucleus.cc,v 1.92.2.1 2008/04/23 14:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QNucleus.cc,v 1.95 2008/03/31 20:30:17 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QNucleus ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QPDGCode.cc,v 1.55.2.1 2008/04/23 14:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QPDGCode.cc,v 1.56 2008/03/20 20:11:38 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QPDGCode ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc	(revision 962)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QPDGToG4Particle.cc,v 1.5 2006/06/29 20:07:09 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ---------------- G4QG4ToG4Particle singletone class ------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParentCluster.cc,v 1.25 2006/11/27 10:44:55 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParticle.cc,v 1.33 2006/11/27 10:44:55 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- 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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QParton.cc,v 1.3 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc	(revision 962)
@@ -27,5 +27,5 @@
 //
 // $Id: G4QPartonPair.cc,v 1.1 2006/10/30 10:40:36 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPomeron.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPomeron.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPomeron.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QPomeron.cc,v 1.2 2006/12/12 11:02:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QSplitter.cc	(revision 962)
@@ -29,5 +29,5 @@
 //
 // $Id: G4QSplitter.cc,v 1.6 2006/11/27 10:44:55 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QSplitter ----------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QString.cc,v 1.4 2007/07/06 07:38:36 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // ------------------------------------------------------------
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc	(revision 962)
@@ -28,6 +28,6 @@
 //
 //
-// $Id: G4Quasmon.cc,v 1.105.2.1 2008/04/23 14:47:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Quasmon.cc,v 1.107 2008/03/31 20:30:35 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4Quasmon ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc	(revision 962)
@@ -29,5 +29,5 @@
 //
 // $Id: G4QuasmonString.cc,v 1.7 2006/11/27 10:44:55 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QuasmonString ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4GlauberCrossSections.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4GlauberCrossSections.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4GlauberCrossSections.cc	(revision 962)
@@ -317,4 +317,5 @@
 }
 
+// Initialize factorials and combinatoric coefficients
 void Initialize()
 {
@@ -448,5 +449,5 @@
   G4double S        = (MassN+MassN)*HadrEnergy+MassN2+MassH2;// Mondelststam s
   G4double EcmH     = (S-MassN2+MassH2)/2/std::sqrt(S);     // CM energy of a hadron
-  G4double CMMom = std::sqrt(EcmH*EcmH-MassH2);             // CM momentum
+  G4double CMMom    = std::sqrt(EcmH*EcmH-MassH2);          // CM momentum
 
   G4double Stot     = HadrTot*mb2G2;                        // in GeV^-2
@@ -485,7 +486,7 @@
   for(G4int i=1; i<=A; i++)                          // @@ Make separately for n and p
   {
-    N              *= -Unucl*(A-i+1)*Rho2/i;
+    N              *= -Unucl*(A-i+1)*Rho2/i;         // Includes total cross-section
     G4double N4     = 1.;
-    G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i;
+    G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i; // Includes the slope
     G4double medTot = R12B/i;
     for(G4int l=1; l<=i; l++)
@@ -556,5 +557,6 @@
   ImElA0             *= Corr0;
                         
-  return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*CMMom*CMMom*mb2G2/4/pi2;
+  //return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*CMMom*CMMom*mb2G2/4/pi2; // ds/do
+  return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*mb2G2/(twopi+twopi);
 } // End of DiffElasticCS
 
@@ -564,38 +566,60 @@
   static const G4double mb2G2 = 2.568;                      // Transform from mb to GeV^-2
   static const G4double piMG  = pi/mb2G2;                   // PiTrans from GeV^-2 to mb
-  G4double hMom       = HadrMom/1000.;                      // Momentum (GeV, inputParam)
+  G4double p          = HadrMom/1000.;                      // Momentum (GeV, inputParam)
+  G4double p2         = p*p;
 		G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
   G4double MassH2     = MassH*MassH;
-  G4double HadrEnergy = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
+  G4double HadrEnergy = std::sqrt(p2+MassH2);               // Tot energy in GeV
 		//G4cout<<"G4GCS::DiffElasticCS: PGG_proj="<<hPDG<<", A_nuc= "<<A<<G4endl;
-  if(A==2 || A==3) G4Exception("G4GCS: This model does not work for nuclei with A=2, A=3");
-  if(A>252) G4Exception("G4GCS: This nucleus is too heavy for the model !!!");
   //if(HadrEnergy-MassH<1.) G4Exception("Kin energy is too small for the model (T>1 GeV)");
-  CalculateParameters(hPDG, HadrMom);                   
-  CalculateIntegralCS(A, HadrEnergy);
-  CalculateNuclearParameters(A);
+  CalculateParameters(hPDG, HadrMom);                       // ?                   
+  CalculateIntegralCS(A, HadrEnergy);                       // ?
+  CalculateNuclearParameters(A);                            // ?
   G4double Q2 = aQ2/1000/1000;                              // in GeV^2
 		//G4doubleMassN     = A*0.938;                              // @@ This is bad!
 		G4double MassN    = A*0.9315;                             // @@ Atomic Unit is bad too
   if(G4NucleiPropertiesTable::IsInTable(Z,A))
-				MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass
+				MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass in GeV
   G4double MassN2   = MassN*MassN;
   G4double S        = (MassN+MassN)*HadrEnergy+MassN2+MassH2;// Mondelststam s
   G4double EcmH     = (S-MassN2+MassH2)/2/std::sqrt(S);     // CM energy of a hadron
   G4double CMMom    = std::sqrt(EcmH*EcmH-MassH2);          // CM momentum
-  G4double Stot     = HadrTot*mb2G2;                        // in GeV^-2
-  G4double Bhad     = HadrSlope;                            // in GeV^-2
-  G4double Asq      = 1+HadrReIm*HadrReIm;                  // |M|^2/(ImM)^2
+  //G4cout<<"P="<<CMMom<<",E="<<HadrEnergy<<",N="<<MassN2<<",h="<<MassH2<<",p="<<p<<G4endl;
+  G4double p3       = p2*p;
+  G4double p4       = p2*p2;
+  G4double sp       = std::sqrt(p);
+  G4double p2s      = p2*sp;
+  G4double ap       = std::log(p);
+  G4double dl       = ap-3.;
+  G4double dl2      = dl*dl;
+  G4double shPPTot  = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
+  G4double shPNTot  = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
+                      +(38.+.3*dl2+8./p)/(1.+1.2/p3);       // SigPP in mb
+  G4double hNTot    = (Z*shPPTot+(A-Z)*shPNTot)/A;          // SighN in mb
+  G4double Stot     = hNTot*mb2G2;                          // in GeV^-2
+  G4double shPPSl   = 8.*std::pow(p,.055)/(1.+3.64/p4);     // PPslope in GeV^-2
+  G4double shPNSl   = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
+  G4double Bhad     = (Z*shPPSl+(A-Z)*shPNSl)/A;            // B-slope in GeV^-2
+  G4double hNReIm   = -.55+ap*(.12+ap*.0045);               // Re/Im_hN in no unit
+  G4double Asq      = 1+hNReIm*hNReIm;                      // |M|^2/(ImM)^2
   G4double Rho2     = std::sqrt(Asq);                       // M/ImM
-  G4double R12      = R1*R1;
-  G4double R22      = R2*R2;
+  G4double r1       = 3.9*std::pow(A-1.,.309);             // Positive diffractionalRadius
+  G4double r2       = 2.*std::pow(A,.36);                  // Negative diffraction radius
+  G4double pN       = Pnucl;                                // Dubna value
+  //G4double pN       = .4;                                   // Screaning factor
+  G4double Ae       = Aeff;                                 // Dubna value
+  //G4double Ae       = .75;                                   // Normalization
+  G4double R12      = r1*r1;
+  G4double R22      = r2*r2;
+  G4double R1C      = R12*r1;
+  G4double R2C      = R22*r2;
   G4double R12B     = R12+Bhad+Bhad;                        // Slope is used
   G4double R22B     = R22+Bhad+Bhad;                        // Slope is used
-  G4double Norm     = (R12*R1-Pnucl*R22*R2)*Aeff;           // Some questionable norming
-  G4double R13      = R12*R1/R12B;                          // Slope is used
-  G4double R23      = Pnucl*R22*R2/R22B;                    // Slope is used
+  G4double Norm     = (R1C-pN*R2C)*Ae;                      // ScreanFac & NormFac are used
+  G4double R13      = R1C/R12B;                             // Slope is used
+  G4double R23      = pN*R2C/R22B;                          // Slope & ScreanFact are used
   G4double norFac   = Stot/twopi/Norm;                      // totCS (in GeV^-2) is used
   G4double Unucl    = norFac*R13;
-  G4double SinFi    = HadrReIm/Rho2;
+  G4double SinFi    = hNReIm/Rho2;                          // Real part
   G4double FiH      = std::asin(SinFi);
   G4double N        = -1.;
@@ -606,5 +630,5 @@
   for(G4int i=1; i<=A; i++)
   {
-    N              *= -Unucl*(A-i+1)*Rho2/i;
+    N              *= -Unucl*(A-i+1)*Rho2/i;                // TotCS is used
     G4double N4     = 1.;
     G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i;        // Slope is used
@@ -631,5 +655,6 @@
   ImElA0         *= Corr0;
                         
-  return (ReElA0*ReElA0+ImElA0*ImElA0)*CMMom*CMMom*mb2G2/4/pi2;
+  //return (ReElA0*ReElA0+ImElA0*ImElA0)*CMMom*CMMom*mb2G2/4/pi2; // ds/do
+  return (ReElA0*ReElA0+ImElA0*ImElA0)*mb2G2/(twopi+twopi);
 } // End of DiffElasticCS
 
@@ -705,5 +730,5 @@
   else if(A==12) r0   = 0.80;
 		else           r0   = 1.16*(1.-1.16/Re2);  // For other nuclei which have not been tested
-  G4double MassN      = mN;                              // A * AtomicUnit(GeV)
+		G4double MassN      = A*0.9315;                             // @@ Atomic Unit is bad too
   G4double MassN2     = MassN*MassN;
   G4double S          = (MassN+MassN)*HadrEnergy+MassN2+MassH2; // Mondelstam S
@@ -736,14 +761,14 @@
     G4double expB     = std::exp(InExp);
     G4double HRIE     = HadrReIm*InExp;
-    ReIntegrand[i]    = (1.-expB*std::cos(HRIE));
-    ImIntegrand[i]    = expB*std::sin(HRIE);
+    ReIntegrand[i]    = (1.-expB*std::cos(HRIE));           // Real part of the amplitude
+    ImIntegrand[i]    = expB*std::sin(HRIE);                // Imaginary part of the amplit
   } 
   InCoh     = 0.;                                           // incohirent (quasi-elastic)
   ValB       = -stepB;
-  for(G4int k=0; k<NptB; k++)
+  for(G4int k=0; k<NptB; k++)                               // Third integration (?)
   {
     ValB              += stepB;
     InCoh             += Thick[k]*ValB*std::exp(-hTotG2*Thick[k]);
-    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;
+    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;      // Bessel0(Q*b)
     ReSum             += J0qb*ReIntegrand[k];
     ImSum             += J0qb*ImIntegrand[k];
@@ -753,5 +778,6 @@
   InCoh *= stepB*hTotG2*hTotG2*(1.+HadrReIm*HadrReIm)*std::exp(-HadrSlope*Q2)/8/mb2G2;
   //G4cout<<"GHAD:RS="<<ReSum<<",IS="<<ImSum<<",CM="<<CMMom<<",st="<<stepB<<G4endl;
-  return (ReSum*ReSum+ImSum*ImSum)*m2G10*CMMom*CMMom*stepB*stepB/twopi;
+  //return (ReSum*ReSum+ImSum*ImSum)*m2G10*CMMom*CMMom*stepB*stepB/twopi; // ds/do
+  return (ReSum*ReSum+ImSum*ImSum)*m2G10*stepB*stepB/12; // ds/dt
 }  
 
@@ -763,43 +789,52 @@
   static const G4double hc2   = .3893793;                   // Transform from GeV^-2 to mb
   static const G4double mb2G2 = 1./hc2;                     // Transform from mb to GeV^-2
-  //static const G4double mb2G2 = 2.568;                     // Transform from mb to GeV^-2
   static const G4double f22mb = 10;                         // Transform from fermi^2 to mb
   static const G4double f22G2 = f22mb*mb2G2;                // Transform from fm2 to GeV^-2
   static const G4double f2Gm1 = std::sqrt(f22G2);           // Transform from fm to GeV^-1
   G4double Re         = std::pow(A,.33333333);              // A-dep coefficient
-  G4double Lim        = 50.*Re;                             // Integration accuracy limit
+  G4double Lim        = 100*Re;                             // Integration accuracy limit
   G4double Tb[Npb];                                         // Calculated T(b) array
   G4QBesIKJY QI0(BessI0);                                   // I0 Bessel function
   G4QBesIKJY QJ0(BessJ0);                                   // J0 Bessel function
-           hMom       = hMom/1000.;                         // Momentum (GeV, inputParam)
+  G4double p          = hMom/1000.;                         // Momentum (GeV, inputParam)
+  G4double p2         = p*p;
 		G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
   G4double MassH2     = MassH*MassH;                        // Squared mass of the hadron
-  G4double hEnergy    = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
+  G4double hEnergy    = std::sqrt(p2+MassH2);               // Tot energy in GeV
   G4double Q2         = aQ2/1000000.;                       // -t in GeV
-  G4double MassN      = mN;                                 // AtomicUnit(GeV)[prototype]
+		G4double MassN    = A*0.9315;                             // @@ Atomic Unit is bad too
+  if(G4NucleiPropertiesTable::IsInTable(Z,A))
+				MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass in GeV
   G4double MassN2     = MassN*MassN;                        // Squared mass of the target
   G4double S          = (MassN+MassN)*hEnergy+MassN2+MassH2;// Mondelstam s
   G4double EcmH       = (S-MassN2+MassH2)/2/std::sqrt(S);   // Hadron CM Energy
   G4double CMMom      = std::sqrt(EcmH*EcmH-MassH2);        // CM momentum (to norm CS)
-  // @@ Temporary only for nucleons
-  //G4cout<<"CHPS:E="<<hEnergy<<",dM="<<2*MassN<<",sN="<<MassN2<<",sH="<<MassH2<<G4endl;
-  G4double shNTot     = 5.2+5.2*std::log(hEnergy)+51*std::pow(hEnergy,-.35); // SighN in mb
-  G4double shNSl      = 5.44+.88*std::log(S);               // B-slope in GeV^-2 
-  G4double shNReIm    = .13*std::log(S/350)*std::pow(S,-.18); // Re/Im_hN in no unit
+  //G4cout<<"2: P="<<CMMom<<",E="<<hEnergy<<",N="<<MassN2<<",h="<<MassH2<<",p="<<p<<G4endl;
+  // The mean value of the total can be used
+  G4double p3         = p2*p;
+  G4double p4         = p2*p2;
+  G4double sp         = std::sqrt(p);
+  G4double p2s        = p2*sp;
+  G4double ap         = std::log(p);
+  G4double dl         = ap-3.;
+  G4double dl2        = dl*dl;
+  G4double shPPTot    = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
+  G4double shPNTot    = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
+                        +(38.+.3*dl2+8./p)/(1.+1.2/p3);     // SigPP in mb
+  G4double shNTot     = (Z*shPPTot+(A-Z)*shPNTot)/A;        // SighN in mb
+#ifdef debug
+  G4cout<<"CHIPS:SI,p="<<p<<",n="<<shNTot<<",P="<<shPPTot<<",N="<<shPNTot
+        <<",Z="<<Z<<",A="<<A<<G4endl;
+#endif
+  G4double shPPSl     = 8.*std::pow(p,.055)/(1.+3.64/p4);   // PPslope in GeV^-2
+  G4double shPNSl     = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
+  G4double shNSl      = (Z*shPPSl+(A-Z)*shPNSl)/A;          // B-slope in GeV^-2
+#ifdef debug
+  G4cout<<"CHIPS:SL,n="<<shNSl<<",P="<<shPPSl<<",N="<<shPNSl<<G4endl;
+#endif
+  G4double shNReIm    = -.55+ap*(.12+ap*.0045); // Re/Im_hN in no unit
   //G4cout<<"CHPS: s="<<S<<",T="<<shNTot<<",R="<<shNReIm<<",B="<<shNSl<<G4endl;
   // @@ End of temporary ^^^^^^^
   G4double dHS        = shNSl+shNSl;                        // Working: doubled B-slope
-  //G4double rAfm       = 0.;
-  //if    (A==208) rAfm = 1.125*Re;
-  //else if(A==90) rAfm = 1.12*Re;
-  //else if(A==64) rAfm = 1.1*Re;
-  //else if(A==58) rAfm = 1.09*Re;
-  //else if(A==48) rAfm = 1.07*Re;
-  //else if(A==40) rAfm = 1.15*Re;
-  //else if(A==28) rAfm = 0.93*Re;
-  //else if(A==16) rAfm = 0.92*Re;
-  //else if(A==12) rAfm = 0.80*Re;
-		//else           rAfm = 1.16*(Re-1.16/Re);                  // For other nuclei
-  //G4double stepB      = 2.5*rAfm*f2Gm1/(Npb-1);           // in GeV^-1, step of integral
   G4double stepB      = (Re+Re+2.7)*f2Gm1/(Npb-1);          // in GeV^-1, step of integral
   G4double hTotG2     = shNTot*mb2G2;                       // sigma_hN in GeV^-2
@@ -807,24 +842,24 @@
   G4double ImSum      = 0.;                                 // Integration of ImPart of Amp
   G4double ValB       = -stepB;
-  for(G4int i=0; i<Npb; i++)
+  for(G4int i=0; i<Npb; i++)                                // First integration over b
   {
     ValB             += stepB;                              // An incident parameter
-    G4double ValB2    = ValB*ValB;                          // A working value
-    G4double IPH      = ValB/shNSl;                         // A working value
+    G4double ValB2    = ValB*ValB;                          // A working value b^2
+    G4double IPH      = ValB/shNSl;                         // A working value slope
     G4double Integ    = 0.;                                 // Integral over ImpactParam.
     G4double ValS     = 0.;                                 // Prototype of ImpactParameter
-    for(G4int j=1; j<Npb; j++)
+    for(G4int j=1; j<Npb; j++)                              // Second integration over b
     {
       ValS           += stepB; //  back to fm               // Impact parameter GeV^-1
       if(!i) Tb[j]    = CHIPS_Tb(A,ValS/f2Gm1)/f22G2;       // GeV^2, calculate only once
       //if(!i) Tb[j]    = Thickness(A,ValS/f2Gm1,rAfm)/f22G2; // Calculate T(b) only once
-      G4double FunS   = IPH*ValS;                           // Working product 
-      if(FunS > Lim) break;                                 // (?)
-      Integ          += ValS*std::exp(-(ValS*ValS+ValB2)/dHS)*QI0(FunS)*Tb[j];
+      G4double FunS   = IPH*ValS;                           // b1*b2/slope
+      if(FunS > Lim) break;                                 // To avoid NAN
+      Integ          += ValS*std::exp(-(ValS*ValS+ValB2)/dHS)*QI0(FunS)*Tb[j]; // BessI0
     } 
-    G4double InExp    = -hTotG2*Integ*stepB/dHS;            // Working product 
-    G4double expB     = std::exp(InExp);                    // Workung sqrt
+    G4double InExp    = -hTotG2*Integ*stepB/dHS;            // Integrated absorption 
+    G4double expB     = std::exp(InExp);                    // Exponential absorption
     G4double HRIE     = shNReIm*InExp;                      // Phase shift
-    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;
+    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;      // Bessel0(Q*b)
     ReSum             += J0qb*(1.-expB*std::cos(HRIE));
     ImSum             += J0qb*expB*std::sin(HRIE);
@@ -832,11 +867,12 @@
   //G4cout<<"CHPS:RS="<<ReSum<<",IS="<<ImSum<<",CM="<<CMMom<<",st="<<stepB<<G4endl;
   //return (ReSum*ReSum+ImSum*ImSum)*mb2G2*CMMom*CMMom*stepB*stepB/twopi;
-  return (ReSum*ReSum+ImSum*ImSum)*f22G2*CMMom*CMMom*stepB*stepB/twopi;
-}  
+  //return (ReSum*ReSum+ImSum*ImSum)*f22G2*CMMom*CMMom*stepB*stepB/twopi; // ds/do
+  return (ReSum*ReSum+ImSum*ImSum)*f22G2*stepB*stepB/12; // ds/dt
+}
+
+// Separate quasielastic calculation
 G4double CHIPSDifQuasiElasticCS(G4int hPDG, G4double hMom, G4int A, G4int Z, G4double aQ2)
 {//      =================================================================================
   static const G4int Npb      = 500;                        // A#of intergation points
-  //static const G4double mN = .9315;                         // Atomic Unit GeV
-  static const G4double mN = .938;                          // Mass of proton GeV
   static const G4double hc2   = .3893793;                   // Transform from GeV^-2 to mb
   static const G4double mb2G2 = 1./hc2;                     // Transform from mb to GeV^-2
@@ -845,18 +881,23 @@
   static const G4double f22G2 = f22mb*mb2G2;                // Transform from fm2 to GeV^-2
   static const G4double f2Gm1 = std::sqrt(f22G2);           // Transform from fm to GeV^-1
-           hMom       = hMom/1000.;                         // Momentum (GeV, inputParam)
-		G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
-  G4double MassH2     = MassH*MassH;                        // Squared mass of the hadron
-  G4double hEnergy    = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
+  G4double p          = hMom/1000.;                         // Momentum (GeV, inputParam)
+  G4double p2         = p*p;
   G4double Q2         = aQ2/1000000.;                       // -t in GeV
-  G4double MassN      = mN;                                 // A*AtomicUnit(GeV)[prototype]
-  //if(G4NucleiPropertiesTable::IsInTable(Z,A))
-		//		MassN=G4NucleiProperties::GetNuclearMass(A,Z)/A/1000.;  // Geant4 NuclearMass/A
-  G4double MassN2     = MassN*MassN;                        // Squared mass of the target
-  G4double S          = (MassN+MassN)*hEnergy+MassN2+MassH2;// Mondelstam s
   // @@ Temporary only for nucleons
-  G4double shNTot     = 5.2+5.2*std::log(hEnergy)+51*std::pow(hEnergy,-.35); // SighN in mb
-  G4double shNSl      = 6.44+.88*std::log(S);               // B-slope in GeV^-2 
-  G4double shNReIm    = .13*std::log(S/350)*std::pow(S,-.18); // Re/Im_hN in no unit
+  G4double p3         = p2*p;
+  G4double p4         = p2*p2;
+  G4double sp         = std::sqrt(p);
+  G4double p2s        = p2*sp;
+  G4double ap         = std::log(p);
+  G4double dl         = ap-3.;
+  G4double dl2        = dl*dl;
+  G4double shPPTot    = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
+  G4double shPNTot    = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
+                        +(38.+.3*dl2+8./p)/(1.+1.2/p3);     // SigPP in mb
+  G4double shNTot     = (Z*shPPTot+(A-Z)*shPNTot)/A;        // SighN in mb
+  G4double shPPSl     = 8.*std::pow(p,.055)/(1.+3.64/p4);   // PPslope in GeV^-2
+  G4double shPNSl     = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
+  G4double shNSl      = (Z*shPPSl+(A-Z)*shPNSl)/A;          // B-slope in GeV^-2
+  G4double shNReIm    = -.55+ap*(.12+ap*.0045); // Re/Im_hN in no unit
   // @@ End of temporary ^^^^^^^
   G4double Re         = std::pow(A,.33333333);              // A-dep coefficient
@@ -1009,8 +1050,8 @@
   //const G4int A[na]={4,9,12,16,27,48,58,64,120,181,207,238}; // A's of target nuclei
   //                 He Al Pb
-  const G4int A[na]={208}; // A's of target nuclei
+  const G4int A[na]={119}; // A's of target nuclei
   //                     p    n  pi+  pi-  K+  K-  antip
   const G4int pdg[np]={2212,2112,211,-211,321,-321,-2212}; // projectiles
-  const G4double mom[nm]={1090.}; // momentum in MeV/c
+  const G4double mom[nm]={120.}; // momentum in MeV/c
 #ifdef integrc
   for(G4int ip=0; ip<np; ip++)
@@ -1049,5 +1090,5 @@
   //const G4int Z[na]={2,4, 6, 8,13,22,28,29, 50, 73, 82, 92}; // Z's of target nuclei
   //                He Al Pb
-  const G4int Z[na]={82}; // Z's of target nuclei
+  const G4int Z[na]={50}; // Z's of target nuclei
   // Test of differential ellastic cross sections
 		Initialize();
@@ -1066,5 +1107,5 @@
 		      {
           G4double Sig1 = CHIPSDiffElCS(PDG, mom[im], Z[ia], A[ia], t[it]);
-          //G4double Sig1 = DiffElasticCS(PDG, mom[im], A[ia], t[it]);
+          //G4double Sig1 = DiffElasticCS(PDG, mom[im], A[ia], t[it]); //Doesn't work
           G4double Sig2 = CoherentDifElasticCS(PDG, mom[im], A[ia], t[it]);
           G4double Sig3 = CHIPSDifElasticCS(PDG, mom[im], A[ia], Z[ia], t[it]);
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4NuMuXQ2Integration.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4NuMuXQ2Integration.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4NuMuXQ2Integration.cc	(revision 962)
@@ -62,43 +62,40 @@
   else
   {
-		  double r=0.;
-    double max=1.;
-    double H=1.22;
-    if(A==1)                   // Proton
-		  {
-      r=std::sqrt(Q2/1.66);
-      max=.5;
-    }
-    else if(A<13)              // Light nuclei
-		  {
-      double f=Q2/4.62;
-      r=f*f;
-      max=.3;
-      if(A>2) H=1.;
-    }
-    else if(A>0)               // Heavy nuclei
-		  {
-      double f=Q2/3.4;
-      double ff=f*f;
-      r=ff*ff;
-      max=.5;
-      H=1.;
-    }
-    else G4cout<<"strucf: A="<<A<<" <= 0"<< G4endl;
+		  //double r=0.;
+    double min=.077;             // Delta(0)
+				double max=.47;              // Hard Pomeron
+    //double H=1.22;
+    if(Q2<=0.) G4cout<<"strucf: Q2="<<Q2<<" <= 0"<< G4endl;
+    double Q=std::sqrt(Q2);
+    //if(A==1)                   // Proton
+		  //{
+    //  r=std::sqrt(Q2/1.66);
+    //  max=.5;
+    //}
+    //else if(A<13)              // Light nuclei
+		  //{
+    //  double f=Q2/4.62;
+    //  r=f*f;
+    //  max=.3;
+    //  if(A>2) H=1.;
+    //}
+    //else if(A>0)               // Heavy nuclei
+		  //{
+    //  double f=Q2/3.4;
+    //  double ff=f*f;
+    //  r=ff*ff;
+    //  max=.5;
+    //  H=1.;
+    //}
+    //else G4cout<<"strucf: A="<<A<<" <= 0"<< G4endl;
     //
     N=3.+.3581*std::log(1.+Q2/.04); // a#of partons in the nonperturbative phase space
-    Del=(1.+r)/(12.5+r/max);
-    double S=std::pow(1.+.6/Q2,-1.-Del);
-    D=H*S*(1.-.5*S);
+    Del=min+(max-min)/(1.+5./Q);
+    D=0.68*std::pow(1.+.145/Q2,-1.-Del); // 0.68=1-0.34, m2=.145 GeV2
     V=3*(1.-D)*(N-1.);
-    double cc=Q2/.08;
-    double cc2=cc*cc;
-    //double C=(1.+cc2)/(1.+cc2/.24);              // Weak?
-    double C=(1.+cc2)/(1.+cc2/.24)/(1.+Q2/21.6); // EM
-    double c3=C+C+C;
+    double c3=.75;                       // 3*0.25
     double uu=std::exp(lGam(N-Del)-lGam(N-1.)-lGam(1.-Del))/N;
     U2=(c3+N-3.)*uu;
     U3=c3*uu;
-    //UU=uu+uu+uu; // @@
     mA  = A;
     mQ2 = Q2;
@@ -125,5 +122,5 @@
   //else
   xf3= U3*pp+dir;
-  fL = per/4.;
+  fL = per/5.;                             // 20%
   return;
 }
@@ -157,5 +154,5 @@
   const double sik=GF2*hc2/pif; // precalculated coefficient
   //const double mpi=.1349766;    // pi0 meson mass in GeV
-  const double mpi=.13957018;   // charged pi meson mass in GeV
+  //const double mpi=.13957018;   // charged pi meson mass in GeV
   //const double mpi2=mpi*mpi;    // m_pi^2 in GeV^2
   //const double me=.00051099892; // electron mass in GeV
@@ -168,10 +165,10 @@
   //const double mtau2=mtau*mtau; // m_tau^2 in GeV^2
   //const double hmtau2=mtau2/2;  // .5*m_e^2 in GeV^2
-  //const double mp=.93827203;    // proton mass in GeV
-  //const double mn=.93956536;    // neutron mass in GeV
+  const double mp=.93827203;    // proton mass in GeV
+  const double mn=.93956536;    // neutron mass in GeV
   //const double md=1.87561282;   // deuteron mass in GeV
-  const double MN=.931494043;   // Nucleon mass (inside nucleus, atomic mass unit, GeV)
-  //const double MN=(mn+mp)/2;    // Nucleon mass (mean free) in GeV
-  //const double MD=1.232;        // proton mass in GeV
+  //const double MN=.931494043;   // Nucleon mass (inside nucleus, atomic mass unit, GeV)
+  const double MN=(mn+mp)/2;    // Nucleon mass (mean free) in GeV
+  const double MD=1.232;        // proton mass in GeV
   //const double mp2=mp*mp;       // m_p^2 in GeV^2
   const double MN2=MN*MN;       // M_N^2 in GeV^2
@@ -184,5 +181,6 @@
   //
   //const double mc=.3;           // parameter of W>M+mc cut for Quasi-Elastic/Delta
-  const double mc=mpi;          // parameter of W>M+mc cut for Quasi-Elastic/Delta
+  const double mc=std::sqrt((MN*MN+MD*MD)/2)-MN; // Squared mean between N and \Delta
+  //const double mc=mpi;          // parameter of W>M+mc cut for Quasi-Elastic/Delta
   const double mcV=(dMN+mc)*mc; // constant of W>M+mc cut for Quasi-Elastic
   //std::ofstream fileNuMuX("NuMuXQ2.out", std::ios::out);
@@ -198,6 +196,6 @@
   int    A=12;                    // Neucleus for which calculations should be done
   double lEnuMin=0;               // LogLog of Minimum energy of neutrino
-  double lEnuMax=std::log(1.+std::log(300./EminMu)); // LogLog of Maximum energy of neutrino
-  int    nE=31;
+  double lEnuMax=std::log(1.+std::log(300./EminMu)); // LogLog of MaximumEnergy of neutrino
+  int    nE=49;                   // Number of points
   double dlE=(lEnuMax-lEnuMin)/nE;
   lEnuMin+=dlE/10;
@@ -241,5 +239,5 @@
         double dik=MW4/Q2M/Q2M;
         double qmc=Q2+mcV;
-        double lXQES=std::log((std::sqrt(qmc*qmc+Q2*fMN2)-qmc)/dMN2); // Quasielastic boundary
+        double lXQES=std::log((std::sqrt(qmc*qmc+Q2*fMN2)-qmc)/dMN2);//QuasielasticBoundary
         //double lXQES=log(Q2/(Q2+mcV)); // Quasielastic boundary (W=MN+m_c)
         //double xN=Q2/dME;
@@ -248,5 +246,5 @@
         double lXmin=std::log(xN);
         // ****** QE ********
-        //if(lXQES>lXmin) lXmin=lXQES;   // A cut which leaves only QES
+        if(lXQES>lXmin) lXmin=lXQES;   // A cut which leaves only QES >>>>>>>>>>>>>>>>
         // *** End of QE^^^^^
         double lXmax=0.;               // QES is in DIS
@@ -262,6 +260,7 @@
 				      {
             getFun(A, lX, Q2, f);
-            DISxint+=f[0]+f[0]+xN*(f[1]+f[1]+xN*f[3]); // neutrino
-            //DISxint+=f[0]+f[0]+xN*(f[2]+f[2]+xN*f[4]); // anti-neutrino
+            // ***** Neutrino/Antineutrino switch ******>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+            //DISxint+=f[0]+f[0]+xN*(f[1]+f[1]+xN*f[3]); // neutrino
+            DISxint+=f[0]+f[0]+xN*(f[2]+f[2]+xN*f[4]); // anti-neutrino
             //G4cout<<f[0]<<","<<f[1]<<","<<f[2]<<","<<f[3]<<","<<f[4]<<G4endl;
           }
@@ -279,5 +278,8 @@
     //===== tot/qe choice ====
     DIStsig*=sik/Enu;
-    G4cout<<"***total*** E="<<Enu<<",sig/E="<<DIStsig<<G4endl;
+    //G4cout<<"***total-neutrino*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
+    G4cout<<"***total-antineutrino*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
+    //G4cout<<"***quasiel-nu*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
+    //G4cout<<"***quasiel-antinu*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
     //...................
     //DIStsig*=sik;
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/History
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/History	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/History	(revision 962)
@@ -13,9 +13,62 @@
      ---------------------------------------------------------------
 
-07-May-2008 Gabriele Cosmo             (hadr-chips-inter-V09-00-13)
+06-Feb-2009 V.Ivanchenko (hadr-chips-inter-V09-02-01)
+------------------------------------------------------
+
+23-Jan-2009 V.Ivanchenko (hadr-chips-inter-V09-02-00)
+------------------------------------------------------
+- added deregistration in destructor of G4QCaptureAtRest
+- added string decay destruction to G4ElectroNuclearReaction
+
+24-Oct-2008 Dennis Wright (hadr-chips-inter-V09-01-09)
+------------------------------------------------------
+- replace G4NucleiPropertiesTable::IsInTable with 
+  G4NucleiProperties::IsInStableTable in G4QElectronNuclearCrossSection,
+  G4QMuonNuclearCrossSection, G4QPhotonNuclearCrossSection, 
+  G4QTauNuclearCrossSection
+
+ 2-Oct-2008 Dennis Wright (hadr-chips-inter-V09-01-08)
+------------------------------------------------------
+- change process type integer from 15 to fHadronAtRest for 
+  G4PionMinusNuclearAtRestChips, G4ProtonAntiProtonAtRestChips, 
+  G4QCaptureAtRest
+
+- change process type integer from 16 to enum fChargeExchange for 
+  G4QCoherentChargeExchange
+
+- change process type integer from 12 to enum fHadronInelastic for 
+  G4QCollision, G4QDiffraction, G4QGluonString, G4QLowEnergy
+
+- change process type integer from 11 to fHadronElastic for 
+  G4QElastic, G4QIonIonElastic
+
+- remove process type from G4QAtomicElectronScattering, 
+  G4QDiscProcessMixer.cc
+
+ 1-Sep-2008 Vladimir Ivanchenko        (hadr-chips-inter-V09-01-07)
 -------------------------------------------------------------------
-- Tag for release 9.1.p02.
+G4QCaptureAtRest - added registration in G4HadronicProcessStore
+                   and PrintInfo by adding PreparePhysicsTable and 
+	           BuildPhysicsTable
+G4GammaNuclearReaction - moved implementations from header to source 
+                         and added name "CHIPS"
+G4ElectroNuclearReaction - moved instantiation of HE model to 
+                         constructor from run time and added name "CHIPS"
 
-06-May-2008 Dennis Wright              (hadr-chips-inter-V09-01-05)
+ 8-Jul-2008 Dennis Wright              (hadr-chips-inter-V09-01-06)
+-------------------------------------------------------------------
+- add G4QIonIonElastic from HEAD
+- add general process type, fHadronic to several processes
+- set process sub-type to 11 (elastic) for G4QElastic, G4QIonIonElastic
+- set process sub-type to 12 (inelastic) for G4QCollision, G4QDiffraction,
+    G4QGluonString, G4QLowEnergy
+- set process sub-type to 13 (capture) for G4QCaptureAtRest
+- set process sub-type to 15 (stopping) for G4PionMinusNuclearAtRestChips,
+    G4ProtonAntiProtonAtRestChips
+- set process sub-type to 16 (quasi-elastic) for G4QCoherentChargeExchange
+- set process sub-type to 10 (unknown) for G4QAtomicElectronScattering,
+    G4QDiscProcessMixer
+
+ 6-May-2008 Dennis Wright              (hadr-chips-inter-V09-01-05)
 -------------------------------------------------------------------
 - replace max-- with --max at lines 1191, 1195, 1197 of G4Collison.cc
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ChiralInvariantPhaseSpace.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ChiralInvariantPhaseSpace.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ChiralInvariantPhaseSpace.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 #ifndef G4ChiralInvariantPhaseSpace_h
-#define G4ChiralInvariantPhaseSpace_h
+#define G4ChiralInvariantPhaseSpace_h 1
 
 //
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ElectroNuclearReaction.hh	(revision 962)
@@ -26,6 +26,6 @@
 //
 //
-// $Id: G4ElectroNuclearReaction.hh,v 1.23 2006/06/29 20:07:46 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4ElectroNuclearReaction.hh,v 1.26 2009/01/24 11:57:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -35,5 +35,5 @@
 //
 #ifndef G4ElectroNuclearReaction_h
-#define G4ElectroNuclearReaction_h
+#define G4ElectroNuclearReaction_h 1
 
 #include "globals.hh"
@@ -42,44 +42,57 @@
 #include "G4ElectroNuclearCrossSection.hh"
 #include "G4PhotoNuclearCrossSection.hh"
+#include "G4GammaParticipants.hh"
+#include "G4QGSModel.hh"
+#include "G4QGSMFragmentation.hh"
+#include "G4Nucleus.hh"
+#include "G4HadFinalState.hh"
+#include "G4HadProjectile.hh"
 #include "G4Electron.hh"
 #include "G4Positron.hh"
 #include "G4Gamma.hh"
-#include "G4GammaParticipants.hh"
-#include "G4QGSModel.hh"
 #include "G4TheoFSGenerator.hh"
 #include "G4GeneratorPrecompoundInterface.hh"
-#include "G4QGSMFragmentation.hh"
 #include "G4ExcitedStringDecay.hh"
-
+ 
 class G4ElectroNuclearReaction : public G4HadronicInteraction
 {
-  public: 
-    virtual ~G4ElectroNuclearReaction(){}
-    G4ElectroNuclearReaction()
-    {
-      SetMinEnergy(0*GeV);
-      SetMaxEnergy(30*TeV);
+public: 
+
+  G4ElectroNuclearReaction():G4HadronicInteraction("CHIPS")
+  {
+    SetMinEnergy(0*GeV);
+    SetMaxEnergy(30*TeV);
       
-      theHEModel = new G4TheoFSGenerator;
-      theCascade = new G4GeneratorPrecompoundInterface;
-    }
+    theHEModel = new G4TheoFSGenerator;
+    theCascade = new G4GeneratorPrecompoundInterface;
+    theHEModel->SetTransport(theCascade);
+    theHEModel->SetHighEnergyGenerator(&theStringModel);
+    theStringDecay = new G4ExcitedStringDecay(&theFragmentation);
+    theStringModel.SetFragmentationModel(theStringDecay);
+    theHEModel->SetMinEnergy(2.5*GeV);
+    theHEModel->SetMaxEnergy(100*TeV);
+  }
+
+  virtual ~G4ElectroNuclearReaction() {delete  theStringDecay;};
     
-    virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, 
-    G4Nucleus& aTargetNucleus);
-
-  private:
-    G4ChiralInvariantPhaseSpace theLEModel;
-    G4TheoFSGenerator * theHEModel;
-    G4GeneratorPrecompoundInterface * theCascade;
-    G4QGSModel< G4GammaParticipants > theStringModel;
-    G4QGSMFragmentation theFragmentation;
-    G4ExcitedStringDecay * theStringDecay;
-    G4ElectroNuclearCrossSection theElectronData;
-    G4PhotoNuclearCrossSection thePhotonData;
-    G4HadFinalState theResult;
+  G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, 
+				 G4Nucleus& aTargetNucleus);
+
+private:
+
+  G4ChiralInvariantPhaseSpace theLEModel;
+  G4TheoFSGenerator * theHEModel;
+  G4GeneratorPrecompoundInterface * theCascade;
+  G4QGSModel< G4GammaParticipants > theStringModel;
+  G4QGSMFragmentation theFragmentation;
+  G4ExcitedStringDecay * theStringDecay;
+  G4ElectroNuclearCrossSection theElectronData;
+  G4PhotoNuclearCrossSection thePhotonData;
+  G4HadFinalState theResult;
 };
 
-inline G4HadFinalState* G4ElectroNuclearReaction::
-ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus)
+inline   
+G4HadFinalState* G4ElectroNuclearReaction::ApplyYourself(const G4HadProjectile& aTrack, 
+							 G4Nucleus& aTargetNucleus)
 {
   theResult.Clear();
@@ -198,11 +211,4 @@
   {
     // G4cout << "0) Getting a high energy electro-nuclear reaction"<<G4endl;
-    theHEModel->SetTransport(theCascade);
-    theHEModel->SetHighEnergyGenerator(&theStringModel);
-    theStringDecay = new G4ExcitedStringDecay(&theFragmentation);
-    theStringModel.SetFragmentationModel(theStringDecay);
-    theHEModel->SetMinEnergy(2.5*GeV);
-    theHEModel->SetMaxEnergy(100*TeV);
-
     G4HadFinalState * aResult = theHEModel->ApplyYourself(localTrack, aTargetNucleus);
     for(G4int all = 0; all < aResult->GetNumberOfSecondaries(); all++)
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 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4GammaNuclearReaction.hh	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4GammaNuclearReaction.hh,v 1.13 2006/06/29 20:07:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4GammaNuclearReaction.hh,v 1.14 2008/09/01 17:30:42 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -32,37 +32,30 @@
 // Created: J.P. Wellisch, 2000/08/18 
 // The last update: J.P. Wellisch, Thu Jun  6 2002.
+// 01.09.2008 V.Ivanchenko move inline to source and define interaction name
 //
+
 #ifndef G4GammaNuclearReaction_h
-#define G4GammaNuclearReaction_h
+#define G4GammaNuclearReaction_h 1
 
 #include "globals.hh"
 #include "G4HadronicInteraction.hh"
 #include "G4ChiralInvariantPhaseSpace.hh"
-#include "G4Gamma.hh"
 
 class G4GammaNuclearReaction : public G4HadronicInteraction
 {
-  public: 
-    virtual ~G4GammaNuclearReaction()
-    {
-    }
+public: 
+
+  G4GammaNuclearReaction();
+
+  virtual ~G4GammaNuclearReaction();
     
-    virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, 
-    G4Nucleus& aTargetNucleus);
+  virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack, 
+					 G4Nucleus& aTargetNucleus);
 
-  private:
-    G4ChiralInvariantPhaseSpace theModel;
+private:
+
+  G4ChiralInvariantPhaseSpace theModel;
+
 };
 
-inline
-G4HadFinalState * G4GammaNuclearReaction::
-ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus)
-{
-  if(aTrack.GetDefinition() != G4Gamma::GammaDefinition())
-  {
-    throw G4HadronicException(__FILE__, __LINE__, "Called G4GammaNuclearReaction for particle other than gamma");
-  }
-  return theModel.ApplyYourself(aTrack, aTargetNucleus);
-}
-
 #endif
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4PionMinusNuclearAtRestChips.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4PionMinusNuclearAtRestChips.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4PionMinusNuclearAtRestChips.hh	(revision 962)
@@ -32,4 +32,5 @@
 #include "G4PionMinus.hh"
 #include "G4ChiralInvariantPhaseSpace.hh"
+#include "G4HadronicProcessType.hh"
 
 class G4PionMinusNuclearAtRestChips : public G4VRestProcess
@@ -43,5 +44,8 @@
  
      G4PionMinusNuclearAtRestChips(const G4String& processName ="PionMinusAnnihilationAtRest")
-      : G4VRestProcess (processName) {}
+      : G4VRestProcess (processName, fHadronic) 
+     {
+       SetProcessSubType(fHadronAtRest);
+     }
  
     ~G4PionMinusNuclearAtRestChips() {}
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ProtonAntiProtonAtRestChips.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ProtonAntiProtonAtRestChips.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ProtonAntiProtonAtRestChips.hh	(revision 962)
@@ -39,4 +39,5 @@
 #include "G4StopElementSelector.hh"
 #include "G4ChiralInvariantPhaseSpace.hh"
+#include "G4HadronicProcessType.hh"
 
 class G4ProtonAntiProtonAtRestChips : public G4VRestProcess
@@ -50,5 +51,8 @@
  
      G4ProtonAntiProtonAtRestChips(const G4String& processName ="AntiProtonAnnihilationAtRest")
-      : G4VRestProcess (processName) {}
+      : G4VRestProcess (processName, fHadronic) 
+     {
+       SetProcessSubType(fHadronAtRest);
+     }
  
     ~G4ProtonAntiProtonAtRestChips() {}
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuANuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuANuNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuANuNuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuANuNuclearCrossSection.hh,v 1.1 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuENuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuENuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuENuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuENuclearCrossSection.hh,v 1.1 2007/10/02 10:00:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuMuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuMuNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuMuNuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuMuNuclearCrossSection.hh,v 1.6 2006/12/01 10:57:46 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QAtomicElectronScattering.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QAtomicElectronScattering.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QAtomicElectronScattering.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 // $Id: G4QAtomicElectronScattering.hh,v 1.2 2006/12/13 15:45:16 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QAtomicElectronScattering header ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCaptureAtRest.hh,v 1.3 2007/02/09 09:33:28 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QCaptureAtRest.hh,v 1.6 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCaptureAtRest header ----------------
@@ -94,4 +94,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
@@ -118,7 +119,11 @@
 
   // Destructor
-  ~G4QCaptureAtRest();
+  virtual ~G4QCaptureAtRest();
 
-  G4bool IsApplicable(const G4ParticleDefinition& particle);
+  virtual G4bool IsApplicable(const G4ParticleDefinition& particle);
+
+  virtual void PreparePhysicsTable(const G4ParticleDefinition&);
+
+  virtual void BuildPhysicsTable(const G4ParticleDefinition&);
 
   G4VParticleChange* AtRestDoIt(const G4Track& aTrack, const G4Step& aStep); 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCoherentChargeExchange.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCoherentChargeExchange.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCoherentChargeExchange.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCoherentChargeExchange.hh,v 1.4 2007/08/09 13:04:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QCoherentChargeExchange.hh,v 1.5 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCoherentChargeExchange header ----------------
@@ -56,4 +56,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCollision.hh,v 1.10 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QCollision.hh,v 1.11 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCollision header ----------------
@@ -85,4 +85,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffraction.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffraction.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffraction.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QDiffraction.hh,v 1.1 2007/08/23 15:58:43 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QDiffraction.hh,v 1.2 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QDiffraction header ----------------
@@ -54,4 +54,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffractionRatio.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffractionRatio.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffractionRatio.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscProcessMixer.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscProcessMixer.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscProcessMixer.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QDiscProcessMixer.hh,v 1.2 2007/08/31 09:36:57 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QDiscProcessMixer.hh,v 1.3 2008/07/09 19:45:09 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QDiscProcessMixer header ----------------
@@ -67,5 +67,5 @@
   G4QDiscProcessMixer(const G4String& processName = "Mixed Discrete Process",
                       const G4ParticleDefinition* proj = G4Gamma::Gamma(),
-                      G4ProcessType pType = fNotDefined );
+                      G4ProcessType pType = fHadronic );
 
   // Destructor
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscreteProcessVector.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscreteProcessVector.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscreteProcessVector.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QDiscreteProcessVector.hh,v 1.1 2007/08/28 15:48:15 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QDiscreteProcessVector ----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QElastic.hh,v 1.3 2007/05/23 15:14:25 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QElastic.hh,v 1.4 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QElastic header ----------------
@@ -56,4 +56,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -41,5 +41,4 @@
 #include "G4ParticleTable.hh"
 #include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
 #include <vector>
 #include "Randomize.hh"
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QGluonString.hh,v 1.1 2006/10/30 10:33:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QGluonString.hh,v 1.2 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QGluonString header ----------------
@@ -62,4 +62,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QIonIonCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QIonIonCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QIonIonCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QLowEnergy.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QLowEnergy.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QLowEnergy.hh	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QLowEnergy.hh,v 1.3 2007/11/15 09:36:43 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QLowEnergy.hh,v 1.4 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QLowEnergy header ----------------
@@ -55,4 +55,5 @@
 #include "G4ThreeVector.hh"
 #include "G4LorentzVector.hh"
+#include "G4HadronicProcessType.hh"
 
 // CHIPS Headers
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QMuonNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QMuonNuclearCrossSection.hh,v 1.6 2008/10/24 19:23:25 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -45,5 +45,4 @@
 #include "G4ParticleTable.hh"
 #include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
 #include <vector>
 #include "Randomize.hh"
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNeutronNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNeutronNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNeutronNuclearCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuENuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuENuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuENuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuENuclearCrossSection.hh,v 1.1 2007/10/02 10:00:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuMuNuclearCrossSection.hh,v 1.6 2006/12/01 10:57:46 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuNuNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuNuNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuNuNuclearCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuNuNuclearCrossSection.hh,v 1.1 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -42,5 +42,4 @@
 #include "G4ParticleTable.hh"
 #include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
 #include <vector>
 #include "G4VQCrossSection.hh"
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QTauNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QTauNuclearCrossSection.hh,v 1.6 2008/10/24 19:23:48 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -45,5 +45,4 @@
 #include "G4ParticleTable.hh"
 #include "G4NucleiProperties.hh"
-#include "G4NucleiPropertiesTable.hh"
 #include <vector>
 #include "Randomize.hh"
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QuasiFreeRatios.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QuasiFreeRatios.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QuasiFreeRatios.hh	(revision 962)
@@ -25,5 +25,5 @@
 //
 //
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4VQCrossSection.hh
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4VQCrossSection.hh	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4VQCrossSection.hh	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VQCrossSection.hh,v 1.9 2007/11/15 09:36:43 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuANuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuANuNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuANuNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuANuNuclearCrossSection.cc,v 1.2 2007/11/02 15:57:16 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuENuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuENuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuENuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuENuclearCrossSection.cc,v 1.2 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuMuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuMuNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuMuNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QANuMuNuclearCrossSection.cc,v 1.11 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QAtomicElectronScattering.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QAtomicElectronScattering.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QAtomicElectronScattering.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QAtomicElectronScattering.cc,v 1.2 2006/12/13 15:45:19 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QAtomicElectronScattering.cc,v 1.4 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QAtomicElectronScattering class -----------------
@@ -41,5 +41,5 @@
 
 G4QAtomicElectronScattering::G4QAtomicElectronScattering(const G4String& processName):
- G4VDiscreteProcess(processName)
+ G4VDiscreteProcess(processName, fElectromagnetic)
 {
 #ifdef debug
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCaptureAtRest.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCaptureAtRest.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCaptureAtRest.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCaptureAtRest.cc,v 1.13 2007/10/02 10:00:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QCaptureAtRest.cc,v 1.19 2009/01/24 11:57:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCaptureAtRest class -----------------
@@ -41,8 +41,10 @@
 
 #include "G4QCaptureAtRest.hh"
+#include "G4HadronicProcessStore.hh"
 
 G4QCaptureAtRest::G4QCaptureAtRest(const G4String& processName)
-  : G4VRestProcess(processName), Time(0.), EnergyDeposition(0.)
+  : G4VRestProcess(processName, fHadronic), Time(0.), EnergyDeposition(0.)
 {
+  SetProcessSubType(fCapture);
 #ifdef debug
   G4cout<<"G4QCaptureAtRest::Constructor is called"<<G4endl;
@@ -54,4 +56,5 @@
   G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime);  // Hadronic parameters
   G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture
+  G4HadronicProcessStore::Instance()->RegisterExtraProcess(this);
 }
 
@@ -102,5 +105,8 @@
 
 G4QCaptureAtRest::~G4QCaptureAtRest()
-{}
+{
+  // deregister in the store
+  G4HadronicProcessStore::Instance()->DeRegisterExtraProcess(this);
+}
 
 G4LorentzVector G4QCaptureAtRest::GetEnegryMomentumConservation()
@@ -131,4 +137,14 @@
 #endif
   return false;
+}
+
+void G4QCaptureAtRest::PreparePhysicsTable(const G4ParticleDefinition& p) 
+{
+  G4HadronicProcessStore::Instance()->RegisterParticleForExtraProcess(this, &p);
+}
+
+void G4QCaptureAtRest::BuildPhysicsTable(const G4ParticleDefinition& p) 
+{
+  G4HadronicProcessStore::Instance()->PrintInfo(&p);
 }
 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCoherentChargeExchange.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCoherentChargeExchange.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCoherentChargeExchange.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCoherentChargeExchange.cc,v 1.5 2007/10/02 10:00:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QCoherentChargeExchange.cc,v 1.7 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCoherentChargeExchange class -----------------
@@ -52,5 +52,5 @@
 // Constructor
 G4QCoherentChargeExchange::G4QCoherentChargeExchange(const G4String& processName)
-  : G4VDiscreteProcess(processName)
+  : G4VDiscreteProcess(processName, fHadronic)
 {
 #ifdef debug
@@ -58,5 +58,5 @@
 #endif
   if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
-
+  SetProcessSubType(fChargeExchange);
   //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
 }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCollision.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCollision.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCollision.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QCollision.cc,v 1.24.2.2 2008/05/07 13:47:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QCollision.cc,v 1.28 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QCollision class -----------------
@@ -48,5 +48,6 @@
 std::vector<std::vector<G4double>*>G4QCollision::IsoProbInEl;//SumProbabIsotopes inElementI
 
-G4QCollision::G4QCollision(const G4String& processName) : G4VDiscreteProcess(processName)
+G4QCollision::G4QCollision(const G4String& processName): 
+ G4VDiscreteProcess(processName, fHadronic)
 {
 #ifdef debug
@@ -54,5 +55,5 @@
 #endif
   if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
-
+  SetProcessSubType(fHadronInelastic);
   //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPSWorld (234 part.max)
   G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffraction.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffraction.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffraction.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QDiffraction.cc,v 1.3 2007/10/02 10:00:37 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QDiffraction.cc,v 1.5 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QDiffraction class -----------------
@@ -51,5 +51,6 @@
 
 // Constructor
-G4QDiffraction::G4QDiffraction(const G4String& processName):G4VDiscreteProcess(processName)
+G4QDiffraction::G4QDiffraction(const G4String& processName):
+ G4VDiscreteProcess(processName, fHadronic)
 {
 #ifdef debug
@@ -57,5 +58,5 @@
 #endif
   if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
-
+  SetProcessSubType(fHadronInelastic);
   G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
 }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffractionRatio.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffractionRatio.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffractionRatio.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QDiffractionRatio.cc,v 1.7.2.1 2008/04/23 14:57:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QDiffractionRatio.cc,v 1.9 2008/03/21 21:40:08 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiscProcessMixer.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiscProcessMixer.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiscProcessMixer.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QDiscProcessMixer.cc,v 1.2 2007/08/31 09:36:57 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QDiscProcessMixer.cc,v 1.4 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QDiscProcessMixer class -----------------
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElastic.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElastic.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElastic.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QElastic.cc,v 1.25 2007/11/15 09:36:43 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QElastic.cc,v 1.27 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QElastic class -----------------
@@ -51,5 +51,6 @@
 
 // Constructor
-G4QElastic::G4QElastic(const G4String& processName) : G4VDiscreteProcess(processName)
+G4QElastic::G4QElastic(const G4String& processName): 
+ G4VDiscreteProcess(processName, fHadronic)
 {
 #ifdef debug
@@ -57,5 +58,5 @@
 #endif
   if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
-
+  SetProcessSubType(fHadronElastic);
   //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
 }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElasticCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElasticCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElasticCrossSection.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QElasticCrossSection.cc,v 1.33.2.1 2008/04/23 14:57:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QElasticCrossSection.cc,v 1.36 2008/03/21 21:42:44 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElectronNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElectronNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElectronNuclearCrossSection.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QElectronNuclearCrossSection.cc,v 1.11.10.1 2008/04/23 14:57:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QElectronNuclearCrossSection.cc,v 1.13 2008/10/24 19:25:41 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -267,20 +267,20 @@
   //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
   G4double mT= 0.;
-  if(G4NucleiPropertiesTable::IsInTable(Z,A))
-                                            mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
+  if(G4NucleiProperties::IsInStableTable(A,Z))
+                               mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
   else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
   // ---------
   G4double mP= infEn;
   //if(Z) mP= G4QPDGCode(111).GetNuclMass(Z-1,N,0);
-  if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
-     	    mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
+  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
+     	    mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
   G4double mN= infEn;
   //if(N) mN= G4QPDGCode(111).GetNuclMass(Z,N-1,0);
-  if(N&&G4NucleiPropertiesTable::IsInTable(Z,A-1))
-    	    mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
+  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
+    	    mN = G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
 
   G4double mA= infEn;
-  if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
-     	    mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
+  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
+     	    mA = G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
 
   G4double dP= mP +mProt - mT;
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QGluonString.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QGluonString.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QGluonString.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QGluonString.cc,v 1.1 2006/10/30 10:33:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QGluonString.cc,v 1.3 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QGluonString class -----------------
@@ -47,5 +47,6 @@
 std::vector<std::vector<G4double>*>G4QGluonString::IsoProbInEl;//SumProbabIsotopeInElementI
 
-G4QGluonString::G4QGluonString(const G4String& processName):G4VDiscreteProcess(processName)
+G4QGluonString::G4QGluonString(const G4String& processName):
+ G4VDiscreteProcess(processName, fHadronic)
 {
 #ifdef debug
@@ -53,5 +54,5 @@
 #endif
   if (verboseLevel>0) G4cout<<GetProcessName()<<" process is created by CHIPS"<<G4endl;
-
+  SetProcessSubType(fHadronInelastic);
   G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World with 234 particles
   G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QIonIonCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QIonIonCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QIonIonCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 19-Aug-07
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QLowEnergy.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QLowEnergy.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QLowEnergy.cc	(revision 962)
@@ -24,6 +24,6 @@
 // ********************************************************************
 //
-// $Id: G4QLowEnergy.cc,v 1.4.2.1 2008/04/23 14:57:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QLowEnergy.cc,v 1.7 2008/10/02 21:10:07 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //      ---------------- G4QLowEnergy class -----------------
@@ -52,5 +52,5 @@
 // Constructor
 G4QLowEnergy::G4QLowEnergy(const G4String& processName):
-  G4VDiscreteProcess(processName), evaporate(true)
+  G4VDiscreteProcess(processName, fHadronic), evaporate(true)
 {
 #ifdef debug
@@ -58,5 +58,5 @@
 #endif
   if (verboseLevel>0) G4cout<<GetProcessName()<<" process is created "<<G4endl;
-
+  SetProcessSubType(fHadronInelastic);
   G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
 }
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QMuonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QMuonNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QMuonNuclearCrossSection.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QMuonNuclearCrossSection.cc,v 1.11.10.1 2008/04/23 14:57:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QMuonNuclearCrossSection.cc,v 1.13 2008/10/24 19:24:59 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -271,18 +271,18 @@
   //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
   G4double mT= 0.;
-  if(G4NucleiPropertiesTable::IsInTable(Z,A))
-                                            mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
+  if(G4NucleiProperties::IsInStableTable(A,Z))
+                            mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
   else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
   // --------- Splitting thresholds
   G4double mP= infEn;
-  if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
-     	    mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
+  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
+     	    mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
 
   G4double mN= infEn;
-  if(N&&G4NucleiPropertiesTable::IsInTable(Z-0,A-1))
-    	    mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
+  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
+    	    mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
 
   G4double mA= infEn;
-  if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
+  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
      	    mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNeutronNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNeutronNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNeutronNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuENuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuENuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuENuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuENuclearCrossSection.cc,v 1.2 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuMuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuMuNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuMuNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuMuNuclearCrossSection.cc,v 1.12 2007/11/01 16:09:38 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuNuNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuNuNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuNuNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4QNuNuNuclearCrossSection.cc,v 1.2 2007/11/02 15:57:16 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QPhotonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QPhotonNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QPhotonNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -262,16 +262,16 @@
   //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
   G4double mT= 0.;
-  if(G4NucleiPropertiesTable::IsInTable(Z,A))
-                                            mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
+  if(G4NucleiProperties::IsInStableTable(A,Z))
+                           mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
   G4double mP= infEn;
-  if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
-     	    mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
+  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
+     	    mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
 
   G4double mN= infEn;
-  if(N&&G4NucleiPropertiesTable::IsInTable(Z-0,A-1))
-    	    mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
+  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
+    	    mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
 
   G4double mA= infEn;
-  if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
+  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
      	    mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
 
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QProtonNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QProtonNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QProtonNuclearCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QTauNuclearCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QTauNuclearCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QTauNuclearCrossSection.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QTauNuclearCrossSection.cc,v 1.10 2006/12/04 10:44:22 mkossov Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4QTauNuclearCrossSection.cc,v 1.11 2008/10/24 19:24:29 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -269,19 +269,19 @@
   //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
   G4double mT= 0.;
-  if(G4NucleiPropertiesTable::IsInTable(Z,A))
-                                            mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
+  if(G4NucleiProperties::IsInStableTable(A,Z))
+                             mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
   else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
   // --------- Splitting thresholds
   G4double mP= infEn;
-  if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
-     	    mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
+  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
+     	    mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
 
   G4double mN= infEn;
-  if(N&&G4NucleiPropertiesTable::IsInTable(Z,A-1))
-    	    mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
+  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
+    	    mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
 
   G4double mA= infEn;
-  if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
-     	    mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
+  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
+     	    mA = G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
 
   G4double dP= mP +mProt - mT;
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QuasiFreeRatios.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QuasiFreeRatios.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QuasiFreeRatios.cc	(revision 962)
@@ -25,6 +25,6 @@
 //
 //
-// $Id: G4QuasiFreeRatios.cc,v 1.16.2.1 2008/04/23 14:57:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4QuasiFreeRatios.cc,v 1.19 2008/03/21 21:44:39 dennis Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
Index: trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc
===================================================================
--- trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc	(revision 819)
+++ trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc	(revision 962)
@@ -26,5 +26,5 @@
 //
 // $Id: G4VQCrossSection.cc,v 1.14 2007/11/15 09:36:43 mkossov Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
