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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ComptonScattering.cc,v 1.2.8.1 1999/12/07 20:50:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ComptonScattering.cc,v 1.2.8.1.2.1 1999/12/08 17:34:22 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -286,7 +286,7 @@ void G4ComptonScattering::PrintInfoDefinition()
comments += "Good description from 10 KeV to (100/Z) GeV. \n";
comments += " Scattered gamma energy according Klein-Nishina.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
<< " to " << G4BestUnit(HighestEnergyLimit,"Energy")
<< " in " << NumbBinTable << " bins. \n";
source/processes/electromagnetic/standard/src/G4EnergyLossMessenger.cc
+4 -8
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4EnergyLossMessenger.cc,v 1.2.6.1 1999/12/07 20:50:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4EnergyLossMessenger.cc,v 1.2.6.1.2.5 1999/12/14 09:16:48 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
@@ -24,11 +24,7 @@
#include "G4UIparameter.hh"
#include "G4UIcmdWithABool.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -99,7 +95,7 @@ void G4EnergyLossMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
G4double v1,v2;
char unts[30];
const char* t = newValue;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> v1 >> v2 >> unts;
G4String unt = unts;
v2 *= G4UIcommand::ValueOf(unt);
source/processes/electromagnetic/standard/src/G4GammaConversion.cc
+9 -9
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4GammaConversion.cc,v 1.2.8.1 1999/12/07 20:50:56 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4GammaConversion.cc,v 1.2.8.1.2.2 1999/12/10 15:41:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -245,11 +245,11 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
// limits of the screening variable
G4double screenfac = 136.*epsil0/(anElement->GetIonisation()->GetZ3()) ;
G4double screenmax = exp ((42.24 - FZ)/8.368) - 0.952 ;
G4double screenmin = min(4.*screenfac,screenmax) ;
G4double screenmin = G4std::min(4.*screenfac,screenmax) ;
// limits of the energy sampling
G4double epsil1 = 0.5 - 0.5*sqrt(1. - screenmin/screenmax) ;
G4double epsilmin = max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
G4double epsilmin = G4std::max(epsil0,epsil1) , epsilrange = 0.5 - epsilmin ;
//
// sample the energy rate of the created electron (or positron)
@@ -258,7 +258,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
G4double screenvar, greject ;
G4double F10 = ScreenFunction1(screenmin) - FZ , F20 = ScreenFunction2(screenmin) - FZ;
G4double NormF1 = max(F10*epsilrange*epsilrange,0.) , NormF2 = max(1.5*F20,0.);
G4double NormF1 = G4std::max(F10*epsilrange*epsilrange,0.) , NormF2 = G4std::max(1.5*F20,0.);
do {
if ( NormF1/(NormF1+NormF2) > G4UniformRand() )
@@ -316,7 +316,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
G4double LocalEnerDeposit = 0. ;
aParticleChange.SetNumberOfSecondaries(2) ;
G4double ElectKineEnergy = max(0.,ElectTotEnergy - electron_mass_c2) ;
G4double ElectKineEnergy = G4std::max(0.,ElectTotEnergy - electron_mass_c2) ;
// condition changed !
if((G4EnergyLossTables::GetRange(G4Electron::Electron(),
ElectKineEnergy,aMaterial)>aStep.GetPostStepPoint()->GetSafety())
@@ -338,7 +338,7 @@ G4VParticleChange* G4GammaConversion::PostStepDoIt(const G4Track& aTrack,
// the e+ is always created (even with Ekine=0) for further annihilation.
G4double PositKineEnergy = max(0.,PositTotEnergy - electron_mass_c2) ;
G4double PositKineEnergy = G4std::max(0.,PositTotEnergy - electron_mass_c2) ;
// if (G4EnergyLossTables::GetRange(G4Positron::Positron(),PositKineEnergy,aMaterial)
// < min(G4Positron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) )
@@ -396,7 +396,7 @@ G4Element* G4GammaConversion::SelectRandomAtom(const G4DynamicParticle* aDynamic
if (rval <= PartialSumSigma) return ((*theElementVector)(i));
}
G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
<< "' has no elements, NULL pointer returned." << endl;
<< "' has no elements, NULL pointer returned." << G4endl;
return NULL;
}
@@ -408,7 +408,7 @@ void G4GammaConversion::PrintInfoDefinition()
comments += "Good description from 1.5 MeV to 100 GeV for all Z. \n";
comments += " e+e- energies according Bethe-Heitler";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
<< " to " << G4BestUnit(HighestEnergyLimit,"Energy")
<< " in " << NumbBinTable << " bins. \n";
source/processes/electromagnetic/standard/src/G4IMultipleScattering.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4IMultipleScattering.cc,v 1.2.8.1 1999/12/07 20:50:57 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4IMultipleScattering.cc,v 1.2.8.1.2.1 1999/12/08 17:34:22 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
@@ -811,7 +811,7 @@ void G4IMultipleScattering::PrintInfoDefinition()
comments += "\n New model of MSC , computes the lateral \n";
comments += " displacement of the particle , too.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
source/processes/electromagnetic/standard/src/G4IeBremsstrahlung.cc
+32 -32
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4IeBremsstrahlung.cc,v 1.3.8.1 1999/12/07 20:50:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4IeBremsstrahlung.cc,v 1.3.8.1.2.3 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
@@ -142,21 +142,21 @@ void G4IeBremsstrahlung::TestOfInversion(
const G4MaterialTable* theMaterialTable=
G4Material::GetMaterialTable();
G4int numOfMaterials = theMaterialTable->length() ;
G4cout.setf(ios::scientific, ios::floatfield) ;
G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
if(printflag>1)
{
G4cout << endl;
G4cout << " particle=" << aParticleType.GetParticleName() << endl;
G4cout << "----------------------" << endl;
G4cout << G4endl;
G4cout << " particle=" << aParticleType.GetParticleName() << G4endl;
G4cout << "----------------------" << G4endl;
}
for (G4int J=0; J<numOfMaterials; J++)
{
if(printflag>1)
{
G4cout << endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
G4cout << G4endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
G4cout << " mat.ind.=" << J << " T Nlambda Tprime"
<< " (Tprime-T)/T(%)" << endl ;
<< " (Tprime-T)/T(%)" << G4endl ;
}
G4PhysicsLogVector* aVector ;
@@ -190,29 +190,29 @@ void G4IeBremsstrahlung::TestOfInversion(
}
if(printflag>1)
{
G4cout << setw(18) << setprecision(6) << T << " " <<
setw(14)<< setprecision(6) << Nlambda << " " <<
setw(14) << setprecision(6) << Tprime << " " <<
setw(12) << setprecision(3) << del << endl;
G4cout << G4std::setw(18) << G4std::setprecision(6) << T << " " <<
G4std::setw(14)<< G4std::setprecision(6) << Nlambda << " " <<
G4std::setw(14) << G4std::setprecision(6) << Tprime << " " <<
G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
}
}
}
if(printflag>0)
{
G4cout << endl;
G4cout << G4endl;
G4cout << "G4IeBremsstrahlung::TestOfInversion (T->Nlambda->Tprime) "
<< endl ;
<< G4endl ;
G4cout << "particle= " << aParticleType.GetParticleName() <<
" material= " << (*theMaterialTable)[J]->GetName() << endl ;
G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3)
" material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3)
<< delta ;
G4cout << " at a kinetic energy " << setw(10) << setprecision(3) <<
Tdelta/MeV << " MeV" << endl;
G4cout << " at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
Tdelta/MeV << " MeV" << G4endl;
delmean /= sum ;
G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << endl;
G4cout << endl;
G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
G4std::setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << G4endl;
G4cout << G4endl;
}
}
}
@@ -720,7 +720,7 @@ void G4IeBremsstrahlung::BuildLossTable(
if(LPMGammaEnergyLimit > klim)
{
G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
G4double floss = 0. ;
G4int nmax = 1000 ;
@@ -1278,8 +1278,8 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
// Compute the maximum of the rejection function
G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
// sample the energy rate of the emitted Gamma
@@ -1290,8 +1290,8 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
x = pow(xmin, G4UniformRand());
epsil = x*KineticEnergy/TotalEnergy;
screenvar = screenfac*epsil/(1-epsil);
F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);
} while( greject < G4UniformRand()*grejmax );
@@ -1314,9 +1314,9 @@ G4VParticleChange* G4IeBremsstrahlung::PostStepDoIt(const G4Track& trackData,
G4double bl = bl0 + bl1*U + bl2*U2;
// Compute the maximum of the rejection function
grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
G4double xm = -al/(2.*bl);
if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
// sample the energy rate of the emitted Gamma
@@ -1406,7 +1406,7 @@ G4Element* G4IeBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
for ( G4int i=0; i < NumberOfElements; i++ )
if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
<< "' has no elements, NULL pointer returned." << endl;
<< "' has no elements, NULL pointer returned." << G4endl;
return NULL;
}
@@ -1417,7 +1417,7 @@ void G4IeBremsstrahlung::PrintInfoDefinition()
comments += " log scale extrapolation above 100 GeV \n";
comments += " Gamma energy sampled from a parametrised formula.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4IeEnergyLoss.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4IeEnergyLoss.cc,v 1.7.6.1 1999/12/07 20:50:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
source/processes/electromagnetic/standard/src/G4IeIonisation.cc
+26 -26
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4IeIonisation.cc,v 1.3.8.1 1999/12/07 20:50:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4IeIonisation.cc,v 1.3.8.1.2.3 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -------------------------------------------------------------
@@ -142,21 +142,21 @@ void G4IeIonisation::TestOfInversion(
G4Material::GetMaterialTable();
G4int numOfMaterials = theMaterialTable->length() ;
G4cout.setf(ios::scientific, ios::floatfield) ;
G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
if(printflag>1)
{
G4cout << endl;
G4cout << " particle=" << aParticleType.GetParticleName() << endl;
G4cout << "----------------------" << endl;
G4cout << G4endl;
G4cout << " particle=" << aParticleType.GetParticleName() << G4endl;
G4cout << "----------------------" << G4endl;
}
for (G4int J=0; J<numOfMaterials; J++)
{
if(printflag>1)
{
G4cout << endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
G4cout << G4endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
G4cout << " mat.ind.=" << J << " T Nlambda Tprime"
<< " (Tprime-T)/T(%)" << endl ;
<< " (Tprime-T)/T(%)" << G4endl ;
}
G4PhysicsLogVector* aVector ;
@@ -190,28 +190,28 @@ void G4IeIonisation::TestOfInversion(
}
if(printflag>1)
{
G4cout << setw(18) << setprecision(6) << T << " " <<
setw(14)<< setprecision(6) << Nlambda << " " <<
setw(14) << setprecision(6) << Tprime << " " <<
setw(12) << setprecision(3) << del << endl;
G4cout << G4std::setw(18) << G4std::setprecision(6) << T << " " <<
G4std::setw(14)<< G4std::setprecision(6) << Nlambda << " " <<
G4std::setw(14) << G4std::setprecision(6) << Tprime << " " <<
G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
}
}
}
if(printflag>0)
{
G4cout << endl;
G4cout << "G4IeIonisation::TestOfInversion (T->Nlambda->Tprime) " << endl ;
G4cout << G4endl;
G4cout << "G4IeIonisation::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
G4cout << "particle= " << aParticleType.GetParticleName() <<
" material= " << (*theMaterialTable)[J]->GetName() << endl ;
G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) <<
" material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) <<
delta ;
G4cout << " at a kinetic energy " << setw(10) << setprecision(3) <<
Tdelta/MeV << " MeV" << endl;
G4cout << " at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
Tdelta/MeV << " MeV" << G4endl;
delmean /= sum ;
G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << endl;
G4cout << endl;
G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
G4std::setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << G4endl;
G4cout << G4endl;
}
}
@@ -661,7 +661,7 @@ void G4IeIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
{
Tmax = LowEdgeEnergy/2. ;
d = min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2 ;
ionloss += log((tau-d)*d)+tau/(tau-d) ;
@@ -672,7 +672,7 @@ void G4IeIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
{
Tmax = LowEdgeEnergy ;
d = min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergyNow, Tmax)/ParticleMass;
d2=d*d/2. ;
d3=d*d*d/3. ;
@@ -955,7 +955,7 @@ void G4IeIonisation::PrintInfoDefinition()
comments += "Good description from 1 KeV to 100 GeV.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4IeplusAnnihilation.cc
+26 -26
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4IeplusAnnihilation.cc,v 1.5.8.1 1999/12/07 20:50:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4IeplusAnnihilation.cc,v 1.5.8.1.2.2 1999/12/09 16:18:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
@@ -43,9 +43,9 @@ G4IeplusAnnihilation::G4IeplusAnnihilation(const G4String& processName)
NumbBinTable(100)
{
if (verboseLevel>0) {
G4cout << GetProcessName() << " is created "<< endl;
G4cout << GetProcessName() << " is created "<< G4endl;
G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << endl;
G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
}
theCrossSectionTable = NULL;
theMeanFreePathTable = NULL;
@@ -209,21 +209,21 @@ void G4IeplusAnnihilation::TestOfInversion(
G4Material::GetMaterialTable();
G4int numOfMaterials = theMaterialTable->length() ;
G4cout.setf(ios::scientific, ios::floatfield) ;
G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
if(printflag>1)
{
G4cout << endl;
G4cout << " particle=" << aParticleType.GetParticleName() << endl;
G4cout << "----------------------" << endl;
G4cout << G4endl;
G4cout << " particle=" << aParticleType.GetParticleName() << G4endl;
G4cout << "----------------------" << G4endl;
}
for (G4int J=0; J<numOfMaterials; J++)
{
if(printflag>1)
{
G4cout << endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
G4cout << G4endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
G4cout << " mat.ind.=" << J << " T Nlambda Tprime"
<< " (Tprime-T)/T(%)" << endl ;
<< " (Tprime-T)/T(%)" << G4endl ;
}
G4PhysicsLogVector* aVector ;
@@ -257,28 +257,28 @@ void G4IeplusAnnihilation::TestOfInversion(
}
if(printflag>1)
{
G4cout << setw(18) << setprecision(6) << T << " " <<
setw(14)<< setprecision(6) << Nlambda << " " <<
setw(14) << setprecision(6) << Tprime << " " <<
setw(12) << setprecision(3) << del << endl;
G4cout << G4std::setw(18) << G4std::setprecision(6) << T << " " <<
G4std::setw(14)<< G4std::setprecision(6) << Nlambda << " " <<
G4std::setw(14) << G4std::setprecision(6) << Tprime << " " <<
G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
}
}
}
if(printflag>0)
{
G4cout << endl;
G4cout << "G4IeplusAnnihilation::TestOfInversion (T->Nlambda->Tprime) " << endl
G4cout << G4endl;
G4cout << "G4IeplusAnnihilation::TestOfInversion (T->Nlambda->Tprime) " << G4endl
;
G4cout << "particle= " << aParticleType.GetParticleName() <<
" material= " << (*theMaterialTable)[J]->GetName() << endl ;
G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta ;
G4cout << " at a kinetic energy " << setw(10) << setprecision(3) <<
Tdelta/MeV << " MeV" << endl;
" material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta ;
G4cout << " at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
Tdelta/MeV << " MeV" << G4endl;
delmean /= sum ;
G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << endl;
G4cout << endl;
G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
G4std::setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << G4endl;
G4cout << G4endl;
}
}
}
@@ -884,7 +884,7 @@ void G4IeplusAnnihilation::PrintInfoDefinition()
G4String comments="Total cross section from Heitler formula (2 photon annihilation).\n";
comments += " gamma energies sampled according Heitler";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
<< " to " << G4BestUnit(HighestEnergyLimit,"Energy")
<< " in " << NumbBinTable << " bins. \n";
source/processes/electromagnetic/standard/src/G4IhEnergyLoss.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4IhEnergyLoss.cc,v 1.7.6.1 1999/12/07 20:50:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
source/processes/electromagnetic/standard/src/G4IhIonisation.cc
+24 -24
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4IhIonisation.cc,v 1.5.8.1 1999/12/07 20:50:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4IhIonisation.cc,v 1.5.8.1.2.2 1999/12/09 16:18:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// -------------------------------------------------------------
// GEANT 4 class implementation file
@@ -136,21 +136,21 @@ void G4IhIonisation::TestOfInversion(
G4Material::GetMaterialTable();
G4int numOfMaterials = theMaterialTable->length() ;
G4cout.setf(ios::scientific, ios::floatfield) ;
G4cout.setf(G4std::ios::scientific, G4std::ios::floatfield) ;
if(printflag>1)
{
G4cout << endl;
G4cout << " particle=" << aParticleType.GetParticleName() << endl;
G4cout << "----------------------" << endl;
G4cout << G4endl;
G4cout << " particle=" << aParticleType.GetParticleName() << G4endl;
G4cout << "----------------------" << G4endl;
}
for (G4int J=0; J<numOfMaterials; J++)
{
if(printflag>1)
{
G4cout << endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << endl;
G4cout << G4endl;
G4cout << " material = " << (*theMaterialTable)[J]->GetName() << G4endl;
G4cout << " mat.ind.=" << J << " T Nlambda Tprime"
<< " (Tprime-T)/T(%)" << endl ;
<< " (Tprime-T)/T(%)" << G4endl ;
}
G4PhysicsLogVector* aVector ;
@@ -184,28 +184,28 @@ void G4IhIonisation::TestOfInversion(
}
if(printflag>1)
{
G4cout << setw(18) << setprecision(6) << T << " " <<
setw(14)<< setprecision(6) << Nlambda << " " <<
setw(14) << setprecision(6) << Tprime << " " <<
setw(12) << setprecision(3) << del << endl;
G4cout << G4std::setw(18) << G4std::setprecision(6) << T << " " <<
G4std::setw(14)<< G4std::setprecision(6) << Nlambda << " " <<
G4std::setw(14) << G4std::setprecision(6) << Tprime << " " <<
G4std::setw(12) << G4std::setprecision(3) << del << G4endl;
}
}
}
if(printflag>0)
{
G4cout << endl;
G4cout << "G4IhIonisation::TestOfInversion (T->Nlambda->Tprime) " << endl ;
G4cout << G4endl;
G4cout << "G4IhIonisation::TestOfInversion (T->Nlambda->Tprime) " << G4endl ;
G4cout << "particle= " << aParticleType.GetParticleName() <<
" material= " << (*theMaterialTable)[J]->GetName() << endl ;
G4cout << "max (Tprime-T)/T in % =" << setw(10) << setprecision(3) << delta
" material= " << (*theMaterialTable)[J]->GetName() << G4endl ;
G4cout << "max (Tprime-T)/T in % =" << G4std::setw(10) << G4std::setprecision(3) << delta
;
G4cout << " at a kinetic energy " << setw(10) << setprecision(3) <<
Tdelta/MeV << " MeV" << endl;
G4cout << " at a kinetic energy " << G4std::setw(10) << G4std::setprecision(3) <<
Tdelta/MeV << " MeV" << G4endl;
delmean /= sum ;
G4cout << "mean rel.diff. (Tprime-T)/T=" << setw(10) <<
setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << endl;
G4cout << endl;
G4cout << "mean rel.diff. (Tprime-T)/T=" << G4std::setw(10) <<
G4std::setprecision(3) << delmean <<
" % (mean is calculated in abs. value)" << G4endl;
G4cout << G4endl;
}
}
@@ -1068,7 +1068,7 @@ void G4IhIonisation::PrintInfoDefinition()
comments += "\n Good description above the mean excitation energy.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
source/processes/electromagnetic/standard/src/G4MultipleScattering.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4MultipleScattering.cc,v 1.16.6.1 1999/12/07 20:50:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4MultipleScattering.cc,v 1.16.6.1.2.1 1999/12/08 17:34:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
@@ -570,7 +570,7 @@ void G4MultipleScattering::PrintInfoDefinition()
comments += "\n New model of MSC , computes the lateral \n";
comments += " displacement of the particle , too.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
source/processes/electromagnetic/standard/src/G4PAIenergyLoss.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PAIenergyLoss.cc,v 1.2.8.1 1999/12/07 20:50:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
source/processes/electromagnetic/standard/src/G4PAIonisation.cc
+20 -20
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PAIonisation.cc,v 1.2.8.1 1999/12/07 20:51:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PAIonisation.cc,v 1.2.8.1.2.1 1999/12/08 17:34:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// -------------------------------------------------------------
@@ -75,7 +75,7 @@ G4PAIonisation::G4PAIonisation( const G4String& materialName,
ComputeSandiaPhotoAbsCof() ;
// G4cout<<"G4PAIonisation constructor is called"<<endl ;
// G4cout<<"G4PAIonisation constructor is called"<<G4endl ;
// BuildPAIonisationTable() ;
}
@@ -287,7 +287,7 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
G4double tau,tau0,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
// G4cout<<"Material no. = "<<J<<"\t"<<"TotBin = "<<TotBin<<endl ;
// G4cout<<"Material no. = "<<J<<"\t"<<"TotBin = "<<TotBin<<G4endl ;
for (G4int i = 0 ; i < TotBin ; i++) //The loop for the kinetic energy
{
@@ -304,7 +304,7 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
tau = 0.01 ;
}
gamma = tau +1. ;
G4cout<<"gamma = "<<gamma<<endl ;
G4cout<<"gamma = "<<gamma<<G4endl ;
bg2 = tau*(tau+2.) ;
beta2 = bg2/(gamma*gamma) ;
Tmax = 2.*electron_mass_c2*bg2
@@ -319,10 +319,10 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
ionloss = protonPAI.GetMeanEnergyLoss() ; // total <dE/dx>
G4cout<<"ionloss = "<<ionloss*cm/keV<<" keV/cm"<<endl ;
G4cout<<"n1 = "<<protonPAI.GetIntegralPAIxSection(1)*cm<<" 1/cm"<<endl ;
G4cout<<"ionloss = "<<ionloss*cm/keV<<" keV/cm"<<G4endl ;
G4cout<<"n1 = "<<protonPAI.GetIntegralPAIxSection(1)*cm<<" 1/cm"<<G4endl ;
// G4cout<<"protonPAI.GetSplineSize() = "<<
// protonPAI.GetSplineSize()<<endl ;
// protonPAI.GetSplineSize()<<G4endl ;
transferVector = new
G4PhysicsFreeVector(protonPAI.GetSplineSize()) ;
@@ -346,8 +346,8 @@ G4PAIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
} // end of Tkin loop
theLossTable->insert(aVector);
} // end of material loop
// G4cout<<"G4PAIonisation::BuildPAIonisationTable() have been called"<<endl ;
// G4cout<<"G4PAIonisation::BuildLossTable() have been called"<<endl ;
// G4cout<<"G4PAIonisation::BuildPAIonisationTable() have been called"<<G4endl ;
// G4cout<<"G4PAIonisation::BuildLossTable() have been called"<<G4endl ;
}
///////////////////////////////////////////////////////////////////////
@@ -634,7 +634,7 @@ G4PAIonisation::PostStepDoIt( const G4Track& trackData,
G4VParticleChange* G4PAIonisation::AlongStepDoIt( const G4Track& trackData,
const G4Step& stepData )
{
// G4cout<<"G4PAIonisation::AlongStepDoIt is called"<<endl ;
// G4cout<<"G4PAIonisation::AlongStepDoIt is called"<<G4endl ;
const G4DynamicParticle* aParticle;
G4Material* aMaterial;
@@ -656,7 +656,7 @@ G4VParticleChange* G4PAIonisation::AlongStepDoIt( const G4Track& trackData,
if( Step == 0. || index != fMatIndex ) return &aParticleChange ;
G4cout<<"step = "<<Step/mm<<" mm"<<endl ;
G4cout<<"step = "<<Step/mm<<" mm"<<G4endl ;
@@ -730,7 +730,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
G4int index = aMaterial->GetIndex() ;
G4bool isOutRange ;
// G4cout<<"G4PAIenergyLoss::GetLossWithFluct"<<endl ;
// G4cout<<"G4PAIenergyLoss::GetLossWithFluct"<<G4endl ;
G4double loss = 0.0 ;
G4double transfer, position, E1, E2, W1, W2, W, firstMu, secondMu ;
@@ -751,7 +751,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
}
G4int iPlace = iTkin - 1 ; // index*(G4PAIonisation::GetBinNumber()) +
G4cout<<"iPlace = "<<iPlace<<endl ;
G4cout<<"iPlace = "<<iPlace<<G4endl ;
G4PhysicsVector* firstVector = (*fPAItransferBank)(iPlace) ;
G4PhysicsVector* secondVector = (*fPAItransferBank)(iPlace + 1) ;
@@ -760,7 +760,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
{
numOfCollisions = RandPoisson::shoot((*(*fPAItransferBank)(iPlace))(0)*Step) ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
while(numOfCollisions)
{
@@ -781,7 +781,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
numOfCollisions = RandPoisson::
shoot((*(*fPAItransferBank)(iPlace+1))(0)*Step) ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
while(numOfCollisions)
{
@@ -804,15 +804,15 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
W2 = (TkinScaled - E1)*W ;
// G4cout<<"(*(*fPAItransferBank)(iPlace))(0) = "<<
// (*(*fPAItransferBank)(iPlace))(0)<<endl ;
// (*(*fPAItransferBank)(iPlace))(0)<<G4endl ;
// G4cout<<"(*(*fPAItransferBank)(iPlace+1))(0) = "<<
// (*(*fPAItransferBank)(iPlace+1))(0)<<endl ;
// (*(*fPAItransferBank)(iPlace+1))(0)<<G4endl ;
numOfCollisions = RandPoisson::shoot(
( (*(*fPAItransferBank)(iPlace))(0)*W1 +
(*(*fPAItransferBank)(iPlace+1))(0)*W2 )*Step) ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
while(numOfCollisions)
{
@@ -835,7 +835,7 @@ G4PAIonisation::GetLossWithFluct( G4double Step,
}
}
}
G4cout<<"PAI loss = "<<loss/keV<<" keV"<<endl ;
G4cout<<"PAI loss = "<<loss/keV<<" keV"<<G4endl ;
return loss ;
}
source/processes/electromagnetic/standard/src/G4PAIxSection.cc
+12 -12
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PAIxSection.cc,v 1.3.6.1 1999/12/07 20:51:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PAIxSection.cc,v 1.3.6.1.2.1 1999/12/08 17:34:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// G4PAIxSection.cc -- class implementation file
@@ -70,7 +70,7 @@ G4PAIxSection::G4PAIxSection(G4int materialIndex,
GetElectronDensity() ;
fIntervalNumber = (*theMaterialTable)[materialIndex]->
GetSandiaTable()->GetMatNbOfIntervals() ;
G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<endl ;
G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
// G4double maxEnergyTransfer = 100*keV ;
fEnergyInterval = new G4double[fIntervalNumber+2] ;
@@ -91,7 +91,7 @@ G4PAIxSection::G4PAIxSection(G4int materialIndex,
fA4[i] = (*theMaterialTable)[materialIndex]->
GetSandiaTable()->GetSandiaCofForMaterial(i-1,4);
// G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
if(fEnergyInterval[i] >= maxEnergyTransfer)
{
fEnergyInterval[i] = maxEnergyTransfer ;
@@ -180,7 +180,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
// (*theMaterialTable)[materialIndex]->GetSandiaTable()->GetMatNbOfIntervals() ;
// G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<endl ;
// G4cout<<fDensity<<"\t"<<fElectronDensity<<"\t"<<fIntervalNumber<<G4endl ;
// G4double maxEnergyTransfer = 100*keV ;
fEnergyInterval = new G4double[fIntervalNumber+2] ;
@@ -208,7 +208,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
if( i == 1 || i == fIntervalNumber)
{
// G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
}
if(fEnergyInterval[i] >= maxEnergyTransfer)
{
@@ -338,7 +338,7 @@ G4PAIxSection::G4PAIxSection( G4int materialIndex,
if( i == 1 || i == fIntervalNumber)
{
// G4cout<<fEnergyInterval[i]<<"\t"<<fA1[i]<<"\t"<<fA2[i]<<"\t"
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<endl ;
// <<fA3[i]<<"\t"<<fA4[i]<<"\t"<<G4endl ;
}
if(fEnergyInterval[i] >= maxEnergyTransfer)
{
@@ -528,12 +528,12 @@ void G4PAIxSection::NormShift(G4double betaGammaSq)
RutherfordIntegral(j,fEnergyInterval[j],
fSplineEnergy[i] ) ;
}
// G4cout<<i<<"\t"<<fSplineEnergy[i]<<"\t"<<fIntegralTerm[i]<<"\n"<<endl;
// G4cout<<i<<"\t"<<fSplineEnergy[i]<<"\t"<<fIntegralTerm[i]<<"\n"<<G4endl;
}
fNormalizationCof = 2*pi*pi*hbarc*hbarc*fine_structure_const/electron_mass_c2 ;
fNormalizationCof *= fElectronDensity/fIntegralTerm[fSplineNumber] ;
// G4cout<<"fNormalizationCof = "<<fNormalizationCof<<endl ;
// G4cout<<"fNormalizationCof = "<<fNormalizationCof<<G4endl ;
// Calculation of PAI differrential cross-section (1/(keV*cm))
// in the energy points near borders of energy intervals
@@ -923,14 +923,14 @@ G4double G4PAIxSection::GetStepEnergyLoss( G4double step )
G4double loss = 0.0 ;
G4double meanNumber, position ;
// G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<endl ;
// G4cout<<" G4PAIxSection::GetStepEnergyLoss "<<G4endl ;
meanNumber = fIntegralPAIxSection[1]*step ;
numOfCollisions = RandPoisson::shoot(meanNumber) ;
// G4cout<<"numOfCollisions = "<<numOfCollisions<<endl ;
// G4cout<<"numOfCollisions = "<<numOfCollisions<<G4endl ;
while(numOfCollisions)
{
@@ -943,7 +943,7 @@ G4double G4PAIxSection::GetStepEnergyLoss( G4double step )
loss += fSplineEnergy[iTransfer] ;
numOfCollisions-- ;
}
// G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<endl ;
// G4cout<<"PAI energy loss = "<<loss/keV<<" keV"<<G4endl ;
return loss ;
}
source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PhotoElectricEffect.cc,v 1.8.6.1 1999/12/07 20:51:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PhotoElectricEffect.cc,v 1.8.6.1.2.1 1999/12/08 17:34:25 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -307,7 +307,7 @@ void G4PhotoElectricEffect::PrintInfoDefinition()
comments += "Good description from 10 KeV to 50 MeV for all Z";
comments += "\n Sandia crossSection below 50 KeV";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
<< " to " << G4BestUnit(HighestEnergyLimit,"Energy")
<< " in " << NumbBinTable << " bins. \n";
source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PolarizedComptonScattering.cc,v 1.1.10.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// --------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4SynchrotronRadiation.cc,v 1.1.10.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// --------------------------------------------------------------
// GEANT 4 class implementation file
source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
+11 -11
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eBremsstrahlung.cc,v 1.6.8.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eBremsstrahlung.cc,v 1.6.8.1.2.2 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -219,7 +219,7 @@ void G4eBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aParticleType
if(LPMGammaEnergyLimit > klim)
{
G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
G4double floss = 0. ;
G4int nmax = 1000 ;
@@ -793,8 +793,8 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
// Compute the maximum of the rejection function
G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
// sample the energy rate of the emitted Gamma
@@ -805,8 +805,8 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
x = pow(xmin, G4UniformRand());
epsil = x*KineticEnergy/TotalEnergy;
screenvar = screenfac*epsil/(1-epsil);
F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);
} while( greject < G4UniformRand()*grejmax );
@@ -830,9 +830,9 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
G4double bl = bl0 + bl1*U + bl2*U2;
// Compute the maximum of the rejection function
grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
G4double xm = -al/(2.*bl);
if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
// sample the energy rate of the emitted Gamma
@@ -924,7 +924,7 @@ G4Element* G4eBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
for ( G4int i=0; i < NumberOfElements; i++ )
if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
<< "' has no elements, NULL pointer returned." << endl;
<< "' has no elements, NULL pointer returned." << G4endl;
return NULL;
}
@@ -937,7 +937,7 @@ void G4eBremsstrahlung::PrintInfoDefinition()
comments += " log scale extrapolation above 100 GeV \n";
comments += " Gamma energy sampled from a parametrised formula.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4eBremsstrahlungPlus.cc
+11 -11
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eBremsstrahlungPlus.cc,v 1.6.8.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eBremsstrahlungPlus.cc,v 1.6.8.1.2.2 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -219,7 +219,7 @@ void G4eBremsstrahlungPlus::BuildLossTable(const G4ParticleDefinition& aParticle
if(LPMGammaEnergyLimit > klim)
{
G4double kmax = min(Cut,LPMGammaEnergyLimit) ;
G4double kmax = G4std::min(Cut,LPMGammaEnergyLimit) ;
G4double floss = 0. ;
G4int nmax = 1000 ;
@@ -794,8 +794,8 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
G4double screenmin = screenfac*epsilmin/(1.-epsilmin);
// Compute the maximum of the rejection function
G4double F1 = max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = max(ScreenFunction2(screenmin) - FZ ,0.);
G4double F1 = G4std::max(ScreenFunction1(screenmin) - FZ ,0.);
G4double F2 = G4std::max(ScreenFunction2(screenmin) - FZ ,0.);
grejmax = (F1 - epsilmin* (F1*ah - bh*epsilmin*F2))/(42.392 - FZ);
// sample the energy rate of the emitted Gamma
@@ -806,8 +806,8 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
x = pow(xmin, G4UniformRand());
epsil = x*KineticEnergy/TotalEnergy;
screenvar = screenfac*epsil/(1-epsil);
F1 = max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = max(ScreenFunction2(screenvar) - FZ ,0.);
F1 = G4std::max(ScreenFunction1(screenvar) - FZ ,0.);
F2 = G4std::max(ScreenFunction2(screenvar) - FZ ,0.);
migdal = (1. + MigdalFactor)/(1. + MigdalFactor/(x*x));
greject = migdal*(F1 - epsil* (ah*F1 - bh*epsil*F2))/(42.392 - FZ);
} while( greject < G4UniformRand()*grejmax );
@@ -831,9 +831,9 @@ G4VParticleChange* G4eBremsstrahlungPlus::PostStepDoIt(const G4Track& trackData,
G4double bl = bl0 + bl1*U + bl2*U2;
// Compute the maximum of the rejection function
grejmax = max(1. + xmin* (al + bl*xmin), 1.+al+bl);
grejmax = G4std::max(1. + xmin* (al + bl*xmin), 1.+al+bl);
G4double xm = -al/(2.*bl);
if ((xmin < xm)&&(xm < 1.)) grejmax = max(grejmax, 1.+ xm* (al + bl*xm));
if ((xmin < xm)&&(xm < 1.)) grejmax = G4std::max(grejmax, 1.+ xm* (al + bl*xm));
// sample the energy rate of the emitted Gamma
@@ -925,7 +925,7 @@ G4Element* G4eBremsstrahlungPlus::SelectRandomAtom(G4Material* aMaterial) const
for ( G4int i=0; i < NumberOfElements; i++ )
if (rval <= (*PartialSumSigma(Index))(i)) return ((*theElementVector)(i));
G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
<< "' has no elements, NULL pointer returned." << endl;
<< "' has no elements, NULL pointer returned." << G4endl;
return NULL;
}
@@ -938,7 +938,7 @@ void G4eBremsstrahlungPlus::PrintInfoDefinition()
comments += " log scale extrapolation above 100 GeV \n";
comments += " Gamma energy sampled from a parametrised formula.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4eEnergyLoss.cc
+7 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eEnergyLoss.cc,v 1.10.6.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eEnergyLoss.cc,v 1.10.6.1.2.1 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
@@ -1043,7 +1043,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1056,7 +1056,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1083,14 +1083,14 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
if(a2>alim)
{
siga=sqrt(a2) ;
p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
}
else
p2 = G4Poisson(a2);
@@ -1099,7 +1099,7 @@ G4double G4eEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a3>alim)
{
siga=sqrt(a3) ;
p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
}
else
p3 = G4Poisson(a3);
source/processes/electromagnetic/standard/src/G4eEnergyLossPlus.cc
+15 -15
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eEnergyLossPlus.cc,v 1.16.6.1 1999/12/07 20:51:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eEnergyLossPlus.cc,v 1.16.6.1.2.2 1999/12/10 15:41:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
@@ -264,13 +264,13 @@ void G4eEnergyLossPlus::BuildDEDXTable(
{
// create array for the min. delta cuts in kinetic energy
G4double absLowerLimit = 1.*keV ;
G4cout << endl;
G4cout << G4endl;
G4cout.precision(5) ;
G4cout << " eIoni+ Minimum Delta cut in range=" << MinDeltaCutInRange/mm
<< " mm." << endl;
G4cout << " min. delta energies (keV) " << endl;
G4cout << " material min.delta energy " << endl;
G4cout << endl;
<< " mm." << G4endl;
G4cout << " min. delta energies (keV) " << G4endl;
G4cout << " material min.delta energy " << G4endl;
G4cout << G4endl;
if(MinDeltaEnergy) delete MinDeltaEnergy ;
MinDeltaEnergy = new G4double [numOfMaterials] ;
@@ -285,8 +285,8 @@ void G4eEnergyLossPlus::BuildDEDXTable(
MinDeltaEnergy[mat] = absLowerLimit ;
if(MinDeltaEnergy[mat]<Tlowerlimit) MinDeltaEnergy[mat]=Tlowerlimit ;
G4cout << setw(20) << (*theMaterialTable)(mat)->GetName()
<< setw(15) << MinDeltaEnergy[mat]/keV << endl;
G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
<< G4std::setw(15) << MinDeltaEnergy[mat]/keV << G4endl;
}
}
}
@@ -1016,7 +1016,7 @@ G4VParticleChange* G4eEnergyLossPlus::AlongStepDoIt( const G4Track& trackData,
postsafety =
navigator->ComputeSafety(stepData.GetPostStepPoint()->GetPosition());
safety=min(presafety,postsafety);
safety=G4std::min(presafety,postsafety);
if(safety<rcut)
{
@@ -1279,7 +1279,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1292,7 +1292,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1319,14 +1319,14 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
if(a2>alim)
{
siga=sqrt(a2) ;
p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
}
else
p2 = G4Poisson(a2);
@@ -1335,7 +1335,7 @@ G4double G4eEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a3>alim)
{
siga=sqrt(a3) ;
p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
}
else
p3 = G4Poisson(a3);
source/processes/electromagnetic/standard/src/G4eIonisation.cc
+5 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eIonisation.cc,v 1.3.8.1 1999/12/07 20:51:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eIonisation.cc,v 1.3.8.1.2.2 1999/12/10 15:42:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// -------------------------------------------------------------
@@ -158,7 +158,7 @@ void G4eIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
if (&aParticleType==G4Electron::Electron())
{
Tmax = LowEdgeEnergy/2.;
d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2
+ log((tau-d)*d)+tau/(tau-d)
+ (0.5*d*d+(2.*tau+1.)*log(1.-d/tau))/gamma2;
@@ -166,7 +166,7 @@ void G4eIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
else //positron
{
Tmax = LowEdgeEnergy ;
d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d2=d*d/2.; d3=d*d*d/3.; d4=d*d*d*d/4.;
y=1./(1.+gamma);
ionloss = log(2.*(tau+2.)/Eexcm2)+log(tau*d)
@@ -449,7 +449,7 @@ void G4eIonisation::PrintInfoDefinition()
comments += "Good description from 1 KeV to 100 GeV.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4eIonisationPlus.cc
+5 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eIonisationPlus.cc,v 1.3.8.1 1999/12/07 20:51:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eIonisationPlus.cc,v 1.3.8.1.2.2 1999/12/10 15:42:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// -------------------------------------------------------------
@@ -158,7 +158,7 @@ void G4eIonisationPlus::BuildLossTable(const G4ParticleDefinition& aParticleType
if (&aParticleType==G4Electron::Electron())
{
Tmax = LowEdgeEnergy/2.;
d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
ionloss = log(2.*(tau+2.)/Eexcm2)-1.-beta2
+ log((tau-d)*d)+tau/(tau-d)
+ (0.5*d*d+(2.*tau+1.)*log(1.-d/tau))/gamma2;
@@ -166,7 +166,7 @@ void G4eIonisationPlus::BuildLossTable(const G4ParticleDefinition& aParticleType
else //positron
{
Tmax = LowEdgeEnergy ;
d = min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d = G4std::min(ParticleCutInKineticEnergy[J], Tmax)/ParticleMass;
d2=d*d/2.; d3=d*d*d/3.; d4=d*d*d*d/4.;
y=1./(1.+gamma);
ionloss = log(2.*(tau+2.)/Eexcm2)+log(tau*d)
@@ -449,7 +449,7 @@ void G4eIonisationPlus::PrintInfoDefinition()
comments += "Good description from 1 KeV to 100 GeV.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
<< " in " << TotBin << " bins. \n";
source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4eplusAnnihilation.cc,v 1.1.10.1 1999/12/07 20:51:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4eplusAnnihilation.cc,v 1.1.10.1.2.1 1999/12/08 17:34:26 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -318,7 +318,7 @@ void G4eplusAnnihilation::PrintInfoDefinition()
G4String comments = "Total cross section from Heilter formula (annihilation into 2 photons).\n";
comments += " gamma energies sampled according Heitler";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestEnergyLimit,"Energy")
<< " to " << G4BestUnit(HighestEnergyLimit,"Energy")
<< " in " << NumbBinTable << " bins. \n";
source/processes/electromagnetic/standard/src/G4hEnergyLoss.cc
+7 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4hEnergyLoss.cc,v 1.14.6.1 1999/12/07 20:51:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4hEnergyLoss.cc,v 1.14.6.1.2.1 1999/12/10 15:42:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
@@ -1230,7 +1230,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1243,7 +1243,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1271,14 +1271,14 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
if(a2>alim)
{
siga=sqrt(a2) ;
p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
}
else
p2 = G4Poisson(a2);
@@ -1287,7 +1287,7 @@ G4double G4hEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a3>alim)
{
siga=sqrt(a3) ;
p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
}
else
p3 = G4Poisson(a3);
source/processes/electromagnetic/standard/src/G4hEnergyLossPlus.cc
+16 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4hEnergyLossPlus.cc,v 1.16.6.1 1999/12/07 20:51:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4hEnergyLossPlus.cc,v 1.16.6.1.2.2 1999/12/10 15:42:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// -----------------------------------------------------------
@@ -303,13 +303,13 @@ void G4hEnergyLossPlus::BuildDEDXTable(
if(aParticleType.GetParticleName()=="proton")
{
// create array for the min. delta cuts in kinetic energy
G4cout << endl;
G4cout << G4endl;
G4cout.precision(5) ;
G4cout << "hIoni+ Minimum Delta cut in range=" << MinDeltaCutInRange/mm
<< " mm." << endl;
G4cout << " min. delta energies (keV) " << endl;
G4cout << " material min.delta energy " << endl;
G4cout << endl;
<< " mm." << G4endl;
G4cout << " min. delta energies (keV) " << G4endl;
G4cout << " material min.delta energy " << G4endl;
G4cout << G4endl;
if(MinDeltaEnergy) delete MinDeltaEnergy ;
MinDeltaEnergy = new G4double [numOfMaterials] ;
@@ -320,8 +320,8 @@ void G4hEnergyLossPlus::BuildDEDXTable(
G4Electron::Electron(),MinDeltaCutInRange,
(*theMaterialTable)(mat)) ;
if(MinDeltaEnergy[mat]<Tlowerlimit) MinDeltaEnergy[mat]=Tlowerlimit ;
G4cout << setw(20) << (*theMaterialTable)(mat)->GetName()
<< setw(15) << MinDeltaEnergy[mat]/keV << endl;
G4cout << G4std::setw(20) << (*theMaterialTable)(mat)->GetName()
<< G4std::setw(15) << MinDeltaEnergy[mat]/keV << G4endl;
}
}
}
@@ -1210,7 +1210,7 @@ G4VParticleChange* G4hEnergyLossPlus::AlongStepDoIt(
postsafety =
navigator->ComputeSafety(stepData.GetPostStepPoint()->GetPosition());
safety = min(presafety,postsafety) ;
safety = G4std::min(presafety,postsafety) ;
if(safety < rcut)
{
@@ -1251,7 +1251,7 @@ G4VParticleChange* G4hEnergyLossPlus::AlongStepDoIt(
{
T0=G4EnergyLossTables::GetPreciseEnergyFromRange(
G4Electron::Electron(),
min(presafety,postsafety),
G4std::min(presafety,postsafety),
aMaterial) ;
// absolute lower limit for T0
@@ -1469,7 +1469,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1482,7 +1482,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
@@ -1510,14 +1510,14 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a1>alim)
{
siga=sqrt(a1) ;
p1 = max(0,int(RandGauss::shoot(a1,siga)+0.5));
p1 = G4std::max(0,int(RandGauss::shoot(a1,siga)+0.5));
}
else
p1 = G4Poisson(a1);
if(a2>alim)
{
siga=sqrt(a2) ;
p2 = max(0,int(RandGauss::shoot(a2,siga)+0.5));
p2 = G4std::max(0,int(RandGauss::shoot(a2,siga)+0.5));
}
else
p2 = G4Poisson(a2);
@@ -1526,7 +1526,7 @@ G4double G4hEnergyLossPlus::GetLossWithFluct(const G4DynamicParticle* aParticle,
if(a3>alim)
{
siga=sqrt(a3) ;
p3 = max(0,int(RandGauss::shoot(a3,siga)+0.5));
p3 = G4std::max(0,int(RandGauss::shoot(a3,siga)+0.5));
}
else
p3 = G4Poisson(a3);
source/processes/electromagnetic/standard/src/G4hIonisation.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4hIonisation.cc,v 1.6.8.1 1999/12/07 20:51:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4hIonisation.cc,v 1.6.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// -------------------------------------------------------------
// GEANT 4 class implementation file
@@ -566,7 +566,7 @@ void G4hIonisation::PrintInfoDefinition()
comments += "\n Good description above the mean excitation energy.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
source/processes/electromagnetic/standard/src/G4hIonisationPlus.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4hIonisationPlus.cc,v 1.3.8.1 1999/12/07 20:51:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4hIonisationPlus.cc,v 1.3.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// -------------------------------------------------------------
// GEANT 4 class implementation file
@@ -565,7 +565,7 @@ void G4hIonisationPlus::PrintInfoDefinition()
comments += "\n Good description above the mean excitation energy.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments
G4cout << G4endl << GetProcessName() << ": " << comments
<< "\n PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
"Energy")
<< " to " << G4BestUnit(HighestKineticEnergy,"Energy")
source/processes/electromagnetic/standard/src/G4ionIonisation.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ionIonisation.cc,v 1.3.8.1 1999/12/07 20:51:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ionIonisation.cc,v 1.3.8.1.2.1 1999/12/08 17:34:27 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// -------------------------------------------------------------
// GEANT 4 class implementation file
@@ -454,6 +454,6 @@ void G4ionIonisation::PrintInfoDefinition()
comments += "\n MeanFreePath is computed at tracking time.\n";
comments += " delta ray energy sampled from differential Xsection.";
G4cout << endl << GetProcessName() << ": " << comments << endl;
G4cout << G4endl << GetProcessName() << ": " << comments << G4endl;
}