Changeset 1315 for trunk/source/global/management/src/G4PhysicsVector.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/global/management/src/G4PhysicsVector.cc (modified) (9 diffs)

trunk/source/global/management/src/G4PhysicsVector.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicsVector.cc,v 1.41 2009/12/07 09:21:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4PhysicsVector.cc,v 1.46 2010/05/28 05:13:43 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -49 +49 @@
 //                                    algorithm
 //    19 Jun. 2009, V.Ivanchenko : removed hidden bin 
+//    17 Nov. 2009, H.Kurashige   : use pointer for DataVector
+//    04 May  2010  H.Kurashige   : use G4PhyscisVectorCache
+//    28 May  2010  H.Kurashige  : Stop using  pointers to G4PVDataVector
 // --------------------------------------------------------------
 
@@ -59 +62 @@
  : type(T_G4PhysicsVector),
    edgeMin(0.), edgeMax(0.), numberOfNodes(0),
-   lastEnergy(-DBL_MAX), lastValue(0.), lastBin(0), useSpline(spline)
-{}
+   useSpline(spline)
+{
+  cache      = new G4PhysicsVectorCache();
+}
 
 // --------------------------------------------------------------
 
 G4PhysicsVector::~G4PhysicsVector() 
-{}
+{
+  delete cache; cache =0;
+}
 
 // --------------------------------------------------------------
@@ -71 +78 @@
 G4PhysicsVector::G4PhysicsVector(const G4PhysicsVector& right)
 {
+  cache      = new G4PhysicsVectorCache();
   CopyData(right);
 }
@@ -116 +124 @@
   edgeMax = vec.edgeMax;
   numberOfNodes = vec.numberOfNodes;
-  lastEnergy = vec.lastEnergy;
-  lastValue = vec.lastValue;
-  lastBin = vec.lastBin;
-  dataVector = vec.dataVector;
-  binVector = vec.binVector;
+  cache->lastEnergy = vec.GetLastEnergy();
+  cache->lastValue = vec.GetLastValue();
+  cache->lastBin = vec.GetLastBin();
   useSpline = vec.useSpline;
   comment = vec.comment;
-  secDerivative = vec.secDerivative;
+
+  size_t i;
+  dataVector.clear();
+  for(i=0; i<(vec.dataVector).size(); i++){ 
+    dataVector.push_back( (vec.dataVector)[i] );
+  }
+  binVector.clear();
+  for(i=0; i<(vec.binVector).size(); i++){ 
+    binVector.push_back( (vec.binVector)[i] );
+  }
+  secDerivative.clear();
+  for(i=0; i<(vec.secDerivative).size(); i++){ 
+    secDerivative.push_back( (vec.secDerivative)[i] );
+  }
 }
 
@@ -171 +190 @@
 {
   // clear properties;
-  lastEnergy=-DBL_MAX;
-  lastValue =0.;
-  lastBin   =0;
+  cache->lastEnergy=-DBL_MAX;
+  cache->lastValue =0.;
+  cache->lastBin   =0;
   dataVector.clear();
   binVector.clear();
@@ -253 +272 @@
   edgeMin *= factorE;
   edgeMax *= factorE;
-  lastEnergy *= factorE;
-  lastValue  *= factorV;
+  cache->lastEnergy = factorE*(cache->lastEnergy);
+  cache->lastValue  = factorV*(cache->lastValue);
 }
 
@@ -293 +312 @@
   {
     sig = (binVector[i]-binVector[i-1]) / (binVector[i+1]-binVector[i-1]);
-    p = sig*secDerivative[i-1] + 2.0;
+    p = sig*(secDerivative[i-1]) + 2.0;
     secDerivative[i] = (sig - 1.0)/p;
     u[i] = (dataVector[i+1]-dataVector[i])/(binVector[i+1]-binVector[i])
@@ -457 +476 @@
   return out;
 }
+
+//---------------------------------------------------------------
+
+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 == cache->lastEnergy ) {
+
+  } else if( theEnergy < cache->lastEnergy
+        &&   theEnergy >= binVector[cache->lastBin]) {
+     cache->lastEnergy = theEnergy;
+     Interpolation(cache->lastBin);
+
+  } else if( theEnergy <= edgeMin ) {
+     cache->lastBin = 0;
+     cache->lastEnergy = edgeMin;
+     cache->lastValue  = dataVector[0];
+
+  } else if( theEnergy >= edgeMax ){
+     cache->lastBin = numberOfNodes-1;
+     cache->lastEnergy = edgeMax;
+     cache->lastValue  = dataVector[cache->lastBin];
+
+  } else {
+     cache->lastBin = FindBinLocation(theEnergy); 
+     cache->lastEnergy = theEnergy;
+     Interpolation(cache->lastBin);
+  }
+  return cache->lastValue;        
+}
+