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

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

@@ -80 +80 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4bool G4UElasticCrossSection::IsZAApplicable(const G4DynamicParticle* dp, 
-                                                G4double Z, G4double A)
+// G4bool G4UElasticCrossSection::IsZAApplicable(const G4DynamicParticle* dp, 
+//                                              G4double Z, G4double A)
+G4bool G4UElasticCrossSection::IsIsoApplicable(const G4DynamicParticle* dp,
+                                               G4int Z, G4int A)
 {
   G4bool res = false;
@@ -94 +96 @@
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4UElasticCrossSection::GetCrossSection(const G4DynamicParticle* dp, 
-                                                   const G4Element* elm, 
-                                                   G4double temp)
-{
-  return GetIsoZACrossSection(dp, elm->GetZ(), elm->GetN(), temp);
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-G4double G4UElasticCrossSection::GetIsoZACrossSection(const G4DynamicParticle* dp, 
-                                                        G4double Z,
-                                                        G4double A, 
-                                                        G4double)
+
+G4double
+G4UElasticCrossSection::GetCrossSection(const G4DynamicParticle* dp, 
+                                        const G4Element* elm, G4double temp)
+{
+  G4int Z = G4lrint(elm->GetZ());
+  G4int N = G4lrint(elm->GetN());
+
+  return GetZandACrossSection(dp, Z, N, temp);
+}
+
+
+G4double
+G4UElasticCrossSection::GetZandACrossSection(const G4DynamicParticle* dp, 
+                                             G4int Z, G4int A, G4double)
 {
   G4double cross = 0.0;
   G4double ekin = dp->GetKineticEnergy();
-  G4int iz = G4int(Z);
-  if(iz > 92) iz = 92;
+//  G4int iz = G4int(Z);
+  if(Z > 92) Z = 92;
 
     // proton and neutron
   if(fNucleon) { 
-    if(iz == 1) cross = fGheisha->GetElasticCrossSection(dp, Z, A);
+    if(Z == 1) cross = fGheisha->GetElasticCrossSection(dp, Z, A);
     else if(ekin > thEnergy) {
-      cross = theFac[iz]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
+      cross = theFac[Z]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
     } else {
       cross = fNucleon->GetElasticCrossSection(dp, Z, A);
@@ -126 +128 @@
     // pions
   } else if(fUPi) {
-    if(iz == 1) cross = fGheisha->GetElasticCrossSection(dp, Z, A);
+    if(Z == 1) cross = fGheisha->GetElasticCrossSection(dp, Z, A);
     else if(ekin > thEnergy) {
-      cross = theFac[iz]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
+      cross = theFac[Z]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
     } else {
       cross = fUPi->GetElasticCrossSection(dp, Z, A);
@@ -136 +138 @@
   } else {
     if(hasGlauber && ekin > thEnergy) {
-      cross = theFac[iz]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
+      cross = theFac[Z]*fGlauber->GetElasticGlauberGribov(dp, Z, A);
     } else if(fGheisha->IsApplicable(dp, Z, A)) {
       cross = fGheisha->GetElasticCrossSection(dp, Z, A);
@@ -182 +184 @@
 
   G4NistManager* nist = G4NistManager::Instance();
-  G4double A = nist->GetAtomicMassAmu(2);
+  G4int A = G4lrint(nist->GetAtomicMassAmu(2));
 
   if(fGlauber->IsZAApplicable(&dp, 2.0, A)) {
@@ -193 +195 @@
 
       G4double Z = G4double(iz);
-      A = nist->GetAtomicMassAmu(iz);
-      csup = fGlauber->GetElasticGlauberGribov(&dp, Z, A);
+      A = G4lrint(nist->GetAtomicMassAmu(iz));
+      csup = fGlauber->GetElasticGlauberGribov(&dp, iz, A);
       // proton and neutron
       if(fNucleon) { 
-        csdn = fNucleon->GetElasticCrossSection(&dp, Z, A);
+        csdn = fNucleon->GetElasticCrossSection(&dp, iz, A);
 
         // pions
       } else if(fUPi) {
-        csdn = fUPi->GetElasticCrossSection(&dp, Z, A);
+        csdn = fUPi->GetElasticCrossSection(&dp, iz, A);
 
         // other
-      } else if(fGheisha->IsApplicable(&dp, Z, A)) {
-        csdn = fGheisha->GetElasticCrossSection(&dp, Z, A);
+      } else if(fGheisha->IsApplicable(&dp, iz, A)) {
+        csdn = fGheisha->GetElasticCrossSection(&dp, iz, A);
 
       } else {
@@ -217 +219 @@
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-
+