Changeset 1315 for trunk/source/processes/hadronic/util/src/G4ReactionDynamics.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/hadronic/util/src/G4ReactionDynamics.cc (modified) (10 diffs)

trunk/source/processes/hadronic/util/src/G4ReactionDynamics.cc

@@ -184 +184 @@
       veryForward = true;
     }
-    const G4double atomicWeight = targetNucleus.GetN();
-    const G4double atomicNumber = targetNucleus.GetZ();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
+    const G4double atomicNumber = G4double(targetNucleus.GetZ_asInt());
     const G4double protonMass = aProton->GetPDGMass()/MeV;
 
@@ -1124 +1124 @@
 
     G4int PinNucleus = std::max(0, 
-      G4int(targetNucleus.GetZ()) - protonsInFinalState);
+      targetNucleus.GetZ_asInt() - protonsInFinalState);
     G4int NinNucleus = std::max(0,
-      G4int(targetNucleus.GetN()-targetNucleus.GetZ()) - neutronsInFinalState);
+      targetNucleus.GetN_asInt() - neutronsInFinalState);
 
     pseudoParticle[3].SetMomentum( 0.0, 0.0, pOriginal*GeV );
@@ -1356 +1356 @@
     for (G4int i = 0; i < vecLen; i++) eAvailable -= vec[i]->GetMass()/GeV;
 
-    const G4double atomicWeight = targetNucleus.GetN();
-    const G4double atomicNumber = targetNucleus.GetZ();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
+    const G4double atomicNumber = G4double(targetNucleus.GetZ_asInt());
     const G4double pOriginal = modifiedOriginal.GetTotalMomentum()/GeV;
     
@@ -1502 +1502 @@
     }
 
-    const G4double atomicWeight = targetNucleus.GetN();
-    const G4double atomicNumber = targetNucleus.GetZ();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
+    const G4double atomicNumber = G4double(targetNucleus.GetZ_asInt());
     //
     // particles have been distributed in forward and backward hemispheres
@@ -2033 +2033 @@
 
     G4int PinNucleus = std::max(0, 
-      G4int(targetNucleus.GetZ()) - protonsInFinalState);
+      targetNucleus.GetZ_asInt() - protonsInFinalState);
     G4int NinNucleus = std::max(0,
-      G4int(targetNucleus.GetN()-targetNucleus.GetZ()) - neutronsInFinalState);
+      targetNucleus.GetN_asInt() - neutronsInFinalState);
     //
     //  for various reasons, the energy balance is not sufficient,
@@ -2270 +2270 @@
 
     targetMass = targetParticle.GetMass()/GeV;
-    const G4double atomicWeight = targetNucleus.GetN();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
     
     G4double etCurrent = currentParticle.GetTotalEnergy()/GeV;
@@ -2430 +2430 @@
 
     G4int PinNucleus = std::max(0, 
-      G4int(targetNucleus.GetZ()) - protonsInFinalState);
+      targetNucleus.GetZ_asInt() - protonsInFinalState);
     G4int NinNucleus = std::max(0,
-      G4int(targetNucleus.GetN()-targetNucleus.GetZ()) - neutronsInFinalState);
+      targetNucleus.GetN_asInt() - neutronsInFinalState);
 
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
@@ -2820 +2820 @@
     //    inclusive distributions, but it is necessary for momentum conservation
     //
-    const G4double atomicWeight = targetNucleus.GetN();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
     const G4double logWeight = std::log(atomicWeight);
     
@@ -3096 +3096 @@
     
     const G4double ekOriginal = modifiedOriginal.GetKineticEnergy()/MeV;
-    const G4double atomicWeight = targetNucleus.GetN();
-    const G4double atomicNumber = targetNucleus.GetZ();
+    const G4double atomicWeight = G4double(targetNucleus.GetA_asInt());
+    const G4double atomicNumber = G4double(targetNucleus.GetZ_asInt());
     
     const G4double ika1 = 3.6;
@@ -3836 +3836 @@
     if( currentParticle.GetDefinition() == aNeutron )
     {
-      const G4double A = targetNucleus.GetN();    // atomic weight
+      const G4double A = G4double(targetNucleus.GetA_asInt());    // atomic weight
       if( G4UniformRand() > ((A-1.0)/230.0)*((A-1.0)/230.0) )
         qval[0] = 0.0;