Import Geant4 8.3.0 source tree

source/processes/hadronic/models/neutron_hp/History

@@ -14,8 +14,30 @@ code and to keep track of all tags.
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
 
+11 April 2007 Dennis Wright (hadr-hpn-V08-02-01)
+------------------------------------------------
+- added model names for hadronic whiteboard error reporting.  
+  Files affected:
+
+    G4NeutronHPCapture.cc
+    G4NeutronHPElastic.cc
+    G4NeutronHPFission.cc
+    G4NeutronHPInelastic.cc
+    G4NeutronHPorLCapture.cc
+    G4NeutronHPorLEInelastic.cc
+    G4NeutronHPorLElastic.cc
+    G4NeutronHPorLFission.cc
+
+20 February 2007 Dennis Wright (hadr-hpn-V08-02-00)
+---------------------------------------------------
+- fixed potential divide by zero in:
+
+    G4NeutronHPVector::IntegrateAndNormalise()
+    G4NeutronHPLevel::GetDecayGammas()
+    G4NeutronHPInterpolator::GetWeightedBinIntegral
+
 15 November 2006 Tatsumi Koi (hadr-hpn-V08-00-04)
----------------------------------------------------------------
+-------------------------------------------------
 - G4NeutronHPElasticFS.hh , cc : add new type final state generator
 - G4NeutronHPFission.cc : Bug Report[857]
 - 4NeutronHPElasticFS.cc : buf fix
@@ -32,8 +54,6 @@ code and to keep track of all tags.
       G4NeutronHPJENDLHEElasticData.hh , .cc 
       G4NeutronHPJENDLHEInelasticData.hh , .cc 
 
-
-
 02 June 2006 Dennis Wright for Tatsumi Koi (hadr-hpn-V08-00-03)
 ---------------------------------------------------------------
 - retag of hard-hpn-v08-00-03 with History info added

source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh

@@ -360,12 +360,16 @@ class G4NeutronHPVector
     }
     theIntegral[0] = 0;
     G4double sum = 0;
+    G4double x1 = 0;
+    G4double x0 = 0;
     for(i=1;i<GetVectorLength();i++)
     {
-      if(std::abs((theData[i].GetX()-theData[i-1].GetX())/theData[i].GetX())>0.0000001)
+      x1 = theData[i].GetX();
+      x0 = theData[i-1].GetX();
+      if (std::abs(x1-x0) > std::abs(x1*0.0000001) )
       {
         sum+= 0.5*(theData[i].GetY()+theData[i-1].GetY())*
-                  (theData[i].GetX()-theData[i-1].GetX());
+                  (x1-x0);
       }
       theIntegral[i] = sum;
     }

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc

@@ -34,6 +34,7 @@
 #include "G4IonTable.hh"
 
   G4NeutronHPCapture::G4NeutronHPCapture()
+   :G4HadronicInteraction("NeutronHPCapture")
   {
     SetMinEnergy( 0.0 );
     SetMaxEnergy( 20.*MeV );

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc

@@ -31,6 +31,7 @@
 #include "G4NeutronHPElasticFS.hh"
 
   G4NeutronHPElastic::G4NeutronHPElastic()
+    :G4HadronicInteraction("NeutronHPElastic")
   {
     overrideSuspension = false;
     G4NeutronHPElasticFS * theFS = new G4NeutronHPElasticFS;

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc

@@ -32,6 +32,7 @@
 #include "G4NeutronHPFission.hh"
 
   G4NeutronHPFission::G4NeutronHPFission()
+    :G4HadronicInteraction("NeutronHPFission")
   {
     SetMinEnergy( 0.0 );
     SetMaxEnergy( 20.*MeV );

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc

@@ -32,12 +32,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPInelastic.cc,v 1.20 2006/06/29 20:52:32 gunter Exp $
-// GEANT4 tag $Name: geant4-08-02 $
+// $Id: G4NeutronHPInelastic.cc,v 1.21 2007/04/11 16:52:52 dennis Exp $
+// GEANT4 tag $Name: geant4-08-03 $
 //
 #include "G4NeutronHPInelastic.hh"
 
   G4NeutronHPInelastic::G4NeutronHPInelastic()
+    :G4HadronicInteraction("NeutronHPInelastic")
   {
     SetMinEnergy( 0.0 );
     SetMaxEnergy( 20.*MeV );

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInterpolator.cc

@@ -92,9 +92,12 @@
     }
     else if(aScheme==LINLIN||aScheme==CLINLIN||aScheme==ULINLIN)
     {
-      G4double b = (y2-y1)/(x2-x1);
-      G4double a = y1 - b*x1;
-      result = 0.5*a*(x2*x2-x1*x1) + (b/3.)*(x2*x2*x2-x1*x1*x1);
+      //        G4double b = (y2-y1)/(x2-x1);
+      //        G4double a = y1 - b*x1;
+      //        result = 0.5*a*(x2*x2-x1*x1) + (b/3.)*(x2*x2*x2-x1*x1*x1);
+      //  Factor out x2-x1 to avoid divide by zero
+      
+      result = (y1*x2 - y2*x1)*(x2 + x1)/2. + (y2-y1)*(x2*x2 + x2*x1 + x1*x1)/3.;
     }
     else if(aScheme==LINLOG||aScheme==CLINLOG||aScheme==ULINLOG)
     {

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLevel.cc

@@ -79,7 +79,7 @@
     for(i=0; i<nGammas; i++)
     {
       it = i;
-      if(random<running[i]/sum) break;
+      if(random*sum < running[i]) break;
     }
     delete [] running;
     theResult = theGammas[it]->GetDecayGammas();

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPorLCapture.cc

@@ -38,6 +38,7 @@
 #include "G4NeutronHPCaptureFS.hh"
 
 G4NeutronHPorLCapture::G4NeutronHPorLCapture()
+  :G4HadronicInteraction("NeutronHPorLCapture")
 {
    G4NeutronHPCaptureFS * theFS = new G4NeutronHPCaptureFS;
    if(!getenv("NeutronHPCrossSections")) 

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPorLEInelastic.cc

@@ -38,6 +38,7 @@
 //#include "G4NeutronHPInelasticFS.hh"
 
 G4NeutronHPorLEInelastic::G4NeutronHPorLEInelastic()
+  :G4HadronicInteraction("NeutronHPorLEInelastic")
 {
    SetMinEnergy(0.*eV);
    SetMaxEnergy(20.*MeV);

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPorLElastic.cc

@@ -38,6 +38,7 @@
 #include "G4NeutronHPElasticFS.hh"
 
 G4NeutronHPorLElastic::G4NeutronHPorLElastic()
+  :G4HadronicInteraction("NeutronHPorLElastic")
 {
    overrideSuspension = false;
    G4NeutronHPElasticFS * theFS = new G4NeutronHPElasticFS;

source/processes/hadronic/models/neutron_hp/src/G4NeutronHPorLFission.cc

@@ -38,6 +38,7 @@
 #include "G4NeutronHPFissionFS.hh"
 
 G4NeutronHPorLFission::G4NeutronHPorLFission()
+  :G4HadronicInteraction("NeutronHPorLFission")
 {
    SetMinEnergy(0.*eV);
    SetMaxEnergy(20.*MeV);