Changeset 1192 for trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc

Timestamp:

Nov 19, 2009, 2:53:25 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc (modified) (4 diffs)

trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4LinInterpolation.cc,v 1.3 2006/06/29 19:40:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4LinInterpolation.cc,v 1.5 2009/09/25 07:41:34 sincerti Exp $
+// GEANT4 tag $Name: emlowen-V09-02-64 $
 //
 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
@@ -33 +33 @@
 // -----------
 // 31 Jul 2001   MGP        Created
+// 14 JUn 2009   NAK        New Calculation method implemented to which logarithmic values
+//                          from the G4EMLOW dataset are loaded directly to enhance performance
 //
 // -------------------------------------------------------------------
@@ -56 +58 @@
                                        const G4DataVector& data) const
 {
+  //G4cout << "G4LinInterpolation is performed (2 arguments)" << G4endl;
   G4int nBins = data.size() - 1;
   G4double value = 0.;
@@ -76 +79 @@
   return value;
 }
+
+
+//Nicolas A. Karakatsanis: New Calculation method implemented to which logarithmic values
+//                         from the G4EMLOW dataset are loaded directly to enhance performance
+
+G4double G4LinInterpolation::Calculate(G4double x, G4int bin, 
+                                       const G4DataVector& points,
+                                       const G4DataVector& data,
+                                       const G4DataVector& log_points, 
+                                       const G4DataVector& log_data) const
+{
+//Linear Interpolation is performed on loagarithmic data set
+//Equivalent to log-log interpolation on non-loagarithmic data set
+  //G4cout << "G4LinInterpolation is performed - (4 arguments)" << G4endl;
+  G4int nBins = data.size() - 1;
+  G4double value = 0.;
+  G4double log_x = std::log10(x);
+  if (x < points[0])
+    {
+      value = 0.;
+    }
+  else if (bin < nBins)
+    {
+      G4double log_e1 = log_points[bin];
+      G4double log_e2 = log_points[bin+1];
+      G4double log_d1 = log_data[bin];
+      G4double log_d2 = log_data[bin+1];
+
+// Values e1, e2, d1 and d2 are the log values of the corresponding
+// original energy and data values. Simple linear interpolation performed
+// on loagarithmic data should be equivalent to log-log interpolation
+      value = log_d1 + (log_d2 - log_d1)*(log_x - log_e1)/(log_e2 - log_e1);
+
+// Delogarithmize to obtain interpolated value
+      value = std::pow(10.,value);
+   }
+ else
+   {
+     value = data[nBins];
+   }
+  return value;
+}