Geant4 Cross Reference

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


  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:  Vladimir Ivanchenko (Vladimir.Ivan     28 // Author:  Vladimir Ivanchenko (Vladimir.Ivantchenko@cern.ch)
 29 //                                                 29 //
 30 // History:                                        30 // History:
 31 // -----------                                     31 // -----------
 32 // 27 May 2002   VI        Created                 32 // 27 May 2002   VI        Created
 33 //                                                 33 //
 34 // -------------------------------------------     34 // -------------------------------------------------------------------
 35                                                    35 
 36 #include "G4LinLogInterpolation.hh"                36 #include "G4LinLogInterpolation.hh"
 37 #include "G4Exp.hh"                            << 
 38                                                    37 
 39 //....oooOO0OOooo........oooOO0OOooo........oo << 
 40 // Constructor                                     38 // Constructor
                                                   >>  39 
 41 G4LinLogInterpolation::G4LinLogInterpolation()     40 G4LinLogInterpolation::G4LinLogInterpolation()
 42 { }                                                41 { }
 43                                                    42 
 44 //....oooOO0OOooo........oooOO0OOooo........oo <<  43 
 45 // Destructor                                      44 // Destructor
                                                   >>  45 
 46 G4LinLogInterpolation::~G4LinLogInterpolation(     46 G4LinLogInterpolation::~G4LinLogInterpolation()
 47 { }                                                47 { }
 48                                                    48 
 49 //....oooOO0OOooo........oooOO0OOooo........oo <<  49 
 50 G4double G4LinLogInterpolation::Calculate(G4do <<  50 G4double G4LinLogInterpolation::Calculate(G4double x, G4int bin, 
 51             const G4DataVector& points,        <<  51             const G4DataVector& points, 
 52             const G4DataVector& data) const        52             const G4DataVector& data) const
 53 {                                                  53 {
 54   //G4cout << "G4LinLogInterpolation is perfor     54   //G4cout << "G4LinLogInterpolation is performed on dataset (2 arguments) " << G4endl;
 55   G4int nBins = G4int(data.size() - 1);        <<  55   G4int nBins = data.size() - 1;
 56   G4double value = 0.;                             56   G4double value = 0.;
 57   if (x < points[0])                               57   if (x < points[0])
 58     {                                              58     {
 59       value = 0.;                                  59       value = 0.;
 60     }                                              60     }
 61   else if (bin < nBins)                            61   else if (bin < nBins)
 62     {                                              62     {
 63       G4double e1 = points[bin];                   63       G4double e1 = points[bin];
 64       G4double e2 = points[bin+1];                 64       G4double e2 = points[bin+1];
 65       G4double d1 = std::log(data[bin]);           65       G4double d1 = std::log(data[bin]);
 66       G4double d2 = std::log(data[bin+1]);         66       G4double d2 = std::log(data[bin+1]);
 67       value = G4Exp(d1 + (d2 - d1)*(x - e1)/ ( <<  67       value = std::exp(d1 + (d2 - d1)*(x - e1)/ (e2 - e1));
 68     }                                              68     }
 69   else                                             69   else
 70     {                                              70     {
 71       value = data[nBins];                         71       value = data[nBins];
 72     }                                              72     }
 73   return value;                                    73   return value;
 74 }                                                  74 }
 75                                                    75 
 76 //....oooOO0OOooo........oooOO0OOooo........oo <<  76 G4double G4LinLogInterpolation::Calculate(G4double x, G4int bin, 
 77                                                << 
 78 G4double G4LinLogInterpolation::Calculate(G4do << 
 79             const G4DataVector& points,            77             const G4DataVector& points,
 80                                           cons     78                                           const G4DataVector& data,
 81                                           cons <<  79                                           const G4DataVector& /*log_points*/, 
 82             const G4DataVector& log_data) cons     80             const G4DataVector& log_data) const
 83 {                                                  81 {
 84   //G4cout << "G4LinLogInterpolation is perfor     82   //G4cout << "G4LinLogInterpolation is performed on dataset (4 arguments) " << G4endl;
 85   G4int nBins = G4int(data.size() - 1);        <<  83   G4int nBins = data.size() - 1;
 86   G4double value = 0.;                             84   G4double value = 0.;
 87   //G4double log_x = std::log10(x);                85   //G4double log_x = std::log10(x);
 88   if (x < points[0])                               86   if (x < points[0])
 89     {                                              87     {
 90       value = 0.;                                  88       value = 0.;
 91     }                                              89     }
 92   else if (bin < nBins)                            90   else if (bin < nBins)
 93     {                                              91     {
 94       G4double e1 = points[bin];                   92       G4double e1 = points[bin];
 95       G4double e2 = points[bin+1];                 93       G4double e2 = points[bin+1];
 96       G4double d1 = data[bin];                     94       G4double d1 = data[bin];
 97       G4double d2 = data[bin+1];                   95       G4double d2 = data[bin+1];
 98       //G4double log_e1 = log_points[bin];         96       //G4double log_e1 = log_points[bin];
 99       //G4double log_e2 = log_points[bin+1];       97       //G4double log_e2 = log_points[bin+1];
100       G4double log_d1 = log_data[bin];             98       G4double log_d1 = log_data[bin];
101       G4double log_d2 = log_data[bin+1];           99       G4double log_d2 = log_data[bin+1];
102       if (d1 > 0.0 && d2 > 0.0)                   100       if (d1 > 0.0 && d2 > 0.0)
103         {                                         101         {
104     // Values e1, e2, d1 and d2 are the log va << 102 // Values e1, e2, d1 and d2 are the log values of the corresponding
105     // original energy and data values.        << 103 // original energy and data values. Simple linear interpolation performed
106     // Simple linear interpolation performed   << 104 // on loagarithmic data should be equivalent to log-log interpolation
107     // on logarithmic data should be equivalen << 
108           //value = log_d1 + (log_d2 - log_d1)    105           //value = log_d1 + (log_d2 - log_d1)*(log_x - log_e1)/(log_e2 - log_e1);
109           value = G4Exp(log_d1 + (log_d2 - log << 106           value = std::exp(log_d1 + (log_d2 - log_d1)*(x - e1)/(e2 - e1));
110         }                                         107         }
111       else                                        108       else
112         {                                         109         {
113           if (d1 == 0.0) log_d1 = -300;           110           if (d1 == 0.0) log_d1 = -300;
114           if (d2 == 0.0) log_d2 = -300;           111           if (d2 == 0.0) log_d2 = -300;
115           value = G4Exp(log_d1 + (log_d2 - log << 112           value = std::exp(log_d1 + (log_d2 - log_d1)*(x - e1)/(e2 - e1));
116         }                                         113         }
117    }                                              114    }
118  else                                             115  else
119    {                                              116    {
120      value = data[nBins];                         117      value = data[nBins];
121    }                                              118    }
122   return value;                                   119   return value;
123 }                                                 120 }
                                                   >> 121 
124                                                   122