Changeset 1228 for trunk/source/processes/hadronic/models/util

Timestamp:

Jan 8, 2010, 11:56:51 AM (15 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/models/util

Files:

• History (modified) (1 diff)
• include/G4NuclearFermiDensity.hh (modified) (1 diff)
• src/G4WilsonRadius.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/util/History

@@ -15 +15 @@
      ---------------------------------------------------------------
 
+10 December 2009 Gunter Folger     hadr-mod-util-V09-02-07
+- G4NuclearFermiDensity.hh: chnage value of prtection in GetDeriv() to lower
+    value
+    
+09 December 2009 Gunter Folger     hadr-mod-util-V09-02-06
+--------------------------------------------------------
+- G4NuclearFermiDensity.hh: Protect GetDeriv(pos) for positions far 
+   outside the nucleus causing an FP overflow in exp.
+
+09 December 2009 Gunter Folger     hadr-mod-util-V09-02-05
+--------------------------------------------------------
+- G4WilsonRadius.cc change provided by M.Mendenhall via P.Truscott:
+   Data vector r[] made static const
+   
 19 November 2009 Gunter Folger     hadr-mod-util-V09-02-04
+--------------------------------------------------------
 -  Restore methods storing/retrieving G4SplitableHadron*, 
    now in use in FTF

trunk/source/processes/hadronic/models/util/include/G4NuclearFermiDensity.hh

@@ -56 +56 @@
     G4double GetDeriv(const G4ThreeVector & aPosition) const
     {
-      return -std::exp((aPosition.mag()-theR)/a) * sqr(GetDensity(aPosition)) / (a*Getrho0());
+      G4double currentR=aPosition.mag();
+      if (currentR > 40*theR  ) {return 0;}
+      else return -std::exp((currentR-theR)/a) * sqr(GetDensity(aPosition)) / (a*Getrho0());
     }   
    

trunk/source/processes/hadronic/models/util/src/G4WilsonRadius.cc

@@ -84 +84 @@
   else
   {
-    G4double r[27] = {0.0, 0.85,  2.095, 1.976, 1.671, 1.986,
+        // this was changed from just G4double to static const G4double
+        // to make sure that time wasn't being wasted on every call reloading a stack variable
+        // by MHM 20050119
+    static const G4double r[27] = {0.0, 0.85,  2.095, 1.976, 1.671, 1.986,
                            2.57,  2.41,  2.23,  2.519, 2.45,
                            2.42,  2.471, 2.440, 2.58,  2.611,