lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/cascade/evaporation/src/G4BEChargedChannel.cc
+10 -10
View File
@@ -58,15 +58,15 @@ void G4BEChargedChannel::calculateProbability()
return;
}
// In HETC88 s-s0 was used in exp( s ), in which s0 was either 50 or
// In HETC88 s-s0 was used in std::exp( s ), in which s0 was either 50 or
// max(s_i), where i goes over all channels.
G4double levelParam = getLevelDensityParameter();
G4double s = 2 * sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
G4double s = 2 * std::sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
G4double constant = A / 2 * ( 2 * spin + 1 ) * ( 1 + coulombFactor() );
G4double eye1 = ( pow( s, 2. ) - 3 * s + 3 ) / ( 4 * pow( levelParam, 2. ) ) * exp( s );
G4double eye1 = ( std::pow( s, 2. ) - 3 * s + 3 ) / ( 4 * std::pow( levelParam, 2. ) ) * std::exp( s );
emissionProbability = constant * pow( G4double(residualA), 0.6666666 ) * eye1;
emissionProbability = constant * std::pow( G4double(residualA), 0.6666666 ) * eye1;
if ( verboseLevel >= 6 )
G4cout << "G4BEChargedChannel : calculateProbability for " << getName() << G4endl
@@ -99,9 +99,9 @@ G4double G4BEChargedChannel::sampleKineticEnergy()
// randExp1 = RandExponential::shoot( 1 );
// randExp2 = RandExponential::shoot( 1 );
// levelParam = getLevelDensityParameter();
// s = 2 * sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// kineticEnergyAv = 2 * ( pow( s, 3. ) - 6.0 * pow( s, 2. ) + 15.0 * s - 15.0 ) /
// ( ( 2.0 * pow( s, 2. ) - 6.0 * s + 6.0 ) * levelParam );
// s = 2 * std::sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// kineticEnergyAv = 2 * ( std::pow( s, 3. ) - 6.0 * std::pow( s, 2. ) + 15.0 * s - 15.0 ) /
// ( ( 2.0 * std::pow( s, 2. ) - 6.0 * s + 6.0 ) * levelParam );
// kineticEnergy = 0.5 * ( randExp1 + randExp2 ) * kineticEnergyAv + getThresh() - getQ();
@@ -118,8 +118,8 @@ G4double G4BEChargedChannel::sampleKineticEnergy()
levelParam = getLevelDensityParameter();
const G4double xMax = excitationEnergy - getThresh() - correction; // maximum number
const G4double xProb = ( - 1 + sqrt ( 1 + 4 * levelParam * xMax ) ) / ( 2 * levelParam ); // most probable value
const G4double m = xProb * exp ( 2 * sqrt ( levelParam * ( xMax - xProb ) ) ); // maximum value of P(x)
const G4double xProb = ( - 1 + std::sqrt ( 1 + 4 * levelParam * xMax ) ) / ( 2 * levelParam ); // most probable value
const G4double m = xProb * std::exp ( 2 * std::sqrt ( levelParam * ( xMax - xProb ) ) ); // maximum value of P(x)
// Sample x according to density function P(x) with rejection method
G4double r1;
@@ -131,7 +131,7 @@ G4double G4BEChargedChannel::sampleKineticEnergy()
r2 = G4UniformRand() * m;
koe++;
}
while ( r1 * exp ( 2 * sqrt ( levelParam * ( xMax - r1 ) ) ) < r2 );
while ( r1 * std::exp ( 2 * std::sqrt ( levelParam * ( xMax - r1 ) ) ) < r2 );
// G4cout << "Q ch " << koe << G4endl;
G4double kineticEnergy = r1 + getCoulomb(); // add coulomb potential;
source/processes/hadronic/models/cascade/evaporation/src/G4BEGammaDeexcitation.cc
+4 -4
View File
@@ -96,12 +96,12 @@ void G4BEGammaDeexcitation::isotropicCosines( G4double & u,
{
// Samples isotropic random direction cosines.
G4double CosTheta = 1.0 - 2.0 * G4UniformRand();
G4double SinTheta = sqrt( 1.0 - CosTheta * CosTheta );
G4double SinTheta = std::sqrt( 1.0 - CosTheta * CosTheta );
G4double Phi = twopi * G4UniformRand();
u = cos( Phi ) * SinTheta;
v = cos( Phi ) * CosTheta,
w = sin( Phi );
u = std::cos( Phi ) * SinTheta;
v = std::cos( Phi ) * CosTheta,
w = std::sin( Phi );
return;
}
source/processes/hadronic/models/cascade/evaporation/src/G4BENeutronChannel.cc
+17 -17
View File
@@ -69,18 +69,18 @@ void G4BENeutronChannel::calculateProbability()
return;
}
// In HETC88 s-s0 was used in exp( s ), in which s0 was either 50 or
// In HETC88 s-s0 was used in std::exp( s ), in which s0 was either 50 or
// max(s_i), where i goes over all channels.
const G4double levelParam = getLevelDensityParameter();
const G4double s = 2 * sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// const G4double temp = ( pow( s, 2. ) - 3 * s + 3 ) / ( 4 * pow( levelParam, 2. ) )
const G4double s = 2 * std::sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// const G4double temp = ( std::pow( s, 2. ) - 3 * s + 3 ) / ( 4 * std::pow( levelParam, 2. ) )
// + beta() * ( s - 1 ) / ( 2 * levelParam );
const G4double eye0 = exp( s ) * ( s - 1 ) / ( 2 * levelParam );
const G4double eye1 = ( pow( s, 2. ) - 3*s +3 ) * exp( s ) / ( 4 * pow( levelParam, 2. ) ) ;
const G4double eye0 = std::exp( s ) * ( s - 1 ) / ( 2 * levelParam );
const G4double eye1 = ( std::pow( s, 2. ) - 3*s +3 ) * std::exp( s ) / ( 4 * std::pow( levelParam, 2. ) ) ;
emissionProbability = pow( G4double(residualA), 0.666666 ) * alpha() * ( eye1 + beta() * eye0 );
emissionProbability = std::pow( G4double(residualA), 0.666666 ) * alpha() * ( eye1 + beta() * eye0 );
if ( verboseLevel >= 6 )
G4cout << "G4BENeutronChannel : calculateProbability " << G4endl
@@ -120,11 +120,11 @@ G4double G4BENeutronChannel::sampleKineticEnergy()
// e2 = RandExponential::shoot( 1 );
// levelParam = getLevelDensityParameter();
// s = 2 * sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// eye0 = 0.5 * ( s - 1 ) * exp( s ) / levelParam;
// eye1 = ( pow( s, 2. ) - 3*s + 3 ) * exp( s ) / ( 4 * pow( levelParam, 2. ) );
// kineticEnergyAv = 2 * ( pow( s, 3. ) - 6.0 * pow( s, 2. ) + 15.0 * s - 15.0 ) /
// ( ( 2.0 * pow( s, 2. ) - 6.0 * s + 6.0 ) * levelParam );
// s = 2 * std::sqrt( levelParam * ( excitationEnergy - getThresh() - correction ) );
// eye0 = 0.5 * ( s - 1 ) * std::exp( s ) / levelParam;
// eye1 = ( std::pow( s, 2. ) - 3*s + 3 ) * std::exp( s ) / ( 4 * std::pow( levelParam, 2. ) );
// kineticEnergyAv = 2 * ( std::pow( s, 3. ) - 6.0 * std::pow( s, 2. ) + 15.0 * s - 15.0 ) /
// ( ( 2.0 * std::pow( s, 2. ) - 6.0 * s + 6.0 ) * levelParam );
// kineticEnergyAv = ( kineticEnergyAv + beta() ) / ( 1.0 + beta() * eye0
// / eye1 );
@@ -132,7 +132,7 @@ G4double G4BENeutronChannel::sampleKineticEnergy()
////////////////
// A random number is sampled from the density function
// P(x) = x * exp ( 2 sqrt ( a ( xMax - x ) ) ) [not normalized],
// P(x) = x * std::exp ( 2 std::sqrt ( a ( xMax - x ) ) ) [not normalized],
// x belongs to [ 0, xMax ]
// with the 'Hit or Miss' -method
// Kinetic energy is this energy scaled properly
@@ -141,8 +141,8 @@ G4double G4BENeutronChannel::sampleKineticEnergy()
levelParam = getLevelDensityParameter();
const G4double xMax = excitationEnergy - getThresh() - correction + beta(); // maximum number
const G4double xProb = ( - 1 + sqrt ( 1 + 4 * levelParam * xMax ) ) / ( 2 * levelParam ); // most probable value
const G4double m = xProb * exp ( 2 * sqrt ( levelParam * ( xMax - xProb ) ) ); // maximum value of P(x)
const G4double xProb = ( - 1 + std::sqrt ( 1 + 4 * levelParam * xMax ) ) / ( 2 * levelParam ); // most probable value
const G4double m = xProb * std::exp ( 2 * std::sqrt ( levelParam * ( xMax - xProb ) ) ); // maximum value of P(x)
// Sample x according to density function P(x) with rejection method
G4double r1;
@@ -154,7 +154,7 @@ G4double G4BENeutronChannel::sampleKineticEnergy()
r2 = G4UniformRand() * m;
koe++;
}
while ( r1 * exp ( 2 * sqrt ( levelParam * ( xMax - r1 ) ) ) < r2 );
while ( r1 * std::exp ( 2 * std::sqrt ( levelParam * ( xMax - r1 ) ) ) < r2 );
// G4cout << koe << G4endl;
G4double kineticEnergy = r1 - beta();
@@ -189,13 +189,13 @@ G4DynamicParticle * G4BENeutronChannel::emit()
G4double G4BENeutronChannel::alpha()
{
const G4double residualA = nucleusA - particleA;
return 0.76 + 1.93 * pow( residualA, -0.33333 );
return 0.76 + 1.93 * std::pow( residualA, -0.33333 );
}
G4double G4BENeutronChannel::beta()
{
G4double residualA = nucleusA - particleA;
return ( 1.66 * pow ( residualA, -0.66666 ) - 0.05 )/alpha()*MeV;
return ( 1.66 * std::pow ( residualA, -0.66666 ) - 0.05 )/alpha()*MeV;
}
source/processes/hadronic/models/cascade/evaporation/src/G4BertiniEvaporation.cc
+5 -5
View File
@@ -186,7 +186,7 @@ G4FragmentVector * G4BertiniEvaporation::BreakItUp( G4LayeredNucleus & nucleus )
// vol. 35, 1957, p.1022
nucleusTotalMomentum = pEmittedParticle->GetTotalMomentum(); // CMS frame
nucleusKineticEnergy = pow( nucleusTotalMomentum, 2 ) / ( 2 * mRes );
nucleusKineticEnergy = std::pow( nucleusTotalMomentum, 2 ) / ( 2 * mRes );
newExcitation = excE - pEmittedParticle->GetKineticEnergy() - nucleusKineticEnergy - pSelectedChannel->getQ();
if ( verboseLevel >= 10)
@@ -402,12 +402,12 @@ void G4BertiniEvaporation::isotropicCosines( G4double & u, G4double & v, G4doubl
{
// Samples isotropic random direction cosines.
G4double CosTheta = 1.0 - 2.0 * G4UniformRand();
G4double SinTheta = sqrt( 1.0 - CosTheta * CosTheta );
G4double SinTheta = std::sqrt( 1.0 - CosTheta * CosTheta );
G4double Phi = twopi * G4UniformRand();
u = cos( Phi ) * SinTheta;
v = cos( Phi ) * CosTheta,
w = sin( Phi );
u = std::cos( Phi ) * SinTheta;
v = std::cos( Phi ) * CosTheta,
w = std::sin( Phi );
return;
}
source/processes/hadronic/models/cascade/evaporation/src/G4BertiniEvaporationChannel.cc
+6 -6
View File
@@ -159,7 +159,7 @@ G4double G4BertiniEvaporationChannel::getCoulomb()
// In HETC88 this factor was 0.88235, perhaps due to different r0
G4double coulomb = factor * particleZ * qmFactor() * residualZ /
( pow( G4double(residualA), 0.33333333 ) + rho ) * MeV;
( std::pow( G4double(residualA), 0.33333333 ) + rho ) * MeV;
if ( verboseLevel >= 10 )
G4cout << " G4BertiniEvaporationChannel::getThresh() " << G4endl
@@ -192,7 +192,7 @@ G4double G4BertiniEvaporationChannel::getLevelDensityParameter()
G4double y0 = 1.5;
G4double temp = ( residualA - 2.0 * residualZ ) / residualA;
G4double smallA = residualA * ( 1.0 + y0 * pow( temp, 2. ) ) / b0 / MeV;
G4double smallA = residualA * ( 1.0 + y0 * std::pow( temp, 2. ) ) / b0 / MeV;
// In HETC98 b0 = b0(E).
@@ -204,12 +204,12 @@ void G4BertiniEvaporationChannel::isotropicCosines( G4double & u, G4double & v,
{
// Samples isotropic random direction cosines.
G4double CosTheta = 1.0 - 2.0 * G4UniformRand();
G4double SinTheta = sqrt( 1.0 - CosTheta * CosTheta );
G4double SinTheta = std::sqrt( 1.0 - CosTheta * CosTheta );
G4double Phi = twopi * G4UniformRand();
u = cos( Phi ) * SinTheta;
v = cos( Phi ) * CosTheta,
w = sin( Phi );
u = std::cos( Phi ) * SinTheta;
v = std::cos( Phi ) * CosTheta,
w = std::sin( Phi );
return;
}