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

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

@@ -65 +65 @@
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
+#include "G4HadTmpUtil.hh"
 
 #include <iomanip>
-///////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4GeneralSpaceNNCrossSection::G4GeneralSpaceNNCrossSection ()
 {
@@ -79 +80 @@
   return;
 }
-///////////////////////////////////////////////////////////////////////////////
-//
+
+
 G4GeneralSpaceNNCrossSection::~G4GeneralSpaceNNCrossSection ()
 {
@@ -92 +93 @@
 //
 
-G4bool G4GeneralSpaceNNCrossSection::IsZAApplicable
- (const G4DynamicParticle* theProjectile, G4double ZZ, G4double AA)
-{
-  G4bool result = protonInelastic->IsZAApplicable(theProjectile, ZZ, AA);
+G4bool G4GeneralSpaceNNCrossSection::IsIsoApplicable
+ (const G4DynamicParticle* theProjectile, G4int ZZ, G4int AA)
+{
+  G4bool result = protonInelastic->IsIsoApplicable(theProjectile, ZZ, AA);
   if (!result)
   {
-    result = ionProton->IsZAApplicable(theProjectile, ZZ, AA);
+    result = ionProton->IsIsoApplicable(theProjectile, ZZ, AA);
     if (!result)
     {
-      result = TripathiGeneral->IsZAApplicable(theProjectile, ZZ, AA);
+      result = TripathiGeneral->IsIsoApplicable(theProjectile, ZZ, AA);
       if (!result)
-        result = Shen->IsZAApplicable(theProjectile, ZZ, AA);
+        result = Shen->IsIsoApplicable(theProjectile, ZZ, AA);
     }
   }
@@ -139 +140 @@
     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 = GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
   }
     
@@ -159 +160 @@
 
 
-G4double G4GeneralSpaceNNCrossSection::GetIsoZACrossSection
-  (const G4DynamicParticle* theProjectile, G4double ZZ, G4double AA,
-   G4double theTemperature)
+G4double
+G4GeneralSpaceNNCrossSection::GetZandACrossSection(const G4DynamicParticle* theProjectile,
+                                                   G4int ZZ, G4int AA, G4double theTemperature)
 {
   G4double result = 0.0;
@@ -186 +187 @@
     {
       result = protonInelastic->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4ProtonInelasticCrossSection" <<G4endl;
@@ -193 +194 @@
     {
       result = TripathiLight->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4TripathiLightCrossSection" <<G4endl;
@@ -203 +204 @@
     {
       result = ionProton->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4IonProtonCrossSection" <<G4endl;
@@ -210 +211 @@
     {
       result = TripathiLight->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4TripathiLightCrossSection" <<G4endl;
@@ -217 +218 @@
   else
   {
-    if (TripathiLight->IsZAApplicable(theProjectile, ZZ, AA))
+    if (TripathiLight->IsIsoApplicable(theProjectile, ZZ, AA))
     {
       result = TripathiLight->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4TripathiLightCrossSection" <<G4endl;
     }
-    else if (TripathiGeneral->IsZAApplicable(theProjectile, ZZ, AA))
+    else if (TripathiGeneral->IsIsoApplicable(theProjectile, ZZ, AA))
     {
       result = TripathiGeneral->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4TripathiCrossSection" <<G4endl;
     }
-    else if (Shen->IsZAApplicable(theProjectile, ZZ, AA))
+    else if (Shen->IsIsoApplicable(theProjectile, ZZ, AA))
     {
       result = Shen->
-        GetIsoZACrossSection(theProjectile, ZZ, AA, theTemperature);
+        GetZandACrossSection(theProjectile, ZZ, AA, theTemperature);
       if (verboseLevel >= 2)
         G4cout <<"Selecting G4IonsShenCrossSection" <<G4endl;
@@ -247 +248 @@
   return result;
 }
-///////////////////////////////////////////////////////////////////////////////
-//
+