Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.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/G4LogLogInterpolation.cc (Version 11.3.0) and /processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc (Version 9.6)


  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 // $Id$
 27 //                                                 28 //
 28 // Author: Maria Grazia Pia (Maria.Grazia.Pia@     29 // Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
 29 //         Sebastian Incerti (incerti@cenbg.in     30 //         Sebastian Incerti (incerti@cenbg.in2p3.fr)
 30 //         Nicolas A. Karakatsanis (knicolas@m     31 //         Nicolas A. Karakatsanis (knicolas@mail.ntua.gr)
 31 // History:                                        32 // History:
 32 // -----------                                     33 // -----------
 33 // 31 Jul 2001   MGP        Created                34 // 31 Jul 2001   MGP        Created
 34 // 27 Jun 2008   SI         Add check to avoid     35 // 27 Jun 2008   SI         Add check to avoid FPE errors
 35 // 08 Dec 2008   NAK        Log-Log interpolat <<  36 // 08 Dec 2008   NAK        Log-Log interpolation math formula streamlined, self-test function
 36 //                            self-test functi <<  37 // 14 Jun 2008   NAK        New implementation for log-log interpolation after directly loading
 37 // 14 Jun 2008   NAK        New implementation <<  38 //                          logarithmic values from G4EMLOW dataset
 38 //                           after directly lo << 
 39 //                           logarithmic value << 
 40 // -------------------------------------------     39 // -------------------------------------------------------------------
 41                                                    40 
 42 #include "G4LogLogInterpolation.hh"                41 #include "G4LogLogInterpolation.hh"
 43                                                    42 
 44 //....oooOO0OOooo........oooOO0OOooo........oo << 
 45 // Constructor                                     43 // Constructor
                                                   >>  44 
 46 G4LogLogInterpolation::G4LogLogInterpolation()     45 G4LogLogInterpolation::G4LogLogInterpolation()
 47 { }                                                46 { }
 48                                                    47 
 49 //....oooOO0OOooo........oooOO0OOooo........oo << 
 50 // Destructor                                      48 // Destructor
                                                   >>  49 
 51 G4LogLogInterpolation::~G4LogLogInterpolation(     50 G4LogLogInterpolation::~G4LogLogInterpolation()
 52 { }                                                51 { }
 53                                                    52 
 54 //....oooOO0OOooo........oooOO0OOooo........oo << 
 55 G4VDataSetAlgorithm* G4LogLogInterpolation::Cl     53 G4VDataSetAlgorithm* G4LogLogInterpolation::Clone() const 
 56 { return new G4LogLogInterpolation; }              54 { return new G4LogLogInterpolation; }
 57                                                    55 
 58 //....oooOO0OOooo........oooOO0OOooo........oo <<  56 
 59 G4double G4LogLogInterpolation::Calculate(G4do     57 G4double G4LogLogInterpolation::Calculate(G4double x, G4int bin, 
 60             const G4DataVector& points,            58             const G4DataVector& points, 
 61             const G4DataVector& data) const        59             const G4DataVector& data) const
 62 {                                                  60 {
 63   G4int nBins = G4int(data.size() - 1);        <<  61   //G4cout << "G4LogLogInterpolation is performed (2 arguments) " << G4endl;
                                                   >>  62   G4int nBins = data.size() - 1;
                                                   >>  63 //G4double oldresult = 0.;
 64   G4double value = 0.;                             64   G4double value = 0.;
 65   if (x < points[0])                               65   if (x < points[0])
 66     {                                              66     {
 67       value = 0.;                                  67       value = 0.;
 68     }                                              68     }
 69   else if (bin < nBins)                            69   else if (bin < nBins)
 70     {                                              70     {
 71       G4double e1 = points[bin];                   71       G4double e1 = points[bin];
 72       G4double e2 = points[bin+1];                 72       G4double e2 = points[bin+1];
 73       G4double d1 = data[bin];                     73       G4double d1 = data[bin];
 74       G4double d2 = data[bin+1];                   74       G4double d2 = data[bin+1];
 75       // Check of e1, e2, d1 and d2 values to  <<  75 // Check of e1, e2, d1 and d2 values to avoid floating-point errors when estimating the interpolated value below -- S.I., Jun. 2008
 76       // interpolated value below              << 
 77       if ((d1 > 0.) && (d2 > 0.) && (e1 > 0.)      76       if ((d1 > 0.) && (d2 > 0.) && (e1 > 0.) && (e2 > 0.))
 78         {                                          77         {
 79                                                <<  78 // Streamline the Log-Log Interpolation formula in order to reduce the required number of log10() function calls
 80     value = std::log10(d1)+(std::log10(d2/d1)/ <<  79 // Variable oldresult contains the result of old implementation of Log-Log interpolation -- M.G.P. Jun. 2001
 81     value = std::pow(10.,value);               <<  80 //       oldresult = (std::log10(d1)*std::log10(e2/x) + std::log10(d2)*std::log10(x/e1)) / std::log10(e2/e1);
                                                   >>  81 //       oldresult = std::pow(10.,oldresult);
                                                   >>  82 // Variable value contains the result of new implementation, after streamlining the math operation -- N.A.K. Oct. 2008
                                                   >>  83          value = std::log10(d1)+(std::log10(d2/d1)/std::log10(e2/e1)*std::log10(x/e1));
                                                   >>  84          value = std::pow(10.,value);
                                                   >>  85 // Test of the new implementation result (value variable) against the old one (oldresult) -- N.A.K. Dec. 2008
                                                   >>  86 //       G4double diffResult = value - oldresult;
                                                   >>  87 //       G4double relativeDiff = 1e-11;
                                                   >>  88 // Comparison of the two values based on a max allowable relative difference
                                                   >>  89 //       if ( std::fabs(diffResult) > relativeDiff*std::fabs(oldresult) )
                                                   >>  90 //        {
                                                   >>  91 // Abort comparison when at least one of two results is infinite
                                                   >>  92 //           if ((!std::isinf(oldresult)) && (!std::isinf(value)))
                                                   >>  93 //            {
                                                   >>  94 //              G4cout << "G4LogLogInterpolation> Old Interpolated Value is:" << oldresult << G4endl;
                                                   >>  95 //              G4cout << "G4LogLogInterpolation> New Interpolated Value is:" << value << G4endl << G4endl;
                                                   >>  96 //              G4cerr << "G4LogLogInterpolation> Error in Interpolation:" << G4endl;
                                                   >>  97 //              G4cerr << "The difference between new and old interpolated value is:" << diffResult << G4endl << G4endl;
                                                   >>  98 //            }
                                                   >>  99 //        }
 82         }                                         100         }
 83       else value = 0.;                            101       else value = 0.;
 84     }                                             102     }
 85   else                                            103   else
 86     {                                             104     {
 87       value = data[nBins];                        105       value = data[nBins];
 88     }                                             106     }
 89   return value;                                   107   return value;
 90 }                                                 108 }
 91                                                   109 
 92 //....oooOO0OOooo........oooOO0OOooo........oo << 110 
 93 // Nicolas A. Karakatsanis: New implementation    111 // Nicolas A. Karakatsanis: New implementation of log-log interpolation after directly loading 
 94 //                          logarithmic values    112 //                          logarithmic values from G4EMLOW dataset
                                                   >> 113 
 95 G4double G4LogLogInterpolation::Calculate(G4do    114 G4double G4LogLogInterpolation::Calculate(G4double x, G4int bin, 
 96             const G4DataVector& points,           115             const G4DataVector& points,
 97                                           cons    116                                           const G4DataVector& data,
 98                                           cons    117                                           const G4DataVector& log_points, 
 99             const G4DataVector& log_data) cons    118             const G4DataVector& log_data) const
100 {                                              << 119 {
101   G4int nBins = G4int(data.size() - 1);        << 120   //G4cout << "G4LogLogInterpolation is performed (4 arguments) " << G4endl;
                                                   >> 121   G4int nBins = data.size() - 1;
102   G4double value = 0.;                            122   G4double value = 0.;
103   G4double log_x = std::log10(x);                 123   G4double log_x = std::log10(x);
104   if (x < points[0])                              124   if (x < points[0])
105     {                                             125     {
106       value = 0.;                                 126       value = 0.;
107     }                                             127     }
108   else if (bin < nBins)                           128   else if (bin < nBins)
109     {                                             129     {
110       G4double log_e1 = log_points[bin];          130       G4double log_e1 = log_points[bin];
111       G4double log_e2 = log_points[bin+1];        131       G4double log_e2 = log_points[bin+1];
112       G4double log_d1 = log_data[bin];            132       G4double log_d1 = log_data[bin];
113       G4double log_d2 = log_data[bin+1];          133       G4double log_d2 = log_data[bin+1];
114                                                   134       
115       // Values e1, e2, d1 and d2 are the log  << 135       //G4cout << "x = " << x << " , logx = " << log_x  << " , bin = " << bin << G4endl; 
116       // original energy and data values. Simp << 136       //G4cout << "e1 = " << points[bin] << " d1 = " << data[bin] << G4endl;
117       // on loagarithmic data should be equiva << 137       //G4cout << "e2 = " << points[bin+1] << " d2 = " << data[bin+1] << G4endl;
                                                   >> 138       //G4cout << "loge1 = " << log_e1 << " logd1 = " << log_d1 << G4endl;
                                                   >> 139       //G4cout << "loge2 = " << log_e2 << " logd2 = " << log_d2 << G4endl;
                                                   >> 140 
                                                   >> 141 // Values e1, e2, d1 and d2 are the log values of the corresponding
                                                   >> 142 // original energy and data values. Simple linear interpolation performed
                                                   >> 143 // on loagarithmic data should be equivalent to log-log interpolation
118       value = log_d1 + (log_d2 - log_d1)*(log_    144       value = log_d1 + (log_d2 - log_d1)*(log_x - log_e1)/(log_e2 - log_e1);
119                                                   145 
120       // Delogarithmize to obtain interpolated << 146 // Delogarithmize to obtain interpolated value
121       value = std::pow(10.,value);                147       value = std::pow(10.,value);
122    }                                              148    }
123   else                                         << 149  else
124     {                                          << 150    {
125       value = data[nBins];                     << 151      value = data[nBins];
126     }                                          << 152    }
127   return value;                                   153   return value;
128 }                                                 154 }
129                                                   155