Index: trunk/source/processes/hadronic/models/cascade/History
===================================================================
--- trunk/source/processes/hadronic/models/cascade/History	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/History	(revision 1337)
@@ -1,3 +1,3 @@
-$Id: History,v 1.90 2010/06/08 06:34:43 stesting Exp $
+$Id: History,v 1.91 2010/06/11 17:07:23 mkelsey Exp $
 -------------------------------------------------------------------
 
@@ -16,5 +16,12 @@
      ---------------------------------------------------------------
 
-08 June 2010 Gunter Folger  (hadr-casc-V09-03-42)
+11 June 2010 Michael Keley (hadr-casc-V09-03-43)
+------------------------------------------------
+- G4CascadeData.hh:  Equally trivial fix for compiler warking on Intel ICC
+  for index[] array bounds in ::initialize().  Dimension array as [9], and
+  set all values.
+
+08 June 2010 Gunter Folger (hadr-casc-V09-03-42)
+------------------------------------------------
 -  trivial fix for compiler warning on gcc43 on empty body in for(...) in  
     cascade/include/G4CascadeInterpolator.icc:67
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4BigBanger.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4BigBanger.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4BigBanger.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4BigBanger.hh,v 1.13 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4BigBanger.hh,v 1.14 2010/06/25 09:41:48 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directive and unnecessary #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadParticle.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadParticle.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadParticle.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4CASCAD_PARTICLE_HH
-#define G4CASCAD_PARTICLE_HH
 //
 // ********************************************************************
@@ -25,10 +23,14 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadParticle.hh,v 1.14 2010/03/16 22:10:26 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadParticle.hh,v 1.15 2010/06/25 09:41:50 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
 // 20100126  M. Kelsey -- Replace vector<G4Double> position with G4ThreeVector,
 //		move ::print() to .cc file, fix uninitialized data members
+
+#ifndef G4CASCAD_PARTICLE_HH
+#define G4CASCAD_PARTICLE_HH
 
 #include "G4InuclElementaryParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeChannel.hh,v 1.6 2010/05/15 04:25:17 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeChannel.hh,v 1.7 2010/06/25 09:41:52 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100514  M. Kelsey -- All functionality removed except quantum-number
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeData.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeData.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeData.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeData.hh,v 1.5 2010/05/16 05:18:36 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeData.hh,v 1.7 2010/06/25 09:41:54 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Use template arguments to dimension const-refs
@@ -32,4 +33,6 @@
 //		from measured inclusive (tot) cross-sections.  Add two
 //		ctors to pass inclusive xsec array as input (for piN/NN).
+// 20100611  M. Kelsey -- Work around Intel ICC compiler warning about
+//		index[] subscripts out of range.  Dimension to full [9].
 
 #ifndef G4_CASCADE_DATA_HH
@@ -50,5 +53,5 @@
   enum { NM=N9?8:N8?7:6, NXS=N29 };	// Multiplicity and cross-section bins
 
-  G4int index[NM+1];			// Start and stop indices to xsec's
+  G4int index[9];			// Start and stop indices to xsec's
   G4double multiplicities[NM][NE];	// Multiplicity distributions
 
@@ -115,7 +118,6 @@
   // Initialize index offsets for cross-section array (can't do globally)
   index[0] = 0;   index[1] = N02; index[2] = N23; index[3] = N24;
-  index[4] = N25; index[5] = N26; index[6] = N27; 
-  if (NM>6) index[7]=N28;
-  if (NM>7) index[8]=N29;
+  index[4] = N25; index[5] = N26; index[6] = N27; index[7] = N28;
+  index[8] = N29;
 
   // Initialize multiplicity array
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeFunctions.hh,v 1.5 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeFunctions.hh,v 1.6 2010/06/25 09:41:56 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100407  M. Kelsey -- Return particle types std::vector<> by const ref,
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.icc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.icc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeFunctions.icc	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_FUNCTIONS_ICC
-#define G4_CASCADE_FUNCTIONS_ICC
 //
 // ********************************************************************
@@ -25,9 +23,13 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeFunctions.icc,v 1.2 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeFunctions.icc,v 1.3 2010/06/25 09:41:58 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100512  M. Kelsey -- Pass std::vector<> buffer as argument to
 //		getOutgoingPartTypes().
+
+#ifndef G4_CASCADE_FUNCTIONS_ICC
+#define G4_CASCADE_FUNCTIONS_ICC
 
 
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4CASCADE_INTERPOLATOR_HH
-#define G4CASCADE_INTERPOLATOR_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeInterpolator.hh,v 1.1 2010/05/14 18:01:28 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeInterpolator.hh,v 1.2 2010/06/25 09:42:00 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // Author:  Michael Kelsey <kelsey@slac.stanford.edu>
@@ -39,4 +38,7 @@
 // is the bin index, and the fractional part is, obviously, the
 // fractional part.
+
+#ifndef G4CASCADE_INTERPOLATOR_HH
+#define G4CASCADE_INTERPOLATOR_HH
 
 #include "globals.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.icc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.icc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.icc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeInterpolator.icc,v 1.5 2010/06/08 06:29:34 stesting Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeInterpolator.icc,v 1.6 2010/06/25 09:42:02 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // Author:  Michael Kelsey <kelsey@slac.stanford.edu>
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKminusNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKminusNChannel.hh,v 1.7 2010/06/25 09:42:04 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKminusPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKminusPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKminusPChannel.hh,v 1.7 2010/06/25 09:42:06 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKplusNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKplusNChannel.hh,v 1.7 2010/06/25 09:42:08 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKplusPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKplusPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKplusPChannel.hh,v 1.7 2010/06/25 09:42:10 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKzeroBarNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKzeroBarNChannel.hh,v 1.7 2010/06/25 09:42:12 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroBarPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKzeroBarPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKzeroBarPChannel.hh,v 1.7 2010/06/25 09:42:14 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKzeroNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKzeroNChannel.hh,v 1.7 2010/06/25 09:42:16 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeKzeroPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKzeroPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKzeroPChannel.hh,v 1.7 2010/06/25 09:42:18 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeLambdaNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeLambdaNChannel.hh,v 1.7 2010/06/25 09:42:20 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeLambdaPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeLambdaPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeLambdaPChannel.hh,v 1.7 2010/06/25 09:42:22 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh	(revision 1337)
@@ -25,5 +25,5 @@
 //
 // $Id: G4CascadeMomentum.hh,v 1.5 2010/03/16 22:10:26 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // Class G4CascadeMomentum
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNNChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_NN_CHANNEL_HH
-#define G4_CASCADE_NN_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeNNChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeNNChannel.hh,v 1.3 2010/06/25 09:42:24 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_NN_CHANNEL_HH
+#define G4_CASCADE_NN_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeNPChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_NP_CHANNEL_HH
-#define G4_CASCADE_NP_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeNPChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeNPChannel.hh,v 1.3 2010/06/25 09:42:26 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_NP_CHANNEL_HH
+#define G4_CASCADE_NP_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePPChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PP_CHANNEL_HH
-#define G4_CASCADE_PP_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePPChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePPChannel.hh,v 1.3 2010/06/25 09:42:28 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PP_CHANNEL_HH
+#define G4_CASCADE_PP_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusNChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIMINUSN_CHANNEL_HH
-#define G4_CASCADE_PIMINUSN_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiMinusNChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiMinusNChannel.hh,v 1.3 2010/06/25 09:42:30 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIMINUSN_CHANNEL_HH
+#define G4_CASCADE_PIMINUSN_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiMinusPChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIMINUSP_CHANNEL_HH
-#define G4_CASCADE_PIMINUSP_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiMinusPChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiMinusPChannel.hh,v 1.3 2010/06/25 09:42:32 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIMINUSP_CHANNEL_HH
+#define G4_CASCADE_PIMINUSP_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusNChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIPLUSN_CHANNEL_HH
-#define G4_CASCADE_PIPLUSN_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiPlusNChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiPlusNChannel.hh,v 1.3 2010/06/25 09:42:34 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIPLUSN_CHANNEL_HH
+#define G4_CASCADE_PIPLUSN_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiPlusPChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIPLUSP_CHANNEL_HH
-#define G4_CASCADE_PIPLUSP_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiPlusPChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiPlusPChannel.hh,v 1.3 2010/06/25 09:42:36 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIPLUSP_CHANNEL_HH
+#define G4_CASCADE_PIPLUSP_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroNChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIZERON_CHANNEL_HH
-#define G4_CASCADE_PIZERON_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiZeroNChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiZeroNChannel.hh,v 1.3 2010/06/25 09:42:38 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIZERON_CHANNEL_HH
+#define G4_CASCADE_PIZERON_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadePiZeroPChannel.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_PIZEROP_CHANNEL_HH
-#define G4_CASCADE_PIZEROP_CHANNEL_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadePiZeroPChannel.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadePiZeroPChannel.hh,v 1.3 2010/06/25 09:42:40 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4_CASCADE_PIZEROP_CHANNEL_HH
+#define G4_CASCADE_PIZEROP_CHANNEL_HH
 
 #include "G4CascadeData.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_CASCADE_SAMPLER_HH
-#define G4_CASCADE_SAMPLER_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSampler.hh,v 1.2 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSampler.hh,v 1.3 2010/06/25 09:42:42 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100506  M. Kelsey -- Move functionality of G4CascadeChannel here,
@@ -32,4 +31,7 @@
 // 20100512  M. Kelsey -- Make this templated on energy and multiplicity
 //		binning, as base to new sampler.
+
+#ifndef G4_CASCADE_SAMPLER_HH
+#define G4_CASCADE_SAMPLER_HH
 
 #include <vector>
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.icc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.icc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSampler.icc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSampler.icc,v 1.2 2010/05/21 18:26:16 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSampler.icc,v 1.3 2010/06/25 09:42:44 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100506 M. Kelsey -- Move functionity of G4CascadeChannel here,
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaMinusNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaMinusNChannel.hh,v 1.7 2010/06/25 09:42:46 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaMinusPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaMinusPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaMinusPChannel.hh,v 1.7 2010/06/25 09:42:48 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaPlusNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaPlusNChannel.hh,v 1.7 2010/06/25 09:42:50 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaPlusPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaPlusPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaPlusPChannel.hh,v 1.7 2010/06/25 09:42:52 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaZeroNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaZeroNChannel.hh,v 1.7 2010/06/25 09:42:54 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeSigmaZeroPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeSigmaZeroPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeSigmaZeroPChannel.hh,v 1.7 2010/06/25 09:42:56 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeXiMinusNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeXiMinusNChannel.hh,v 1.7 2010/06/25 09:42:58 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiMinusPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeXiMinusPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeXiMinusPChannel.hh,v 1.7 2010/06/25 09:43:00 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroNChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroNChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroNChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeXiZeroNChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeXiZeroNChannel.hh,v 1.7 2010/06/25 09:43:02 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroPChannel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroPChannel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeXiZeroPChannel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeXiZeroPChannel.hh,v 1.6 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeXiZeroPChannel.hh,v 1.7 2010/06/25 09:43:04 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Remove redundant total-bins template argument
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4CollisionOutput.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4CollisionOutput.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4CollisionOutput.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CollisionOutput.hh,v 1.20 2010/05/21 18:07:30 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CollisionOutput.hh,v 1.20.2.1 2010/06/25 09:43:06 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4Dineutron.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4Dineutron.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4Dineutron.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4DINEUTRON_HH
-#define G4DINEUTRON_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Dineutron.hh,v 1.3 2010/04/13 05:30:10 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Dineutron.hh,v 1.4 2010/06/25 09:43:08 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
@@ -36,4 +35,7 @@
 //	13 Apr 2010:  Per Kurashige, inherit from G4VShortLivedParticle.
 // ----------------------------------------------------------------
+
+#ifndef G4DINEUTRON_HH
+#define G4DINEUTRON_HH
 
 #include "G4VShortLivedParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4Diproton.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4Diproton.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4Diproton.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4DIPROTON_HH
-#define G4DIPROTON_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Diproton.hh,v 1.3 2010/04/13 05:30:10 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Diproton.hh,v 1.4 2010/06/25 09:43:10 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
@@ -36,4 +35,7 @@
 //	13 Apr 2010:  Per Kurashige, inherit from G4VShortLivedParticle.
 // ----------------------------------------------------------------
+
+#ifndef G4DIPROTON_HH
+#define G4DIPROTON_HH
 
 #include "G4VShortLivedParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4ElementaryParticleCollider.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4ElementaryParticleCollider.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4ElementaryParticleCollider.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4ElementaryParticleCollider.hh,v 1.31 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4ElementaryParticleCollider.hh,v 1.32 2010/06/25 09:43:12 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4EquilibriumEvaporator.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4EquilibriumEvaporator.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4EquilibriumEvaporator.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4EquilibriumEvaporator.hh,v 1.11 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4EquilibriumEvaporator.hh,v 1.11.2.1 2010/06/25 09:43:14 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100413  M. Kelsey -- Pass G4CollisionOutput by ref to ::collide()
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4EvaporationInuclCollider.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4EvaporationInuclCollider.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4EvaporationInuclCollider.hh	(revision 1337)
@@ -25,5 +25,5 @@
 //
 // $Id: G4EvaporationInuclCollider.hh,v 1.5 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directive and unnecessary #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4Fissioner.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4Fissioner.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4Fissioner.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Fissioner.hh,v 1.12 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Fissioner.hh,v 1.13 2010/06/25 09:43:16 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directive and unnecessary #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InteractionCase.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InteractionCase.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InteractionCase.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InteractionCase.hh,v 1.11 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InteractionCase.hh,v 1.12 2010/06/25 09:43:18 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100518  M. Kelsey -- Why use std::pair<> at all?  Never exported; just
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4IntraNucleiCascader.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4IntraNucleiCascader.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4IntraNucleiCascader.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4IntraNucleiCascader.hh,v 1.10 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4IntraNucleiCascader.hh,v 1.10.2.1 2010/06/25 09:43:20 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directory and unnecessary #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclCollider.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclCollider.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclCollider.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclCollider.hh,v 1.13 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclCollider.hh,v 1.13.2.1 2010/06/25 09:43:22 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100413  M. Kelsey -- Pass G4CollisionOutput by ref to ::collide()
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclElementaryParticle.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclElementaryParticle.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclElementaryParticle.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4INUCL_ELEMENTARY_PARTICLE_HH
-#define G4INUCL_ELEMENTARY_PARTICLE_HH
 //
 // ********************************************************************
@@ -25,10 +23,14 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclElementaryParticle.hh,v 1.22 2010/04/29 19:39:55 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclElementaryParticle.hh,v 1.23 2010/06/25 09:43:24 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
 // 20100409  M. Kelsey -- Drop unused string argument from ctors.
 // 20100429  M. Kelsey -- Change "photon()" to "isPhoton()", use enum names
+
+#ifndef G4INUCL_ELEMENTARY_PARTICLE_HH
+#define G4INUCL_ELEMENTARY_PARTICLE_HH
 
 #include "G4InuclParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclNuclei.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4INUCL_NUCLEI_HH
-#define G4INUCL_NUCLEI_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclNuclei.hh,v 1.16 2010/04/09 19:33:11 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclNuclei.hh,v 1.17 2010/06/25 09:43:26 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  Michael Kelsey -- Replace G4CascadeMomentum with G4LorentzVector
@@ -33,4 +32,7 @@
 // 20100319  M. Kelsey -- Remove "using" directory and unnecessary #includes.
 // 20100409  M. Kelsey -- Drop unused string argument from ctors.
+
+#ifndef G4INUCL_NUCLEI_HH
+#define G4INUCL_NUCLEI_HH
 
 #include "G4InuclParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticle.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticle.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticle.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4INUCL_PARTICLE_HH
-#define G4INUCL_PARTICLE_HH
 //
 // ********************************************************************
@@ -25,10 +23,14 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclParticle.hh,v 1.19 2010/05/21 18:07:30 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclParticle.hh,v 1.20 2010/06/25 09:43:28 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
 // 20100409  M. Kelsey -- Drop unused string argument from ctors.
 // 20100519  M. Kelsey -- Add public access to G4DynamicParticle content
+
+#ifndef G4INUCL_PARTICLE_HH
+#define G4INUCL_PARTICLE_HH
 
 #include "G4DynamicParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticleNames.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticleNames.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclParticleNames.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4INUCL_PARTICLE_NAMES_HH
-#define G4INUCL_PARTICLE_NAMES_HH
 //
 // ********************************************************************
@@ -25,10 +23,14 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclParticleNames.hh,v 1.2 2010/04/29 19:39:55 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclParticleNames.hh,v 1.3 2010/06/25 09:43:30 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // Defines enums to map G4InuclElementaryParticle type codes to human
 // readable names.  Meant to replace similar local enums scattered through
 // the code.
+
+#ifndef G4INUCL_PARTICLE_NAMES_HH
+#define G4INUCL_PARTICLE_NAMES_HH
 
 namespace G4InuclParticleNames {
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclSpecialFunctions.hh,v 1.16 2010/04/13 05:30:10 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclSpecialFunctions.hh,v 1.17 2010/06/25 09:43:32 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4KaonHypSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4KaonHypSampler.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4KaonHypSampler.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_KAON_HYP_SAMPLER_HH
-#define G4_KAON_HYP_SAMPLER_HH
 //
 // ********************************************************************
@@ -25,8 +23,12 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4KaonHypSampler.hh,v 1.1 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4KaonHypSampler.hh,v 1.2 2010/06/25 09:43:34 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100512  M. Kelsey -- Replaces (old, untemplated) G4CascadeSampler
+
+#ifndef G4_KAON_HYP_SAMPLER_HH
+#define G4_KAON_HYP_SAMPLER_HH
 
 
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4LorentzConvertor.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4LorentzConvertor.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4LorentzConvertor.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4LorentzConvertor.hh,v 1.15 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4LorentzConvertor.hh,v 1.15.2.1 2010/06/25 09:43:36 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100108  Michael Kelsey -- Use G4LorentzVector internally
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4NonEquilibriumEvaporator.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4NonEquilibriumEvaporator.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4NonEquilibriumEvaporator.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NonEquilibriumEvaporator.hh,v 1.10 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NonEquilibriumEvaporator.hh,v 1.11 2010/06/25 09:43:38 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directive and unnecessary #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4NuclWatcher.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4NuclWatcher.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4NuclWatcher.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4NUCL_WATCHER_HH
-#define G4NUCL_WATCHER_HH
 //
 // ********************************************************************
@@ -25,9 +23,13 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NuclWatcher.hh,v 1.13 2010/04/07 18:23:15 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NuclWatcher.hh,v 1.14 2010/06/25 09:43:40 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100202  M. Kelsey -- Move most code into .cc file
 // 20100405  M. Kelsey -- Pass const-ref std::vector<>
+
+#ifndef G4NUCL_WATCHER_HH
+#define G4NUCL_WATCHER_HH
 
 #include "G4Types.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleiModel.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleiModel.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleiModel.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NucleiModel.hh,v 1.25 2010/05/21 17:44:38 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NucleiModel.hh,v 1.25.2.1 2010/06/25 09:43:42 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100319  M. Kelsey -- Remove "using" directory and unnecessary #includes,
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerBeta.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerBeta.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerBeta.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4ParticleLargerBeta_h
-#define G4ParticleLargerBeta_h
 //
 // ********************************************************************
@@ -25,9 +23,13 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4ParticleLargerBeta.hh,v 1.6 2010/05/15 04:25:17 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4ParticleLargerBeta.hh,v 1.7 2010/06/25 09:43:44 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  M. Kelsey -- Add additional operator() which uses pointers,
 //		also fix bug which returns wrong result
+
+#ifndef G4ParticleLargerBeta_h
+#define G4ParticleLargerBeta_h
 
 #include "G4InuclElementaryParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerEkin.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerEkin.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4ParticleLargerEkin.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4PARTICLE_LARGER_EKIN_HH
-#define G4PARTICLE_LARGER_EKIN_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4ParticleLargerEkin.hh,v 1.11 2010/05/15 04:25:17 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4ParticleLargerEkin.hh,v 1.12 2010/06/25 09:43:46 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // Implements a *reverse* sorting: std::sort expects a less-than operator
@@ -32,4 +31,7 @@
 //
 // 20091125  M. Kelsey -- Add additional operator() which uses pointers
+
+#ifndef G4PARTICLE_LARGER_EKIN_HH
+#define G4PARTICLE_LARGER_EKIN_HH
 
 #include "G4InuclElementaryParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionNucSampler.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionNucSampler.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4PionNucSampler.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4_PION_NUC_SAMPLER_HH
-#define G4_PION_NUC_SAMPLER_HH
 //
 // ********************************************************************
@@ -25,8 +23,12 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4PionNucSampler.hh,v 1.1 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4PionNucSampler.hh,v 1.2 2010/06/25 09:43:48 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100512  M. Kelsey -- Replaces G4FinalStateSampler
+
+#ifndef G4_PION_NUC_SAMPLER_HH
+#define G4_PION_NUC_SAMPLER_HH
 
 #include "G4CascadeSampler.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4PreCompoundInuclCollider.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4PreCompoundInuclCollider.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4PreCompoundInuclCollider.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4PreCompoundInuclCollider.hh,v 1.6 2010/05/21 17:56:34 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4PreCompoundInuclCollider.hh,v 1.7 2010/06/25 09:43:50 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100315  M. Kelsey -- Remove "using" directive and unneeded #includes.
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4UnboundPN.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4UnboundPN.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4UnboundPN.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4UNBOUNDPN_HH
-#define G4UNBOUNDPN_HH
 //
 // ********************************************************************
@@ -25,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4UnboundPN.hh,v 1.3 2010/04/13 05:30:10 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4UnboundPN.hh,v 1.4 2010/06/25 09:43:52 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
@@ -36,4 +35,7 @@
 //	13 Apr 2010:  Per Kurashige, inherit from G4VShortLivedParticle.
 // ----------------------------------------------------------------
+
+#ifndef G4UNBOUNDPN_HH
+#define G4UNBOUNDPN_HH
 
 #include "G4VShortLivedParticle.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4VCascadeCollider.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4VCascadeCollider.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4VCascadeCollider.hh	(revision 1337)
@@ -1,4 +1,2 @@
-#ifndef G4V_CASCADE_COLLIDER_HH
-#define G4V_CASCADE_COLLIDER_HH
 //
 // ********************************************************************
@@ -25,6 +23,10 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4VCascadeCollider.hh,v 1.1 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4VCascadeCollider.hh,v 1.1.2.1 2010/06/25 09:43:54 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
+
+#ifndef G4V_CASCADE_COLLIDER_HH
+#define G4V_CASCADE_COLLIDER_HH
 
 #include "globals.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/include/G4WatcherGun.hh
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/include/G4WatcherGun.hh	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/include/G4WatcherGun.hh	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4WatcherGun.hh,v 1.9 2010/04/08 15:48:00 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4WatcherGun.hh,v 1.10 2010/06/25 09:43:56 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100407  M. Kelsey -- Return const-ref to avoid copy overhead.
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4BigBanger.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4BigBanger.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4BigBanger.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4BigBanger.cc,v 1.29 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4BigBanger.cc,v 1.30 2010/06/25 09:43:58 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadParticle.cc,v 1.14 2010/03/16 22:10:26 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadParticle.cc,v 1.15 2010/06/25 09:44:00 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeChannel.cc,v 1.7 2010/05/15 04:25:17 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeChannel.cc,v 1.8 2010/06/25 09:44:02 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100514  M. Kelsey -- All functionality removed except quantum-number
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeInterface.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeInterface.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeInterface.cc,v 1.77 2010/05/21 18:07:30 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeInterface.cc,v 1.77.2.1 2010/06/25 09:44:04 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeKzeroBarNChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeKzeroBarNChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeKzeroBarNChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeKzeroBarNChannel.cc,v 1.5 2010/05/16 05:18:36 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeKzeroBarNChannel.cc,v 1.6 2010/06/25 09:44:06 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadeKzeroBarNChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT0npChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT0npChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT0npChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeT0npChannel.cc,v 1.1 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeT0npChannel.cc,v 1.2 2010/06/25 09:44:08 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadeNPChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT11pizNChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT11pizNChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT11pizNChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeT11pizNChannel.cc,v 1.1 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeT11pizNChannel.cc,v 1.2 2010/06/25 09:44:10 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadePiZeroPChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT1NNChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT1NNChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT1NNChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeT1NNChannel.cc,v 1.1 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeT1NNChannel.cc,v 1.2 2010/06/25 09:44:12 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadePPChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT31piNChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT31piNChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT31piNChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeT31piNChannel.cc,v 1.1 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeT31piNChannel.cc,v 1.2 2010/06/25 09:44:14 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadePiMinusPChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT33piNChannel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT33piNChannel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeT33piNChannel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeT33piNChannel.cc,v 1.1 2010/05/14 21:05:03 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeT33piNChannel.cc,v 1.1.2.1 2010/06/25 09:44:16 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4CascadePiPlusPChannel.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4CollisionOutput.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4CollisionOutput.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4CollisionOutput.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CollisionOutput.cc,v 1.23 2010/05/21 18:07:30 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CollisionOutput.cc,v 1.23.2.1 2010/06/25 09:44:18 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4Dineutron.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4Dineutron.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4Dineutron.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Dineutron.cc,v 1.4 2010/05/06 20:46:04 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Dineutron.cc,v 1.5 2010/06/25 09:44:20 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4Diproton.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4Diproton.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4Diproton.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Diproton.cc,v 1.4 2010/05/06 20:46:04 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Diproton.cc,v 1.5 2010/06/25 09:44:22 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4ElementaryParticleCollider.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4ElementaryParticleCollider.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4ElementaryParticleCollider.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4ElementaryParticleCollider.cc,v 1.64 2010/05/21 18:26:16 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4ElementaryParticleCollider.cc,v 1.64.2.1 2010/06/25 09:44:24 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4EquilibriumEvaporator.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4EquilibriumEvaporator.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4EquilibriumEvaporator.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4EquilibriumEvaporator.cc,v 1.32 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4EquilibriumEvaporator.cc,v 1.32.2.1 2010/06/25 09:44:26 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4EvaporationInuclCollider.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4EvaporationInuclCollider.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4EvaporationInuclCollider.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4EvaporationInuclCollider.cc,v 1.10 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4EvaporationInuclCollider.cc,v 1.11 2010/06/25 09:44:28 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4Fissioner.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4Fissioner.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4Fissioner.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4Fissioner.cc,v 1.28 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4Fissioner.cc,v 1.28.2.1 2010/06/25 09:44:30 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InteractionCase.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InteractionCase.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InteractionCase.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InteractionCase.cc,v 1.1 2010/05/21 20:43:54 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InteractionCase.cc,v 1.2 2010/06/25 09:44:32 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100518  M. Kelsey -- Move code from Colliders' "bulletTargetSetter()"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4IntraNucleiCascader.cc,v 1.35 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4IntraNucleiCascader.cc,v 1.35.2.1 2010/06/25 09:44:34 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclCollider.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclCollider.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclCollider.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclCollider.cc,v 1.30 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclCollider.cc,v 1.30.2.1 2010/06/25 09:44:36 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclElementaryParticle.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclElementaryParticle.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclElementaryParticle.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclElementaryParticle.cc,v 1.6 2010/04/29 19:39:55 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclElementaryParticle.cc,v 1.7 2010/06/25 09:44:38 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100428  M. Kelsey -- Use G4InuclParticleNames enums instead of numbers,
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclEvaporation.cc,v 1.18 2010/05/21 18:26:16 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclEvaporation.cc,v 1.19 2010/06/25 09:44:40 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclNuclei.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclNuclei.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclNuclei.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclNuclei.cc,v 1.8 2010/04/07 17:28:35 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclNuclei.cc,v 1.8.2.1 2010/06/25 09:44:42 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100301  M. Kelsey -- Add function to create unphysical nuclei for use
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclParticle.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclParticle.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclParticle.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclParticle.cc,v 1.6 2010/04/09 19:33:11 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclParticle.cc,v 1.7 2010/06/25 09:44:44 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100409  M. Kelsey -- Drop unused string argument from ctors.
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclSpecialFunctions.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclSpecialFunctions.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclSpecialFunctions.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4InuclSpecialFunctions.cc,v 1.19 2010/03/19 05:03:23 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4InuclSpecialFunctions.cc,v 1.20 2010/06/25 09:44:46 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4KaonHypSampler.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4KaonHypSampler.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4KaonHypSampler.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4KaonHypSampler.cc,v 1.1 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4KaonHypSampler.cc,v 1.2 2010/06/25 09:44:48 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100512  M. Kelsey -- Replaces (old, untemplated) G4CascadeSampler
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4LorentzConvertor.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4LorentzConvertor.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4LorentzConvertor.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4LorentzConvertor.cc,v 1.23 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4LorentzConvertor.cc,v 1.23.2.1 2010/06/25 09:44:50 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100108  Michael Kelsey -- Use G4LorentzVector internally
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4NonEquilibriumEvaporator.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4NonEquilibriumEvaporator.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4NonEquilibriumEvaporator.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NonEquilibriumEvaporator.cc,v 1.29 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NonEquilibriumEvaporator.cc,v 1.29.2.1 2010/06/25 09:44:52 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4NuclWatcher.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4NuclWatcher.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4NuclWatcher.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NuclWatcher.cc,v 1.2 2010/04/07 18:23:15 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NuclWatcher.cc,v 1.3 2010/06/25 09:44:54 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100202  M. Kelsey -- Move most code here from .hh file, clean up
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4NucleiModel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4NucleiModel.cc,v 1.48 2010/05/26 18:29:28 dennis Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4NucleiModel.cc,v 1.48.2.1 2010/06/25 09:44:56 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionNucSampler.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionNucSampler.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4PionNucSampler.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4PionNucSampler.cc,v 1.1 2010/05/15 00:55:01 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4PionNucSampler.cc,v 1.2 2010/06/25 09:44:58 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100512  M. Kelsey -- Replaces (old, untemplated) G4FinalStateSampler
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundCascadeInterface.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundCascadeInterface.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundCascadeInterface.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4PreCompoundCascadeInterface.cc,v 1.13 2010/05/21 18:07:30 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4PreCompoundCascadeInterface.cc,v 1.13.2.1 2010/06/25 09:45:00 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundInuclCollider.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundInuclCollider.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4PreCompoundInuclCollider.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4PreCompoundInuclCollider.cc,v 1.9 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4PreCompoundInuclCollider.cc,v 1.10 2010/06/25 09:45:02 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4RegionModel.cc,v 1.16 2010/03/19 05:03:23 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4RegionModel.cc,v 1.17 2010/06/25 09:45:04 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100319  M. Kelsey -- Eliminate unnecessary use of std::pow()
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4UnboundPN.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4UnboundPN.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4UnboundPN.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4UnboundPN.cc,v 1.4 2010/05/06 20:46:04 mkelsey Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4UnboundPN.cc,v 1.5 2010/06/25 09:45:06 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // ------------------------------------------------------------
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4VCascadeCollider.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4VCascadeCollider.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4VCascadeCollider.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4VCascadeCollider.cc,v 1.1 2010/05/21 17:56:34 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4VCascadeCollider.cc,v 1.1.2.1 2010/06/25 09:45:08 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 
 #include "G4VCascadeCollider.hh"
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/G4WatcherGun.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/G4WatcherGun.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/G4WatcherGun.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4WatcherGun.cc,v 1.13 2010/04/08 15:48:00 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4WatcherGun.cc,v 1.13.2.1 2010/06/25 09:45:10 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100407  M. Kelsey -- Replace std::vector<>::resize(0) with ::clear(),
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyAsymptotic.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyAsymptotic.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyAsymptotic.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: bindingEnergyAsymptotic.cc,v 1.11 2010/04/08 15:48:00 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: bindingEnergyAsymptotic.cc,v 1.12 2010/06/25 09:45:12 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100202  M. Kelsey -- Eliminate unnecessary use of std::pow()
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyKummel.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyKummel.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/bindingEnergyKummel.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: bindingEnergyKummel.cc,v 1.12 2010/03/19 05:03:23 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: bindingEnergyKummel.cc,v 1.13 2010/06/25 09:45:14 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100202  M. Kelsey -- Eliminate unnecessary use of std::pow()
Index: trunk/source/processes/hadronic/models/cascade/cascade/src/paraMaker.cc
===================================================================
--- trunk/source/processes/hadronic/models/cascade/cascade/src/paraMaker.cc	(revision 1326)
+++ trunk/source/processes/hadronic/models/cascade/cascade/src/paraMaker.cc	(revision 1337)
@@ -23,6 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: paraMaker.cc,v 1.17 2010/06/01 17:20:31 mkelsey Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: paraMaker.cc,v 1.18 2010/06/25 09:45:16 gunter Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100412  M. Kelsey -- Modify paraMaker[Truncated] to take buffer as argument
