Changeset 1315 for trunk/source/global/management/include/G4PhysicsVector.icc

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/global/management/include/G4PhysicsVector.icc (modified) (7 diffs)

trunk/source/global/management/include/G4PhysicsVector.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicsVector.icc,v 1.23 2009/11/18 11:42:03 vnivanch Exp $
-// GEANT4 tag $Name: global-V09-02-10 $
+// $Id: G4PhysicsVector.icc,v 1.28 2010/05/28 05:13:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -44 +44 @@
 
 inline
+ G4double G4PhysicsVector::GetLastEnergy() const
+{
+  return cache->lastEnergy;     
+}
+
+inline
+ G4double G4PhysicsVector::GetLastValue() const
+{
+   return cache->lastValue;
+}
+
+inline 
+ size_t G4PhysicsVector::GetLastBin() const
+{
+   return cache->lastBin;
+}
+ 
+inline
  G4double G4PhysicsVector::operator[](const size_t binNumber) const
 {
+  return  dataVector[binNumber];
+}
+
+//---------------------------------------------------------------
+
+inline
+ G4double G4PhysicsVector::operator()(const size_t binNumber) const
+{
   return dataVector[binNumber];
 }
@@ -52 +78 @@
 
 inline
- G4double G4PhysicsVector::operator()(const size_t binNumber) const
-{
-  return dataVector[binNumber];
-}
-
-//---------------------------------------------------------------
-
-inline
  G4double G4PhysicsVector::Energy(const size_t binNumber) const
 {
@@ -76 +94 @@
 
 inline
- G4double G4PhysicsVector::LinearInterpolation()
+ G4double G4PhysicsVector::GetValue(G4double theEnergy, G4bool&) 
+{
+  return Value(theEnergy);
+}
+
+//------------------------------------------------
+
+inline
+ G4double G4PhysicsVector::LinearInterpolation(G4int lastBin)
 {
   // Linear interpolation is used to get the value. If the give energy
@@ -84 +110 @@
   // numberOfBin-1. 
 
-  G4double intplFactor = (lastEnergy-binVector[lastBin]) 
-     / (binVector[lastBin+1]-binVector[lastBin]); // Interpolation factor
+  G4double intplFactor = (cache->lastEnergy-binVector[lastBin]) 
+     / (binVector[lastBin + 1]-binVector[lastBin]); // Interpol. factor
 
   return dataVector[lastBin] +
-         ( dataVector[lastBin+1]-dataVector[lastBin] ) * intplFactor;
-}
-
-//---------------------------------------------------------------
-
-inline
- G4double G4PhysicsVector::SplineInterpolation()
+         ( dataVector[lastBin + 1]-dataVector[lastBin] ) * intplFactor;
+}
+
+//---------------------------------------------------------------
+
+inline
+ G4double G4PhysicsVector::SplineInterpolation(G4int lastBin)
 {
   // Spline interpolation is used to get the value. If the give energy
@@ -106 +132 @@
   // check bin value
   G4double x1 = binVector[lastBin];
-  G4double x2 = binVector[lastBin+1];
+  G4double x2 = binVector[lastBin + 1];
   G4double delta = x2 - x1;
 
-  G4double a = (x2 - lastEnergy)/delta;
-  G4double b = (lastEnergy - x1)/delta;
+  G4double a = (x2 - cache->lastEnergy)/delta;
+  G4double b = (cache->lastEnergy - x1)/delta;
    
   // Final evaluation of cubic spline polynomial for return   
   G4double y1 = dataVector[lastBin];
-  G4double y2 = dataVector[lastBin+1];
+  G4double y2 = dataVector[lastBin + 1];
 
   G4double res = a*y1 + b*y2 + 
         ( (a*a*a - a)*secDerivative[lastBin] +
-          (b*b*b - b)*secDerivative[lastBin+1] )*delta*delta/6.0;
+          (b*b*b - b)*secDerivative[lastBin + 1] )*delta*delta/6.0;
 
   return res;
@@ -125 +151 @@
 //---------------------------------------------------------------
 
-inline
- G4double G4PhysicsVector::GetValue(G4double theEnergy, G4bool&) 
-{
-  return Value(theEnergy);
-}
-
-//---------------------------------------------------------------
-
-inline
- G4double G4PhysicsVector::Value(G4double theEnergy) 
-{
-  // Use cache for speed up - check if the value 'theEnergy' is same as the 
-  // last call. If it is same, then use the last bin location. Also the
-  // value 'theEnergy' lies between the last energy and low edge of of the 
-  // bin of last call, then the last bin location is used.
-
-  if( theEnergy == lastEnergy ) {
-
-  } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin]) {
-     lastEnergy = theEnergy;
-     Interpolation();
-
-  } else if( theEnergy <= edgeMin ) {
-     lastBin = 0;
-     lastEnergy = edgeMin;
-     lastValue  = dataVector[0];
-
-  } else if( theEnergy >= edgeMax ){
-     lastBin = numberOfNodes-2;
-     lastEnergy = edgeMax;
-     lastValue  = dataVector[numberOfNodes-1];
-
-  } else {
-     lastBin = FindBinLocation(theEnergy); 
-     if(lastBin >= numberOfNodes-1) {lastBin = numberOfNodes-2;} 
-     lastEnergy = theEnergy;
-     Interpolation();
-  }
-  return lastValue;        
-}
-
-//---------------------------------------------------------------
-
-inline 
- void G4PhysicsVector::Interpolation()
-{
-  if(useSpline) { lastValue = SplineInterpolation(); }
-  else          { lastValue = LinearInterpolation(); }
+inline 
+ void G4PhysicsVector::Interpolation(G4int lastBin)
+{
+  if(useSpline) { cache->lastValue = SplineInterpolation(lastBin); }
+  else          { cache->lastValue = LinearInterpolation(lastBin); }
 }