Changeset 1315 for trunk/source/processes/hadronic/models/coherent_elastic/src/G4HadronElastic.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/G4HadronElastic.cc (modified) (7 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronElastic.cc,v 1.65 2009/10/08 18:56:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4HadronElastic.cc,v 1.66 2010/01/13 15:42:06 mkossov Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -62 +62 @@
 //                        p and He targets only  
 // 11-May-07 V.Ivanchenko remove unused method Defs1
+// 13.01.10: M.Kosov: Use G4Q(Pr/Neut)ElasticCS instead of G4QElasticCS
 //
 
@@ -68 +69 @@
 #include "G4ParticleDefinition.hh"
 #include "G4IonTable.hh"
-#include "G4QElasticCrossSection.hh"
+#include "G4QProtonElasticCrossSection.hh"
+#include "G4QNeutronElasticCrossSection.hh"
 #include "G4VQCrossSection.hh"
 #include "G4ElasticHadrNucleusHE.hh"
@@ -79 +81 @@
 #include "G4PionMinus.hh"
 
-G4VQCrossSection* G4HadronElastic::qCManager = 0;
+G4VQCrossSection* G4HadronElastic::pCManager = 0;
+G4VQCrossSection* G4HadronElastic::nCManager = 0;
 
 G4HadronElastic::G4HadronElastic(G4ElasticHadrNucleusHE* HModel) 
@@ -93 +96 @@
   plabLowLimit     = 20.0*MeV;
 
-  if(!qCManager) {qCManager = G4QElasticCrossSection::GetPointer();}
+  if(!pCManager)
+  {
+    pCManager = G4QProtonElasticCrossSection::GetPointer();
+    nCManager = G4QNeutronElasticCrossSection::GetPointer();
+  }
   if(!hElastic) hElastic = new G4ElasticHadrNucleusHE();
 
@@ -112 +119 @@
 G4VQCrossSection* G4HadronElastic::GetCS()
 {
-  return qCManager;
+  return pCManager;
+  //if     (PDG==2212) return pCManager;
+  //else if(PDG==2112) return nCManager;
+  //return 0;
 }
 
@@ -200 +210 @@
   if(gtype == fQElastic) {
     if (verboseLevel >1) {
-      G4cout << "G4HadronElastic: Z= " << Z << " N= " 
-             << N << " pdg= " <<  projPDG
-             << " mom(GeV)= " << plab/GeV << "  " << qCManager << G4endl; 
+      G4cout << "G4HadronElastic: Z= " << Z << " N= "  << N << " pdg= " <<  projPDG
+               << " mom(GeV)= " << plab/GeV<<", pC="<<pCManager<<", nC="<<nCManager<<G4endl; 
     }
     if(Z == 1 && N == 2) N = 1;
     else if(Z == 2 && N == 1) N = 2;
-    G4double cs = qCManager->GetCrossSection(false,plab,Z,N,projPDG);
+    G4double cs = 0.;
+    if     (projPDG==2212) cs = pCManager->GetCrossSection(false,plab,Z,N,projPDG);
+    else if(projPDG==2112) cs = nCManager->GetCrossSection(false,plab,Z,N,projPDG);
 
     // check if cross section is reasonable
-    if(cs > 0.0) t = qCManager->GetExchangeT(Z,N,projPDG);
+    if(cs > 0.0)
+    {
+      if     (projPDG==2212) t = pCManager->GetExchangeT(Z,N,projPDG);
+      else if(projPDG==2112) t = nCManager->GetExchangeT(Z,N,projPDG);
+    }
     else if(plab > plabLowLimit) gtype = fLElastic;
     else gtype = fSWave;