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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4NeutronInelasticXS.cc,v 1.4 2010/06/03 11:50:21 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4NeutronInelasticXS.cc,v 1.6 2010/10/15 22:35:32 dennis Exp $
+// GEANT4 tag $Name: hadr-cross-V09-03-12 $
 //
 // -------------------------------------------------------------------
@@ -47 +47 @@
 #include "G4PhysicsVector.hh"
 #include "G4GlauberGribovCrossSection.hh"
+#include "G4HadronNucleonXsc.hh"
 #include "G4NistManager.hh"
+#include "G4Proton.hh"
 
 #include <iostream>
 #include <fstream>
 #include <sstream>
+
 using namespace std;
 
 G4NeutronInelasticXS::G4NeutronInelasticXS() 
-{
-  verboseLevel = 0;
-  G4cout  << "G4NeutronInelasticXS::G4NeutronInelasticXS: Initialise " << G4endl;
-  for(G4int i=0; i<93; ++i) {
-    data[i] = 0;
-    coeff[i]= 1.0;
-  }
+  : proton(G4Proton::Proton()), maxZ(92)
+{
+  //  verboseLevel = 0;
+  if(verboseLevel > 0){
+    G4cout  << "G4NeutronInelasticXS::G4NeutronInelasticXS Initialise for Z < " 
+            << maxZ + 1 << G4endl;
+  }
+  data.resize(maxZ+1, 0);
+  coeff.resize(maxZ+1, 1.0);
   ggXsection = new G4GlauberGribovCrossSection();
+  fNucleon = new G4HadronNucleonXsc();
   isInitialized = false;
 }
@@ -68 +74 @@
 G4NeutronInelasticXS::~G4NeutronInelasticXS()
 {
-  for(G4int i=0; i<92; ++i) {
+  for(G4int i=0; i<=maxZ; ++i) {
     delete data[i];
   }
@@ -81 +87 @@
 
 G4bool 
-G4NeutronInelasticXS::IsZAApplicable(const G4DynamicParticle*,
-                                     G4double /*ZZ*/, G4double /*AA*/)
+G4NeutronInelasticXS::IsIsoApplicable(const G4DynamicParticle*,
+                                      G4int /*ZZ*/, G4int /*AA*/)
 {
   return false;
@@ -97 +103 @@
 
   G4int Z = G4int(elm->GetZ());
+  if(Z < 1 || Z > maxZ) { return xs; }
   G4PhysicsVector* pv = data[Z];
   //  G4cout  << "G4NeutronInelasticXS::GetCrossSection e= " << ekin << " Z= " << Z << G4endl;
@@ -104 +111 @@
     Initialise(Z);
     pv = data[Z];
-    if(!pv) return xs;
+    if(!pv) { return xs; }
   }
 
   G4double e1 = pv->Energy(0);
-  if(ekin <= e1) return xs;
+  if(ekin <= e1) { return xs; }
 
   G4int n = pv->GetVectorLength() - 1;
@@ -114 +121 @@
   if(ekin <= e2) { 
     xs = pv->Value(ekin); 
+  } else if(1 == Z) { 
+    fNucleon->GetHadronNucleonXscPDG(aParticle, proton);
+    xs = coeff[1]*fNucleon->GetInelasticHadronNucleonXsc();
   } else {          
     ggXsection->GetCrossSection(aParticle, elm);
@@ -119 +129 @@
   }
 
-  if(verboseLevel > 0){
+  if(verboseLevel > 0) {
     G4cout  << "ekin= " << ekin << ",  XSinel= " << xs << G4endl;
   }
@@ -129 +139 @@
 G4NeutronInelasticXS::BuildPhysicsTable(const G4ParticleDefinition& p)
 {
-  G4cout << "G4NeutronInelasticXS::BuildPhysicsTable: " << G4endl;
-  G4cout << p.GetParticleName() << G4endl;
-  if(p.GetParticleName() != "neutron") {
-    return;
-  }
-  if(isInitialized) return;
+  if(verboseLevel > 0){
+    G4cout << "G4NeutronInelasticXS::BuildPhysicsTable for " 
+           << p.GetParticleName() << G4endl;
+  }
+  if(isInitialized || p.GetParticleName() != "neutron") { return; }
   isInitialized = true;
-
 
   // check environment variable 
@@ -154 +162 @@
     for(size_t i=0; i<numOfElm; ++i) {
       G4int Z = G4int(((*theElmTable)[i])->GetZ());
-      if(Z < 1) Z = 1;
-      else if(Z > 92) Z = 92;
+      if(Z < 1)         { Z = 1; }
+      else if(Z > maxZ) { Z = maxZ; }
       //G4cout << "Z= " << Z << G4endl;
       // Initialisation 
@@ -173 +181 @@
                                  const char* p)
 {
-  if(data[Z]) return;
+  if(data[Z]) { return; }
   const char* path = p;
   if(!p) {
@@ -215 +223 @@
     G4double sig1 = (*data[Z])[n];
     dynParticle->SetKineticEnergy(emax);
-    ggXsection->GetCrossSection(dynParticle, Elem);
-    G4double sig2 = ggXsection->GetInelasticGlauberGribovXsc();
+    G4double sig2 = 0.0;
+    if(1 == Z) {
+      fNucleon->GetHadronNucleonXscPDG(dynParticle, proton);
+      sig2 = fNucleon->GetInelasticHadronNucleonXsc();
+    } else {
+      ggXsection->GetCrossSection(dynParticle, Elem);
+      sig2 = ggXsection->GetInelasticGlauberGribovXsc();
+    }
     if(sig2 > 0.) { coeff[Z] = sig1/sig2; }
   }