Import Geant4 7.0.0 source tree

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

@@ -83,16 +83,14 @@ private:
     std::vector<G4KineticTrack *>::iterator i;
     for(i = aV.begin(); i != aV.end(); ++i)
     {
-       if((*i)->GetDefinition() == G4Proton::Proton())
-       {
-          ++result;
-       }
+       result += G4lrint((*i)->GetDefinition()->GetPDGCharge());
     }
     return result;
   }
   void PrintWelcomeMessage();
   void BuildTargetList();
   void FindCollisions(G4KineticTrackVector * secondaries);
+  void FindDecayCollision(G4KineticTrack * secondary);
   G4bool ApplyCollision(G4CollisionInitialState * collision);
   G4bool Capture(G4bool verbose=false);
   G4bool Absorb();
@@ -133,6 +131,7 @@ private:
   G4CollisionManager * theCollisionMgr;
 
   std::vector<G4BCAction *> theImR;
+  G4BCDecay * theDecay;
   G4VFieldPropagation * thePropagator;
   G4double theCurrentTime;
   G4double theCutOnP;
@@ -140,6 +139,7 @@ private:
   G4LorentzVector theInitial4Mom;
   G4int currentA, currentZ;
   G4double massInNucleus;
+  G4double currentInitialEnergy;   // for debugging
   G4LorentzRotation precompoundLorentzboost;
   G4double theOuterRadius;
   G4bool thePrimaryEscape;

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

@@ -72,8 +72,8 @@ private:
   G4int theA;
   G4int theZ;
   
-  // Vc(A, Z) = 1.44 * Z /(r0*(1 + pow(A, 1/3))) 
-  //          = colomb * Z / (1 + pow(A, 1/3))
+  // Vc(A, Z) = 1.44 * Z /(r0*(1 + std::pow(A, 1/3))) 
+  //          = colomb * Z / (1 + std::pow(A, 1/3))
   static const G4double coulomb;       // coulomb barier constant
   static const G4double a_kaon;        // kaon's potential constant
   static const G4double a_pion;        // pion's potential constant