Import Geant4 7.0.0 source tree
This commit is contained in:
+6
-6
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4DiffractiveExcitation.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// $Id: G4DiffractiveExcitation.cc,v 1.3 2004/12/07 13:50:17 gunter Exp $
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implemetation file
|
||||
//
|
||||
@@ -210,7 +210,7 @@ G4ExcitedString * G4DiffractiveExcitation::
|
||||
|
||||
|
||||
G4double maxAvailMomentumSquared=
|
||||
sqr( sqrt(transverseMassSquared) - sqrt(ptSquared) );
|
||||
sqr( std::sqrt(transverseMassSquared) - std::sqrt(ptSquared) );
|
||||
|
||||
G4ThreeVector pt=GaussianPt(widthOfPtSquare,maxAvailMomentumSquared);
|
||||
|
||||
@@ -222,7 +222,7 @@ G4ExcitedString * G4DiffractiveExcitation::
|
||||
G4double tm1=hadron->Get4Momentum().minus() +
|
||||
( Pend.perp2()-Pstart.perp2() ) / hadron->Get4Momentum().plus();
|
||||
|
||||
G4double tm2= sqrt( std::max(0., sqr(tm1) -
|
||||
G4double tm2= std::sqrt( std::max(0., sqr(tm1) -
|
||||
4. * Pend.perp2() * hadron->Get4Momentum().minus()
|
||||
/ hadron->Get4Momentum().plus() ));
|
||||
|
||||
@@ -286,14 +286,14 @@ G4ThreeVector G4DiffractiveExcitation::GaussianPt(G4double widthSquare, G4double
|
||||
G4double pt2;
|
||||
|
||||
do {
|
||||
pt2=widthSquare * log( G4UniformRand() );
|
||||
pt2=widthSquare * std::log( G4UniformRand() );
|
||||
} while ( pt2 > maxPtSquare);
|
||||
|
||||
pt2=sqrt(pt2);
|
||||
pt2=std::sqrt(pt2);
|
||||
|
||||
G4double phi=G4UniformRand() * twopi;
|
||||
|
||||
return G4ThreeVector (pt2*cos(phi), pt2*sin(phi), 0.);
|
||||
return G4ThreeVector (pt2*std::cos(phi), pt2*std::sin(phi), 0.);
|
||||
}
|
||||
|
||||
G4DiffractiveExcitation::G4DiffractiveExcitation(const G4DiffractiveExcitation &)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4EventGenerator.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// G4EventGenerator
|
||||
#include "G4EventGenerator.hh"
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4InteractionContent.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
+17
-17
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4PomeronCrossSection.cc,v 1.1 2003/10/07 11:26:00 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// $Id: G4PomeronCrossSection.cc,v 1.2 2004/12/07 13:50:18 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-03 $
|
||||
//
|
||||
|
||||
#include "G4PomeronCrossSection.hh"
|
||||
@@ -37,9 +37,9 @@ G4PomeronCrossSection::~G4PomeronCrossSection()
|
||||
|
||||
G4PomeronCrossSection::G4PomeronCrossSection(const G4ParticleDefinition * particle)
|
||||
{
|
||||
G4int Encoding = abs(particle->GetPDGEncoding());
|
||||
G4int Encoding = std::abs(particle->GetPDGEncoding());
|
||||
|
||||
if (abs(particle->GetBaryonNumber())!=0)
|
||||
if (std::abs(particle->GetBaryonNumber())!=0)
|
||||
InitForNucleon();
|
||||
else if (Encoding/100== 3 || Encoding/10 == 3)
|
||||
InitForKaon();
|
||||
@@ -123,7 +123,7 @@ G4double G4PomeronCrossSection::GetInelasticCrossSection(const G4double s)
|
||||
G4double G4PomeronCrossSection::GetTotalProbability(const G4double s,
|
||||
const G4double impactsquare)
|
||||
{
|
||||
return 2/pomeron_C*(1-exp(-1*Eikonal(s,impactsquare)));
|
||||
return 2/pomeron_C*(1-std::exp(-1*Eikonal(s,impactsquare)));
|
||||
}
|
||||
|
||||
G4double G4PomeronCrossSection::GetDiffractiveProbability(const G4double s,
|
||||
@@ -137,7 +137,7 @@ G4double G4PomeronCrossSection::GetDiffractiveProbability(const G4double s,
|
||||
G4double G4PomeronCrossSection::GetNondiffractiveProbability(const G4double s,
|
||||
const G4double impactsquare)
|
||||
{
|
||||
return (1-exp(-2*Eikonal(s,impactsquare)))/pomeron_C;
|
||||
return (1-std::exp(-2*Eikonal(s,impactsquare)))/pomeron_C;
|
||||
}
|
||||
|
||||
G4double G4PomeronCrossSection::GetElasticProbability(const G4double s,
|
||||
@@ -162,8 +162,8 @@ G4double G4PomeronCrossSection::GetCutPomeronProbability(const G4double s,
|
||||
{ factorial *= i;
|
||||
}
|
||||
|
||||
return exp(-2*Eikonal(s,impactsquare))/pomeron_C*
|
||||
pow(2*Eikonal(s,impactsquare),nPomerons)/factorial;
|
||||
return std::exp(-2*Eikonal(s,impactsquare))/pomeron_C*
|
||||
std::pow(2*Eikonal(s,impactsquare),nPomerons)/factorial;
|
||||
}
|
||||
|
||||
// ---------------Temporary --- GF
|
||||
@@ -246,7 +246,7 @@ G4double G4PomeronCrossSection::Expand(G4double z)
|
||||
|
||||
inline G4double G4PomeronCrossSection::Power(const G4double s)
|
||||
{
|
||||
return pomeron_Gamma *pow(s/pomeron_S, pomeron_Alpha -1);
|
||||
return pomeron_Gamma *std::pow(s/pomeron_S, pomeron_Alpha -1);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::Z(const G4double s)
|
||||
@@ -256,7 +256,7 @@ inline G4double G4PomeronCrossSection::Z(const G4double s)
|
||||
|
||||
inline G4double G4PomeronCrossSection::Lambda(const G4double s)
|
||||
{
|
||||
return pomeron_Rsquare+pomeron_Alphaprime*log(s/pomeron_S);
|
||||
return pomeron_Rsquare+pomeron_Alphaprime*std::log(s/pomeron_S);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::SigP(const G4double s)
|
||||
@@ -267,27 +267,27 @@ inline G4double G4PomeronCrossSection::SigP(const G4double s)
|
||||
inline G4double G4PomeronCrossSection::Eikonal(const G4double s,
|
||||
const G4double impactsquare)
|
||||
{
|
||||
return Z(s)/2 * exp(-impactsquare/(4*Lambda(s)*hbarc_squared));
|
||||
return Z(s)/2 * std::exp(-impactsquare/(4*Lambda(s)*hbarc_squared));
|
||||
}
|
||||
//*************************************************************************************************
|
||||
inline G4double G4PomeronCrossSection::PowerSoft(const G4double s)
|
||||
{
|
||||
return pomeron_Gamma *pow(s/pomeron_S, pomeron_Alpha -1);
|
||||
return pomeron_Gamma *std::pow(s/pomeron_S, pomeron_Alpha -1);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::PowerHard(const G4double s)
|
||||
{
|
||||
return pomeron_Gamma_Hard*pow(s/pomeron_S, pomeron_Alpha_Hard -1);
|
||||
return pomeron_Gamma_Hard*std::pow(s/pomeron_S, pomeron_Alpha_Hard -1);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::LambdaSoft(const G4double s)
|
||||
{
|
||||
return pomeron_Rsquare+pomeron_Alphaprime*log(s/pomeron_S);
|
||||
return pomeron_Rsquare+pomeron_Alphaprime*std::log(s/pomeron_S);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::LambdaHard(const G4double /*s*/)
|
||||
{
|
||||
return pomeron_Rsquare; //+pomeron_Alphaprime*log(s/pomeron_S);
|
||||
return pomeron_Rsquare; //+pomeron_Alphaprime*std::log(s/pomeron_S);
|
||||
}
|
||||
|
||||
inline G4double G4PomeronCrossSection::Zsoft(const G4double s)
|
||||
@@ -302,12 +302,12 @@ inline G4double G4PomeronCrossSection::Zhard(const G4double s)
|
||||
|
||||
G4double G4PomeronCrossSection::SoftEikonal(G4double s, G4double impactsquare)
|
||||
{
|
||||
return Zsoft(s)/2*exp(-impactsquare/LambdaSoft(s)/hbarc_squared/4);
|
||||
return Zsoft(s)/2*std::exp(-impactsquare/LambdaSoft(s)/hbarc_squared/4);
|
||||
}
|
||||
|
||||
G4double G4PomeronCrossSection::HardEikonal(G4double s, G4double impactsquare)
|
||||
{
|
||||
return Zhard(s)/2*exp(-impactsquare/LambdaHard(s)/hbarc_squared/4);
|
||||
return Zhard(s)/2*std::exp(-impactsquare/LambdaHard(s)/hbarc_squared/4);
|
||||
}
|
||||
|
||||
//*************************************************************************************************
|
||||
|
||||
+4
-4
@@ -21,7 +21,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SingleDiffractiveExcitation.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// $Id: G4SingleDiffractiveExcitation.cc,v 1.3 2004/12/07 13:50:19 gunter Exp $
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implemetation file
|
||||
//
|
||||
@@ -226,14 +226,14 @@ G4ThreeVector G4SingleDiffractiveExcitation::GaussianPt(G4double widthSquare, G4
|
||||
G4double pt2;
|
||||
|
||||
do {
|
||||
pt2=widthSquare * log( G4UniformRand() );
|
||||
pt2=widthSquare * std::log( G4UniformRand() );
|
||||
} while ( pt2 > maxPtSquare);
|
||||
|
||||
pt2=sqrt(pt2);
|
||||
pt2=std::sqrt(pt2);
|
||||
|
||||
G4double phi=G4UniformRand() * twopi;
|
||||
|
||||
return G4ThreeVector (pt2*cos(phi), pt2*sin(phi), 0.);
|
||||
return G4ThreeVector (pt2*std::cos(phi), pt2*std::sin(phi), 0.);
|
||||
}
|
||||
|
||||
G4SingleDiffractiveExcitation::G4SingleDiffractiveExcitation(const G4SingleDiffractiveExcitation &)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4StringModel.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// G4StringModel
|
||||
#include "G4StringModel.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VParticipants.cc,v 1.1 2003/10/07 11:26:00 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VPartonStringModel.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
//// ------------------------------------------------------------
|
||||
// GEANT 4 class implementation file
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VSplitableHadron.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
|
||||
// ------------------------------------------------------------
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VStringFragmentation.cc,v 1.2 2003/11/03 17:54:53 hpw Exp $
|
||||
// GEANT4 tag $Name: geant4-06-00-patch-01 $
|
||||
// GEANT4 tag $Name: geant4-07-00-cand-01 $
|
||||
//
|
||||
// G4VStringFragmentation
|
||||
#include "G4VStringFragmentation.hh"
|
||||
|
||||
Reference in New Issue
Block a user