Ignore:
Timestamp:
Jan 8, 2010, 11:56:51 AM (14 years ago)
Author:
garnier
Message:

update geant4.9.3 tag

Location:
trunk/source/processes/electromagnetic/adjoint
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/electromagnetic/adjoint/History

    r1196 r1228  
    1 $Id: History,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
     1$Id: History,v 1.5 2009/11/23 09:02:35 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     2023 Nov 2009: G.Cosmo (emadjoint-V09-02-02)
     21- Corrected compilation error on Windows for G4AdjointAlongStepWeightCorrection.
     22
    202320 Nov 2009: L.Desorgher (emadjoint-V09-02-01)
    21 -Replace C++ type by G4 type where needed and adding of G4disclaimer
    22 
     24- Replace C++ type by G4 type where needed and adding of G4 disclaimer.
    2325
    242610 Nov 2009: L.Desorgher (emadjoint-V09-02-00)

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointAlongStepWeightCorrection.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointAlongStepWeightCorrection.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointBremsstrahlungModel.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointBremsstrahlungModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSManager.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointCSManager.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointCSMatrix.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointCSMatrix.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointComptonModel.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointComptonModel.hh,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointInterpolator.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointInterpolator.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointIonIonisationModel.hh

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointIonIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointPhotoElectricModel.hh

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointPhotoElectricModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointProcessEquivalentToDirectProcess.hh

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointProcessEquivalentToDirectProcess.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointeIonisationModel.hh

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointeIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhIonisationModel.hh

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointhIonisationModel.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4AdjointhMultipleScattering.hh

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointhMultipleScattering.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4ContinuousGainOfEnergy.hh

    r1196 r1228  
    2525//
    2626// $Id: G4ContinuousGainOfEnergy.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4InversePEEffect.hh

    r1196 r1228  
    2525//
    2626// $Id: G4InversePEEffect.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4IonInverseIonisation.hh

    r1197 r1228  
    2525//
    2626// $Id: G4IonInverseIonisation.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4VAdjointReverseReaction.hh

    r1197 r1228  
    2525//
    2626// $Id: G4VAdjointReverseReaction.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4VEmAdjointModel.hh

    r1196 r1228  
    2525//
    2626// $Id: G4VEmAdjointModel.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4eInverseBremsstrahlung.hh

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseBremsstrahlung.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4eInverseCompton.hh

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseCompton.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4eInverseIonisation.hh

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseIonisation.hh,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/include/G4hInverseIonisation.hh

    r1197 r1228  
    2525//
    2626// $Id: G4hInverseIonisation.hh,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929/////////////////////////////////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointAlongStepWeightCorrection.cc

    r1196 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointAlongStepWeightCorrection.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4AdjointAlongStepWeightCorrection.cc,v 1.5 2009/11/23 09:02:35 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointAlongStepWeightCorrection.hh"
    … …  
    3232#include "G4VParticleChange.hh"
    3333#include "G4AdjointCSManager.hh"
    34 
    35 #ifdef WIN32
    36 #include <G4float .h>
    37 #endif
    3834
    3935///////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointBremsstrahlungModel.cc

    r1196 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointBremsstrahlungModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4AdjointBremsstrahlungModel.cc,v 1.5 2009/12/16 17:50:01 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointBremsstrahlungModel.hh"
    … …  
    122122  const G4double a1 = 0.625 , a2 = 3.*a1 , d = 27. ;
    123123
    124   if (9./(9.+d) > G4UniformRand()) u = - log(G4UniformRand()*G4UniformRand())/a1;
    125      else                          u = - log(G4UniformRand()*G4UniformRand())/a2;
     124  if (9./(9.+d) > G4UniformRand()) u = - std::log(G4UniformRand()*G4UniformRand())/a1;
     125     else                          u = - std::log(G4UniformRand()*G4UniformRand())/a2;
    126126
    127127  G4double theta = u*electron_mass_c2/projectileTotalEnergy;
    … …  
    183183        G4double Emin=  GetSecondAdjEnergyMinForProdToProjCase(adjointPrimKinEnergy);;
    184184        if (Emin>=Emax) return;
    185         projectileKinEnergy=Emin*pow(Emax/Emin,G4UniformRand());
     185        projectileKinEnergy=Emin*std::pow(Emax/Emin,G4UniformRand());
    186186        diffCSUsed=lastCZ/projectileKinEnergy;
    187187       
    … …  
    193193        G4double f2=(Emax-adjointPrimKinEnergy)/Emax/f1;
    194194        //G4cout<<"f1 and f2 "<<f1<<'\t'<<f2<<G4endl;
    195         projectileKinEnergy=adjointPrimKinEnergy/(1.-f1*pow(f2,G4UniformRand()));
     195        projectileKinEnergy=adjointPrimKinEnergy/(1.-f1*std::pow(f2,G4UniformRand()));
    196196        gammaEnergy=projectileKinEnergy-adjointPrimKinEnergy;
    197197        diffCSUsed=lastCZ*adjointPrimKinEnergy/projectileKinEnergy/gammaEnergy;
    … …  
    232232  const G4double a1 = 0.625 , a2 = 3.*a1 , d = 27. ;
    233233
    234   if (9./(9.+d) > G4UniformRand()) u = - log(G4UniformRand()*G4UniformRand())/a1;
    235      else                          u = - log(G4UniformRand()*G4UniformRand())/a2;
     234  if (9./(9.+d) > G4UniformRand()) u = - std::log(G4UniformRand()*G4UniformRand())/a1;
     235     else                          u = - std::log(G4UniformRand()*G4UniformRand())/a2;
    236236
    237237  G4double theta = u*electron_mass_c2/projectileTotalEnergy;
    … …  
    373373  DefineCurrentMaterial(aCouple);
    374374  G4double Cross=0.;
    375   lastCZ=theDirectEMModel->CrossSectionPerVolume(aCouple->GetMaterial(),theDirectPrimaryPartDef,100.*MeV,100.*MeV/exp(1.));//this give the constant above
     375  lastCZ=theDirectEMModel->CrossSectionPerVolume(aCouple->GetMaterial(),theDirectPrimaryPartDef,100.*MeV,100.*MeV/std::exp(1.));//this give the constant above
    376376 
    377377  if (!IsScatProjToProjCase ){
    378378        G4double Emax_proj = GetSecondAdjEnergyMaxForProdToProjCase(primEnergy);
    379379        G4double Emin_proj = GetSecondAdjEnergyMinForProdToProjCase(primEnergy);
    380         if (Emax_proj>Emin_proj && primEnergy > currentTcutForDirectSecond) Cross= lastCZ*log(Emax_proj/Emin_proj);
     380        if (Emax_proj>Emin_proj && primEnergy > currentTcutForDirectSecond) Cross= lastCZ*std::log(Emax_proj/Emin_proj);
    381381  }
    382382  else {
    383383        G4double Emax_proj = GetSecondAdjEnergyMaxForScatProjToProjCase(primEnergy);
    384384        G4double Emin_proj = GetSecondAdjEnergyMinForScatProjToProjCase(primEnergy,currentTcutForDirectSecond);
    385         if (Emax_proj>Emin_proj) Cross= lastCZ*log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy));
     385        if (Emax_proj>Emin_proj) Cross= lastCZ*std::log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy));
    386386       
    387387  }

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSManager.cc

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointCSManager.cc,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointCSManager.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointCSMatrix.cc

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointCSMatrix.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointComptonModel.cc

    r1196 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointComptonModel.cc,v 1.5 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4AdjointComptonModel.cc,v 1.6 2009/12/16 17:50:03 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointComptonModel.hh"
    … …  
    181181        G4double f1=(Emin-adjointPrimKinEnergy)/Emin;
    182182        G4double f2=(Emax-adjointPrimKinEnergy)/Emax/f1;
    183         gammaE1=adjointPrimKinEnergy/(1.-f1*pow(f2,G4UniformRand()));;
     183        gammaE1=adjointPrimKinEnergy/(1.-f1*std::pow(f2,G4UniformRand()));;
    184184        gammaE2=gammaE1-adjointPrimKinEnergy;
    185         diffCSUsed= diffCSUsed*(1.+2.*log(1.+electron_mass_c2/adjointPrimKinEnergy))*adjointPrimKinEnergy/gammaE1/gammaE2;
     185        diffCSUsed= diffCSUsed*(1.+2.*std::log(1.+electron_mass_c2/adjointPrimKinEnergy))*adjointPrimKinEnergy/gammaE1/gammaE2;
    186186       
    187187       
    … …  
    191191        if (Emin>=Emax) return;
    192192        gammaE2 =adjointPrimKinEnergy;
    193         gammaE1=Emin*pow(Emax/Emin,G4UniformRand());
     193        gammaE1=Emin*std::pow(Emax/Emin,G4UniformRand());
    194194        diffCSUsed= diffCSUsed/gammaE1;
    195195       
    … …  
    388388        Emin_proj = GetSecondAdjEnergyMinForProdToProjCase(primEnergy);
    389389        if (Emax_proj>Emin_proj ){
    390                  Cross= log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy))
    391                                                                 *(1.+2.*log(1.+electron_mass_c2/primEnergy));
     390                 Cross= std::log((Emax_proj-primEnergy)*Emin_proj/Emax_proj/(Emin_proj-primEnergy))
     391                                                                *(1.+2.*std::log(1.+electron_mass_c2/primEnergy));
    392392        }       
    393393  }
    … …  
    396396        Emin_proj = GetSecondAdjEnergyMinForScatProjToProjCase(primEnergy,0.);
    397397        if (Emax_proj>Emin_proj) {
    398                 Cross = log(Emax_proj/Emin_proj);
     398                Cross = std::log(Emax_proj/Emin_proj);
    399399                //+0.5*primEnergy*primEnergy(1./(Emin_proj*Emin_proj) - 1./(Emax_proj*Emax_proj)); neglected at the moment
    400400        }

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointInterpolator.cc

    r1196 r1228  
    2525//
    2626// $Id: G4AdjointInterpolator.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointCSMatrix.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointIonIonisationModel.cc

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointIonIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointIonIonisationModel.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointPhotoElectricModel.cc

    r1196 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointPhotoElectricModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4AdjointPhotoElectricModel.cc,v 1.5 2009/12/16 17:50:05 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointPhotoElectricModel.hh"
    … …  
    109109   G4double gamma   = 1. + electronEnergy/electron_mass_c2;
    110110   if (gamma <= 5.) {
    111         G4double beta  = sqrt(gamma*gamma-1.)/gamma;
     111        G4double beta  = std::sqrt(gamma*gamma-1.)/gamma;
    112112        G4double b     = 0.5*gamma*(gamma-1.)*(gamma-2);
    113113
    … …  
    127127 
    128128     
    129   G4double sin_theta = sqrt(1.-cos_theta*cos_theta);
     129  G4double sin_theta = std::sqrt(1.-cos_theta*cos_theta);
    130130  G4double Phi     = twopi * G4UniformRand();
    131   G4double dirx = sin_theta*cos(Phi),diry = sin_theta*sin(Phi),dirz = cos_theta;
     131  G4double dirx = sin_theta*std::cos(Phi),diry = sin_theta*std::sin(Phi),dirz = cos_theta;
    132132  G4ThreeVector adjoint_gammaDirection(dirx,diry,dirz);
    133133  adjoint_gammaDirection.rotateUz(electronDirection);

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointProcessEquivalentToDirectProcess.cc

    r1197 r1228  
    2626//
    2727// $Id: G4AdjointProcessEquivalentToDirectProcess.cc,v 1.1 2009/11/11 00:31:19 ldesorgh Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointeIonisationModel.cc

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointeIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointeIonisationModel.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhIonisationModel.cc

    r1197 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4AdjointhIonisationModel.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4AdjointhIonisationModel.cc,v 1.3 2009/12/16 17:50:07 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4AdjointhIonisationModel.hh"
    … …  
    206206        G4double f31=diff1/Emin;
    207207        G4double f32=diff2/Emax/f31;
    208         G4double t3=2.*log(f32);
     208        G4double t3=2.*std::log(f32);
    209209        G4double sum_t=t1+t2+t3;
    210210        newCS=newCS*sum_t/adjointPrimKinEnergy/adjointPrimKinEnergy;
    … …  
    220220        }
    221221        else { 
    222                 projectileKinEnergy=adjointPrimKinEnergy/(1.-f31*pow(f32,G4UniformRand()));
     222                projectileKinEnergy=adjointPrimKinEnergy/(1.-f31*std::pow(f32,G4UniformRand()));
    223223               
    224224        }
    … …  
    470470        G4double diff2=Emax_proj-primEnergy;
    471471        G4double t1=(1./diff1+1./Emin_proj-1./diff2-1./Emax_proj)/primEnergy;
    472         G4double t2=2.*log(diff2*Emin_proj/Emax_proj/diff1)/primEnergy/primEnergy;
     472        G4double t2=2.*std::log(diff2*Emin_proj/Emax_proj/diff1)/primEnergy/primEnergy;
    473473        Cross*=(t1+t2);
    474474

  • trunk/source/processes/electromagnetic/adjoint/src/G4AdjointhMultipleScattering.cc

    r1197 r1228  
    2525//
    2626// $Id: G4AdjointhMultipleScattering.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/adjoint/src/G4ContinuousGainOfEnergy.cc

    r1196 r1228  
    2525//
    2626// $Id: G4ContinuousGainOfEnergy.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4ContinuousGainOfEnergy.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4InversePEEffect.cc

    r1196 r1228  
    2525//
    2626// $Id: G4InversePEEffect.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4InversePEEffect.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4IonInverseIonisation.cc

    r1197 r1228  
    2525//
    2626// $Id: G4IonInverseIonisation.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929///////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/src/G4VAdjointReverseReaction.cc

    r1197 r1228  
    2525//
    2626// $Id: G4VAdjointReverseReaction.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4VAdjointReverseReaction.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4VEmAdjointModel.cc

    r1196 r1228  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VEmAdjointModel.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     26// $Id: G4VEmAdjointModel.cc,v 1.5 2009/12/16 17:50:09 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4VEmAdjointModel.hh"
    … …  
    572572        do {
    573573                q = G4UniformRand();
    574                 x = pow(xmin, q);
     574                x = std::pow(xmin, q);
    575575                E=x*Emax;
    576576                greject = DiffCrossSectionPerAtomPrimToSecond( E,prim_energy ,1);

  • trunk/source/processes/electromagnetic/adjoint/src/G4eInverseBremsstrahlung.cc

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseBremsstrahlung.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929#include "G4eInverseBremsstrahlung.hh"

  • trunk/source/processes/electromagnetic/adjoint/src/G4eInverseCompton.cc

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseCompton.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929///////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/src/G4eInverseIonisation.cc

    r1196 r1228  
    2525//
    2626// $Id: G4eInverseIonisation.cc,v 1.4 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929///////////////////////////////////////////////////////

  • trunk/source/processes/electromagnetic/adjoint/src/G4hInverseIonisation.cc

    r1197 r1228  
    2525//
    2626// $Id: G4hInverseIonisation.cc,v 1.2 2009/11/20 10:31:20 ldesorgh Exp $
    27 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// GEANT4 tag $Name: geant4-09-03 $
    2828//
    2929///////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.