Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc (Version 11.3.0) and /processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc (Version 10.6.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
 27 //                                                 27 //
 28 // Author: Maria Grazia Pia (Maria.Grazia.Pia@     28 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 29 //                                                 29 //
 30 // History:                                        30 // History:
 31 // -----------                                     31 // -----------
 32 // 31 Jul 2001   MGP        Created                32 // 31 Jul 2001   MGP        Created
 33 // 14 JUn 2009   NAK        New Calculation me     33 // 14 JUn 2009   NAK        New Calculation method implemented to which logarithmic values
 34 //                          from the G4EMLOW d     34 //                          from the G4EMLOW dataset are loaded directly to enhance performance
 35 //                                                 35 //
 36 // -------------------------------------------     36 // -------------------------------------------------------------------
 37                                                    37 
 38 #include "G4LinInterpolation.hh"                   38 #include "G4LinInterpolation.hh"
 39                                                    39 
 40 // Constructor                                     40 // Constructor
 41 // ------------------------------------------- <<  41 
 42 G4LinInterpolation::G4LinInterpolation()           42 G4LinInterpolation::G4LinInterpolation()
 43 { }                                                43 { }
 44                                                    44 
 45 // ------------------------------------------- << 
 46 // Destructor                                      45 // Destructor
                                                   >>  46 
 47 G4LinInterpolation::~G4LinInterpolation()          47 G4LinInterpolation::~G4LinInterpolation()
 48 { }                                                48 { }
 49                                                    49 
 50 // ------------------------------------------- <<  50 
 51 G4VDataSetAlgorithm* G4LinInterpolation::Clone     51 G4VDataSetAlgorithm* G4LinInterpolation::Clone() const 
 52 { return new G4LinInterpolation; }                 52 { return new G4LinInterpolation; }
 53                                                    53 
 54 // ------------------------------------------- << 
 55 G4double G4LinInterpolation::Calculate(G4doubl     54 G4double G4LinInterpolation::Calculate(G4double x, G4int bin, 
 56                const G4DataVector& points,         55                const G4DataVector& points, 
 57                const G4DataVector& data) const     56                const G4DataVector& data) const
 58 {                                                  57 {
 59   //G4cout << "G4LinInterpolation is performed     58   //G4cout << "G4LinInterpolation is performed (2 arguments)" << G4endl;
 60   G4int nBins = G4int(data.size() - 1);        <<  59   G4int nBins = data.size() - 1;
 61   G4double value = 0.;                             60   G4double value = 0.;
 62   if (x < points[0])                               61   if (x < points[0])
 63     {                                              62     {
 64       value = 0.;                                  63       value = 0.;
 65     }                                              64     }
 66   else if (bin < nBins)                            65   else if (bin < nBins)
 67     {                                              66     {
 68       G4double e1 = points[bin];                   67       G4double e1 = points[bin];
 69       G4double e2 = points[bin+1];                 68       G4double e2 = points[bin+1];
 70       G4double d1 = data[bin];                     69       G4double d1 = data[bin];
 71       G4double d2 = data[bin+1];                   70       G4double d2 = data[bin+1];
 72       value = d1 + (d2 - d1)*(x - e1)/(e2 - e1     71       value = d1 + (d2 - d1)*(x - e1)/(e2 - e1);
 73     }                                              72     }
 74   else                                             73   else
 75     {                                              74     {
 76       value = data[nBins];                         75       value = data[nBins];
 77     }                                              76     }
 78   return value;                                    77   return value;
 79 }                                                  78 }
 80                                                    79 
 81 // ------------------------------------------- <<  80 
 82 //Nicolas A. Karakatsanis: New Calculation met     81 //Nicolas A. Karakatsanis: New Calculation method implemented to which logarithmic values
 83 //                         from the G4EMLOW da     82 //                         from the G4EMLOW dataset are loaded directly to enhance performance
 84                                                    83 
 85 G4double G4LinInterpolation::Calculate(G4doubl     84 G4double G4LinInterpolation::Calculate(G4double x, G4int bin, 
 86                const G4DataVector& points,         85                const G4DataVector& points,
 87                                        const G     86                                        const G4DataVector& data,
 88                                        const G     87                                        const G4DataVector& log_points, 
 89                const G4DataVector& log_data) c     88                const G4DataVector& log_data) const
 90 {                                                  89 {
 91 //Linear Interpolation is performed on loagari     90 //Linear Interpolation is performed on loagarithmic data set
 92 //Equivalent to log-log interpolation on non-l     91 //Equivalent to log-log interpolation on non-loagarithmic data set
 93   //G4cout << "G4LinInterpolation is performed     92   //G4cout << "G4LinInterpolation is performed - (4 arguments)" << G4endl;
 94   G4int nBins = G4int(data.size() - 1);        <<  93   G4int nBins = data.size() - 1;
 95   G4double value = 0.;                             94   G4double value = 0.;
 96   G4double log_x = std::log10(x);                  95   G4double log_x = std::log10(x);
 97   if (x < points[0])                               96   if (x < points[0])
 98     {                                              97     {
 99       value = 0.;                                  98       value = 0.;
100     }                                              99     }
101   else if (bin < nBins)                           100   else if (bin < nBins)
102     {                                             101     {
103       G4double log_e1 = log_points[bin];          102       G4double log_e1 = log_points[bin];
104       G4double log_e2 = log_points[bin+1];        103       G4double log_e2 = log_points[bin+1];
105       G4double log_d1 = log_data[bin];            104       G4double log_d1 = log_data[bin];
106       G4double log_d2 = log_data[bin+1];          105       G4double log_d2 = log_data[bin+1];
107                                                   106 
108 // Values e1, e2, d1 and d2 are the log values    107 // Values e1, e2, d1 and d2 are the log values of the corresponding
109 // original energy and data values. Simple lin    108 // original energy and data values. Simple linear interpolation performed
110 // on loagarithmic data should be equivalent t    109 // on loagarithmic data should be equivalent to log-log interpolation
111       value = log_d1 + (log_d2 - log_d1)*(log_    110       value = log_d1 + (log_d2 - log_d1)*(log_x - log_e1)/(log_e2 - log_e1);
112                                                   111 
113 // Delogarithmize to obtain interpolated value    112 // Delogarithmize to obtain interpolated value
114       value = std::pow(10.,value);                113       value = std::pow(10.,value);
115    }                                              114    }
116  else                                             115  else
117    {                                              116    {
118      value = data[nBins];                         117      value = data[nBins];
119    }                                              118    }
120   return value;                                   119   return value;
121 }                                                 120 }
122                                                   121