Import Geant4 10.0.0 source tree

source/processes/hadronic/models/binary_cascade/include/G4GeneratorPrecompoundInterface.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4GeneratorPrecompoundInterface.hh 66812 2013-01-12 16:06:46Z gcosmo $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class header file
@@ -33,6 +33,8 @@
 //      HPW, 10DEC 98, the decay part originally written by Gunter Folger
 //                in his FTF-test-program.
 //
+//      V. Uzhinsky Nov. 2012 
+//      introduced new method PropagateNuclNucl for nucleus-nucleus interactions
 //
 // -----------------------------------------------------------------------------
 //
@@ -68,6 +70,10 @@ public:
   virtual G4ReactionProductVector*
   Propagate(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus);
 
+  virtual G4ReactionProductVector*                               // Uzhi Nov. 2012
+  PropagateNuclNucl(G4KineticTrackVector* theSecondaries, G4V3DNucleus* theNucleus,
+                                                  G4V3DNucleus* theProjectileNucleus);
+
   inline void SetCaptureThreshold(G4double);
 
   virtual void PropagateModelDescription(std::ostream&) const;
@@ -82,6 +88,19 @@ private:
   G4double CaptureThreshold;
   const G4ParticleDefinition* proton;
   const G4ParticleDefinition* neutron;
+
+  const G4ParticleDefinition* deuteron;
+  const G4ParticleDefinition* triton;
+  const G4ParticleDefinition* He3;
+  const G4ParticleDefinition* He4;
+
+  const G4ParticleDefinition* ANTIproton;
+  const G4ParticleDefinition* ANTIneutron;
+
+  const G4ParticleDefinition* ANTIdeuteron;
+  const G4ParticleDefinition* ANTItriton;
+  const G4ParticleDefinition* ANTIHe3;
+  const G4ParticleDefinition* ANTIHe4;
 };
 
 inline

source/processes/hadronic/models/binary_cascade/include/G4KM_DummyField.hh

@@ -50,7 +50,8 @@ public:
   G4KM_DummyField() { }
   ~G4KM_DummyField() { }
 
-  virtual void  GetFieldValue(const G4double [], G4double * ) const { }
+  void  GetFieldValue(const G4double [], G4double * ) const { }
+  G4Field* Clone() const { return new G4KM_DummyField; }
 };
 
 #endif

source/processes/hadronic/models/binary_cascade/include/G4KM_NucleonEqRhs.hh

@@ -55,7 +55,7 @@ public:
 
   virtual void EvaluateRhsGivenB(const G4double y[], const G4double B[3],
 				 G4double dydx[]) const;
-  virtual void SetChargeMomentumMass(G4double particleCharge,
+  virtual void SetChargeMomentumMass(G4ChargeState particleCharge,
 				     G4double MomentumXc,
 				     G4double MassXc2);
   void SetMass(G4double aMass);
@@ -81,12 +81,6 @@ inline void G4KM_NucleonEqRhs::SetMass(G4double aMass)
 inline G4KM_NucleonEqRhs::~G4KM_NucleonEqRhs()
 { }
 
-
-// Here by design, but it is unnecessary for nuclear fields
-inline void
-G4KM_NucleonEqRhs::SetChargeMomentumMass(G4double ,G4double ,G4double )
-{ }
-
 #endif
 
 

source/processes/hadronic/models/binary_cascade/include/G4KM_OpticalEqRhs.hh

@@ -55,7 +55,7 @@ public:
 
   virtual void EvaluateRhsGivenB(const G4double y[], const G4double B[3],
 				 G4double dydx[]) const;
-  virtual void SetChargeMomentumMass(G4double particleCharge,
+  virtual void SetChargeMomentumMass(G4ChargeState particleCharge,
 				     G4double MomentumXc,
 				     G4double MassXc2);
   void SetFactor(G4double mass, G4double opticalParameter);
@@ -66,17 +66,10 @@ private:
   G4double theMass;
 };
 
-
-
-
 inline G4KM_OpticalEqRhs::~G4KM_OpticalEqRhs()
 { }
 
 
-// Here by design, but it is unnecessary for nuclear fields
-inline void G4KM_OpticalEqRhs::SetChargeMomentumMass(G4double ,G4double ,G4double )
-{ }
-
 #endif