Changeset 1340 for trunk/source/processes/hadronic/cross_sections/src/G4TripathiLightCrossSection.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/G4TripathiLightCrossSection.cc (modified) (6 diffs)

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

@@ -63 +63 @@
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
+#include "G4HadTmpUtil.hh"
+
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -101 +103 @@
   (const G4DynamicParticle* theProjectile, const G4Element* theTarget)
 {
-  return IsZAApplicable(theProjectile, theTarget->GetZ(), theTarget->GetN());
-}
-
-
-G4bool G4TripathiLightCrossSection::IsZAApplicable
-  (const G4DynamicParticle* theProjectile, G4double ZZ, G4double AA)
+  G4int Z = G4lrint(theTarget->GetZ());
+  G4int A = G4lrint(theTarget->GetN());
+  return IsIsoApplicable(theProjectile, Z, A);
+}
+
+
+G4bool
+G4TripathiLightCrossSection::IsIsoApplicable(const G4DynamicParticle* theProjectile,
+                                             G4int ZZ, G4int AA)
 {
   G4bool result = false;
@@ -122 +127 @@
   return result;
 }
-///////////////////////////////////////////////////////////////////////////////
-//
-G4double G4TripathiLightCrossSection::GetIsoZACrossSection
-  (const G4DynamicParticle* theProjectile, G4double ZZ, G4double AA,
-   G4double /*theTemperature*/)
+
+///////////////////////////////////////////////////////////////////////////////
+//
+G4double
+G4TripathiLightCrossSection::GetZandACrossSection(const G4DynamicParticle* theProjectile,
+                                                  G4int ZZ, G4int AA, G4double /*theTemperature*/)
 {
 //
@@ -301 +307 @@
           SetLowEnergyCheck(true);
       G4double resultp =
-        GetIsoZACrossSection(&slowerProjectile, ZZ, AA, 0.0);
+        GetZandACrossSection(&slowerProjectile, ZZ, AA, 0.0);
           SetLowEnergyCheck(savelowenergy);
       if (resultp >result) result = 0.0;
@@ -322 +328 @@
     G4IsotopeVector* isoVector = theTarget->GetIsotopeVector();
     G4double* abundVector = theTarget->GetRelativeAbundanceVector();
-    G4double ZZ;
-    G4double AA;
+    G4int ZZ;
+    G4int AA;
      
     for (G4int i = 0; i < nIso; i++) {
-      ZZ = G4double( (*isoVector)[i]->GetZ() );
-      AA = G4double( (*isoVector)[i]->GetN() );
-      sig = GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+      ZZ = (*isoVector)[i]->GetZ();
+      AA = (*isoVector)[i]->GetN();
+      sig = GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       xsection += sig*abundVector[i];
     }
    
   } else {
-    xsection =
-      GetIsoZACrossSection(theProjectile, theTarget->GetZ(), theTarget->GetN(),
-                           theTemperature);
+    G4int ZZ = G4lrint(theTarget->GetZ());
+    G4int AA = G4lrint(theTarget->GetN());
+    xsection = GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
   }
     
@@ -348 +354 @@
   lowEnergyCheck = aLowEnergyCheck;
 }
-///////////////////////////////////////////////////////////////////////////////
-//
+