Changeset 1315 for trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc (modified) (9 diffs)

trunk/source/processes/hadronic/models/coherent_elastic/src/G4UHadronElasticProcess.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UHadronElasticProcess.cc,v 1.39 2008/10/22 08:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UHadronElasticProcess.cc,v 1.41 2010/01/26 13:34:01 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Geant4 Hadron Elastic Scattering Process -- header file
@@ -39 +39 @@
 // 23.01.07 V.Ivanchnko add cross section interfaces with Z and A
 // 02.05.07 V.Ivanchnko add He3
+// 13.01.10: M.Kosov: Use G4Q(Pr/Neut)ElasticCS instead of G4QElasticCS
 //
 
@@ -46 +47 @@
 #include "G4HadronElasticDataSet.hh"
 #include "G4VQCrossSection.hh"
-#include "G4QElasticCrossSection.hh"
+#include "G4QProtonElasticCrossSection.hh"
+#include "G4QNeutronElasticCrossSection.hh"
 #include "G4QCHIPSWorld.hh"
 #include "G4Element.hh"
@@ -64 +66 @@
   thEnergy    = 19.0*MeV;
   verboseLevel= 1;
-  qCManager   = 0;
+  pCManager   = G4QProtonElasticCrossSection::GetPointer();
+  nCManager   = G4QNeutronElasticCrossSection::GetPointer();
 }
 
@@ -73 +76 @@
 void G4UHadronElasticProcess::SetQElasticCrossSection(G4VQCrossSection* p)
 {
-  qCManager = p;
+  pCManager = p;
 }
 
@@ -81 +84 @@
   if(first) {
     first = false;
-    if(!qCManager) qCManager = G4QElasticCrossSection::GetPointer();
     theParticle = &aParticleType;
     pPDG = theParticle->GetPDGEncoding();
@@ -172 +174 @@
     if(ni == 0) {
       G4int N = G4int(elm->GetN()+0.5) - iz;
-      x = qCManager->GetCrossSection(false,momentum,iz,N,pPDG);
-      xsecH[0] = x;
 #ifdef G4VERBOSE
       if(verboseLevel>1) 
@@ -179 +179 @@
                << " N= "  << N << " pdg= " << pPDG 
                << " mom(GeV)= " << momentum/GeV 
-               << "  " << qCManager << G4endl; 
-#endif
+               << ", pC=" << pCManager << ", nC=" << nCManager << G4endl; 
+#endif
+      x = 0.;
+      if     (pPDG==2212) x = pCManager->GetCrossSection(false,momentum,iz,N,pPDG);
+      else if(pPDG==2112) x = nCManager->GetCrossSection(false,momentum,iz,N,pPDG);
+      xsecH[0] = x;
     } else {
       G4double* ab = elm->GetRelativeAbundanceVector();
@@ -195 +199 @@
                  << " N= "  << N << " pdg= " << pPDG 
                  << " mom(GeV)= " << momentum/GeV 
-                 << "  " << qCManager << G4endl; 
-#endif
-        G4double y = ab[j]*qCManager->GetCrossSection(false,momentum,iz,N,pPDG);
+                 << ", pC=" << pCManager << ", nC=" << pCManager << G4endl; 
+#endif
+      G4double qxs=0.;
+      if     (pPDG==2212) qxs=pCManager->GetCrossSection(false,momentum,iz,N,pPDG);
+      else if(pPDG==2112) qxs=nCManager->GetCrossSection(false,momentum,iz,N,pPDG);
+        G4double y = ab[j]*qxs;
         x += y;
         xsecH[j] = x;