Changeset 1196 for trunk/source/processes/hadronic/models/coherent_elastic/src

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/processes/hadronic/models/coherent_elastic/src

Files:

• G4ChargeExchange.cc (modified) (2 diffs)
• G4ChargeExchangeProcess.cc (modified) (1 diff)
• G4DiffuseElastic.cc (modified) (1 diff)
• G4ElasticHadrNucleusHE.cc (modified) (5 diffs)
• G4HadronElastic.cc (modified) (8 diffs)
• G4UHadronElasticProcess.cc (modified) (1 diff)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ChargeExchange.cc,v 1.13 2008/11/20 12:35:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4ChargeExchange.cc,v 1.16 2009/09/22 16:21:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -312 +312 @@
     dd = 10.;
   }
-  G4double x1 = (1.0 - exp(-tmax*bb))*aa/bb;
-  G4double x2 = (1.0 - exp(-tmax*dd))*cc/dd;
+  G4double x1 = (1.0 - std::exp(-tmax*bb))*aa/bb;
+  G4double x2 = (1.0 - std::exp(-tmax*dd))*cc/dd;
   
   G4double t;

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

@@ -26 +26 @@
 //
 // $Id: G4ChargeExchangeProcess.cc,v 1.15 2008/11/27 16:43:00 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4DiffuseElastic.cc,v 1.23 2009/03/02 09:17:43 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4DiffuseElastic.cc,v 1.25 2009/09/22 16:21:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ElasticHadrNucleusHE.cc,v 1.79 2008/01/14 10:39:13 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4ElasticHadrNucleusHE.cc,v 1.81 2009/09/22 16:21:46 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -220 +220 @@
 
 G4ElasticHadrNucleusHE::G4ElasticHadrNucleusHE()
-  :G4HadronicInteraction("G4ElasticHadrNucleusHE")
+  : G4VHadronElastic("hElasticGlauber")
+  //  :G4HadronicInteraction("G4ElasticHadrNucleusHE")
 {
   verboseLevel = 0;
@@ -299 +300 @@
 //
 //
-
+/*
 G4HadFinalState * G4ElasticHadrNucleusHE::ApplyYourself(
                           const  G4HadProjectile  &aTrack,
@@ -457 +458 @@
   return &theParticleChange;
 }
-
+*/
 //////////////////////////////////////////////////////////////////////////
 //
 //
 
-G4double G4ElasticHadrNucleusHE::
-                     SampleT(  const G4ParticleDefinition* p,
-                                     G4double inLabMom, G4int Z, G4int N)
+G4double 
+G4ElasticHadrNucleusHE::SampleInvariantT(const G4ParticleDefinition* p,
+                                         G4double inLabMom, 
+                                         G4int Z, G4int N)
 {
   G4double plab  = inLabMom/GeV;   // (GeV/c)
@@ -542 +544 @@
     }
   return  Q2*GeV2;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+//
+
+G4double 
+G4ElasticHadrNucleusHE::SampleT(const G4ParticleDefinition* p,
+                                G4double inLabMom, 
+                                G4int Z, G4int N)
+{
+  return SampleInvariantT(p, inLabMom, Z, N);
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronElastic.cc,v 1.61 2008/08/05 07:37:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4HadronElastic.cc,v 1.65 2009/10/08 18:56:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -79 +79 @@
 #include "G4PionMinus.hh"
 
+G4VQCrossSection* G4HadronElastic::qCManager = 0;
+
 G4HadronElastic::G4HadronElastic(G4ElasticHadrNucleusHE* HModel) 
   : G4HadronicInteraction("G4HadronElastic"), hElastic(HModel)
@@ -91 +93 @@
   plabLowLimit     = 20.0*MeV;
 
-  qCManager   = G4QElasticCrossSection::GetPointer();
+  if(!qCManager) {qCManager = G4QElasticCrossSection::GetPointer();}
   if(!hElastic) hElastic = new G4ElasticHadrNucleusHE();
 
@@ -101 +103 @@
   thePionMinus= G4PionMinus::PionMinus();
 
-  nnans = 0;
-  npos  = 0;
-  nneg  = 0;
-  neneg = 0;
 }
 
@@ -110 +108 @@
 {
   delete hElastic;
-  if( (nnans + npos + nneg + neneg) > 0 ) {
-    G4cout << "### G4HadronElastic destructor Warnings: ";
-    if(nnans > 0) G4cout << "###          N(nans)    = " << nnans;
-    if(npos > 0)  G4cout << "###          N(cost > 1)= " << npos;
-    if(nneg > 0)  G4cout << "###          N(cost <-1)= " << nneg;
-    if(neneg > 0) G4cout << "###          N(E < 0)=    " << neneg;
-    G4cout << "###" << G4endl;
-  }
 }
 
@@ -234 +224 @@
   }
 
-  // NaN finder
-  if(!(t < 0.0 || t >= 0.0)) {
-    if (verboseLevel > 0) {
+  if(gtype == fSWave) t = G4UniformRand()*tmax;
+
+  if(verboseLevel>1) {
+    G4cout <<"type= " << gtype <<" t= " << t << " tmax= " << tmax 
+           << " ptot= " << ptot << G4endl;
+  }
+  // Sampling in CM system
+  G4double phi  = G4UniformRand()*twopi;
+  G4double cost = 1. - 2.0*t/tmax;
+  G4double sint;
+
+  // problem in sampling
+  if(cost > 1.0 || cost < -1.0) {
+    if(verboseLevel > 0) {
       G4cout << "G4HadronElastic:WARNING: Z= " << Z << " N= " 
-             << N << " pdg= " <<  projPDG
+             << N << " " << aParticle->GetDefinition()->GetParticleName()
              << " mom(GeV)= " << plab/GeV 
              << " the model type " << gtype;
@@ -244 +245 @@
       else if(gtype ==  fLElastic) G4cout << " LElastic ";
       else if(gtype ==  fHElastic) G4cout << " HElastic ";
-      G4cout << " S-wave will be sampled" 
+      G4cout << " cost= " << cost 
              << G4endl; 
     }
-    t = 0.0;
-    nnans++;
-  }
-
-  if(gtype == fSWave) t = G4UniformRand()*tmax;
-
-  if(verboseLevel>1) {
-    G4cout <<"type= " << gtype <<" t= " << t << " tmax= " << tmax 
-           << " ptot= " << ptot << G4endl;
-  }
-  // Sampling in CM system
-  G4double phi  = G4UniformRand()*twopi;
-  G4double cost = 1. - 2.0*t/tmax;
-  G4double sint;
-
-  // problem in sampling
-  if(cost >= 1.0) {
     cost = 1.0;
     sint = 0.0;
-    npos++;
-  } else if(cost < -1 ) {
-    /*
-    G4cout << "G4HadronElastic:WARNING: Z= " << Z << " N= " 
-           << N << " " << aParticle->GetDefinition()->GetParticleName()
-           << " mom(GeV)= " << plab/GeV 
-           << " the model type " << gtype;
-    if(gtype ==  fQElastic) G4cout << " CHIPS ";
-    else if(gtype ==  fLElastic) G4cout << " LElastic ";
-    else if(gtype ==  fHElastic) G4cout << " HElastic ";
-    G4cout << " cost= " << cost 
-           << G4endl; 
-    */
-    cost = 1.0;
-    sint = 0.0;
-    nneg++;
 
     // normal situation
@@ -305 +273 @@
   if(eFinal <= lowestEnergyLimit) {
     if(eFinal < 0.0 && verboseLevel > 0) {
-      neneg++;
       G4cout << "G4HadronElastic WARNING ekin= " << eFinal
              << " after scattering of " 

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

@@ -25 +25 @@
 //
 // $Id: G4UHadronElasticProcess.cc,v 1.39 2008/10/22 08:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // Geant4 Hadron Elastic Scattering Process -- header file