Changeset 1340 for trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc (modified) (11 diffs)

trunk/source/processes/hadronic/cross_sections/src/G4HadronNucleonXsc.cc

@@ -33 +33 @@
 #include "G4IonTable.hh"
 #include "G4ParticleDefinition.hh"
-
-//////////////////////////////////////////////////////////////////////////////////////
-//
-//
+#include "G4HadTmpUtil.hh"
 
 
@@ -80 +77 @@
 
 G4HadronNucleonXsc::~G4HadronNucleonXsc()
-{
-}
+{}
 
 
@@ -91 +87 @@
 G4bool 
 G4HadronNucleonXsc::IsApplicable(const G4DynamicParticle* aDP, 
-                                          const G4Element*  anElement)
+                                 const G4Element* anElement)
 {
-  return IsZAApplicable(aDP, anElement->GetZ(), anElement->GetN());
+  G4int Z = G4lrint(anElement->GetZ());
+  G4int A = G4lrint(anElement->GetN());
+  return IsIsoApplicable(aDP, Z, A);
 } 
 
 ////////////////////////////////////////////////////////////////////////////////////////
 //
-//
 
 G4bool 
-G4HadronNucleonXsc::IsZAApplicable(const G4DynamicParticle* aDP, 
-                                            G4double Z, G4double)
+G4HadronNucleonXsc::IsIsoApplicable(const G4DynamicParticle* aDP, 
+                                    G4int Z, G4int)
 {
-  G4bool applicable      = false;
+  G4bool applicable = false;
   // G4int baryonNumber     = aDP->GetDefinition()->GetBaryonNumber();
   G4double kineticEnergy = aDP->GetKineticEnergy();
@@ -111 +108 @@
  
   if ( ( kineticEnergy  >= fLowerLimit &&
-         Z > 1.5 &&      // >=  He
+         Z > 1 &&      // >=  He
        ( theParticle == theAProton   ||
          theParticle == theGamma     ||
@@ -119 +116 @@
 
        ( kineticEnergy  >= 0.1*fLowerLimit &&
-         Z > 1.5 &&      // >=  He
+         Z > 1 &&      // >=  He
        ( theParticle == theProton    ||
          theParticle == theNeutron   ||   
@@ -127 +124 @@
   return applicable;
 }
-
-
 
 
@@ -210 +205 @@
 
 
-
-
-
 /////////////////////////////////////////////////////////////////////////////////////
 //
@@ -242 +234 @@
   G4double B    = 0.308;
 
-
   const G4ParticleDefinition* theParticle = aParticle->GetDefinition();
 
@@ -249 +240 @@
   G4bool neutron = (nucleon == theNeutron);
   
-
   if(theParticle == theNeutron) // proton-neutron fit 
   {
@@ -358 +348 @@
   return xsection;
 }
-
 
 
@@ -758 +747 @@
   G4bool neutron = (nucleon == theNeutron);
 
-
-
    
   if( absPDGcode > 1000 && pORn )  //------Projectile is baryon -