Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/persistency/ascii/src/G4tgrEvaluator.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 /persistency/ascii/src/G4tgrEvaluator.cc (Version 11.3.0) and /persistency/ascii/src/G4tgrEvaluator.cc (Version 10.7.p1)


  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 // G4tgrEvaluator implementation                   26 // G4tgrEvaluator implementation
 27 //                                                 27 //
 28 // Author: P.Arce, CIEMAT (November 2007)          28 // Author: P.Arce, CIEMAT (November 2007)
 29 // -------------------------------------------     29 // --------------------------------------------------------------------
 30                                                    30 
 31 #include "G4tgrEvaluator.hh"                       31 #include "G4tgrEvaluator.hh"
 32                                                    32 
 33 #include <cmath>                                   33 #include <cmath>
 34                                                    34 
 35 // -------------------------------------------     35 // --------------------------------------------------------------------
 36 G4tgrEvaluator::G4tgrEvaluator()                   36 G4tgrEvaluator::G4tgrEvaluator()
 37 {                                                  37 {
 38   AddCommonFunctions();                            38   AddCommonFunctions();
 39 }                                                  39 }
 40                                                    40 
 41 // -------------------------------------------     41 // --------------------------------------------------------------------
 42 G4tgrEvaluator::~G4tgrEvaluator()                  42 G4tgrEvaluator::~G4tgrEvaluator()
 43 {                                                  43 {
 44 }                                                  44 }
 45                                                    45 
 46 // -------------------------------------------     46 // --------------------------------------------------------------------
 47 void G4tgrEvaluator::print_error(G4int estatus     47 void G4tgrEvaluator::print_error(G4int estatus) const
 48 {                                                  48 {
 49   switch(estatus)                                  49   switch(estatus)
 50   {                                                50   {
 51     case ERROR_SYNTAX_ERROR:                       51     case ERROR_SYNTAX_ERROR:
 52       G4cerr << "G4tgrEvaluator: syntax error!     52       G4cerr << "G4tgrEvaluator: syntax error!" << G4endl;
 53       return;                                      53       return;
 54     default:                                       54     default:
 55       G4Evaluator::print_error();                  55       G4Evaluator::print_error();
 56       return;                                      56       return;
 57   }                                                57   }
 58 }                                                  58 }
 59                                                    59 
 60 G4double fltsin(G4double arg) { return std::si <<  60 G4double fsin(G4double arg) { return std::sin(arg); }
 61 G4double fltcos(G4double arg) { return std::co <<  61 G4double fcos(G4double arg) { return std::cos(arg); }
 62 G4double flttan(G4double arg) { return std::ta <<  62 G4double ftan(G4double arg) { return std::tan(arg); }
 63 G4double fltasin(G4double arg) { return std::a <<  63 G4double fasin(G4double arg) { return std::asin(arg); }
 64 G4double fltacos(G4double arg) { return std::a <<  64 G4double facos(G4double arg) { return std::acos(arg); }
 65 G4double fltatan(G4double arg) { return std::a <<  65 G4double fatan(G4double arg) { return std::atan(arg); }
 66 G4double fltatan2(G4double arg1, G4double arg2 <<  66 G4double fatan2(G4double arg1, G4double arg2) { return std::atan2(arg1, arg2); }
 67 G4double fltsinh(G4double arg) { return std::s <<  67 G4double fsinh(G4double arg) { return std::sinh(arg); }
 68 G4double fltcosh(G4double arg) { return std::c <<  68 G4double fcosh(G4double arg) { return std::cosh(arg); }
 69 G4double flttanh(G4double arg) { return std::t <<  69 G4double ftanh(G4double arg) { return std::tanh(arg); }
 70 // G4double fltasinh( G4double arg ){  return  <<  70 // G4double fasinh( G4double arg ){  return std::asinh(arg); }
 71 // G4double fltacosh( G4double arg ){  return  <<  71 // G4double facosh( G4double arg ){  return std::acosh(arg); }
 72 // G4double fltatanh( G4double arg ){  return  <<  72 // G4double fatanh( G4double arg ){  return std::atanh(arg); }
 73 G4double fltsqrt(G4double arg) { return std::s <<  73 G4double fsqrt(G4double arg) { return std::sqrt(arg); }
 74 G4double fltexp(G4double arg) { return std::ex <<  74 G4double fexp(G4double arg) { return std::exp(arg); }
 75 G4double fltlog(G4double arg) { return std::lo <<  75 G4double flog(G4double arg) { return std::log(arg); }
 76 G4double fltlog10(G4double arg) { return std:: <<  76 G4double flog10(G4double arg) { return std::log10(arg); }
 77 G4double fltpow(G4double arg1, G4double arg2)  <<  77 G4double fpow(G4double arg1, G4double arg2) { return std::pow(arg1, arg2); }
 78                                                    78 
 79 // -------------------------------------------     79 // --------------------------------------------------------------------
 80 void G4tgrEvaluator::AddCommonFunctions()          80 void G4tgrEvaluator::AddCommonFunctions()
 81 {                                                  81 {
 82   setFunction("sin", (*fltsin));               <<  82   setFunction("sin", (*fsin));
 83   setFunction("cos", (*fltcos));               <<  83   setFunction("cos", (*fcos));
 84   setFunction("tan", (*flttan));               <<  84   setFunction("tan", (*ftan));
 85   setFunction("asin", (*fltasin));             <<  85   setFunction("asin", (*fasin));
 86   setFunction("acos", (*fltacos));             <<  86   setFunction("acos", (*facos));
 87   setFunction("atan", (*fltatan));             <<  87   setFunction("atan", (*fatan));
 88   setFunction("atan2", (*fltatan2));           <<  88   setFunction("atan2", (*fatan2));
 89   setFunction("sinh", (*fltsinh));             <<  89   setFunction("sinh", (*fsinh));
 90   setFunction("cosh", (*fltcosh));             <<  90   setFunction("cosh", (*fcosh));
 91   setFunction("tanh", (*flttanh));             <<  91   setFunction("tanh", (*ftanh));
 92   //  setFunction("asinh", (*fltasinh));       <<  92   //  setFunction("asinh", (*fasinh));
 93   //  setFunction("acosh", (*fltacosh));       <<  93   //  setFunction("acosh", (*facosh));
 94   //  setFunction("atanh", (*fltatanh));       <<  94   //  setFunction("atanh", (*fatanh));
 95   setFunction("sqrt", (*fltsqrt));             <<  95   setFunction("sqrt", (*fsqrt));
 96   setFunction("exp", (*fltexp));               <<  96   setFunction("exp", (*fexp));
 97   setFunction("log", (*fltlog));               <<  97   setFunction("log", (*flog));
 98   setFunction("log10", (*fltlog10));           <<  98   setFunction("log10", (*flog10));
 99   setFunction("pow", (*fltpow));               <<  99   setFunction("pow", (*fpow));
100 }                                                 100 }
101                                                   101