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

Import Geant4 6.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:56:29 +02:00
parent 1d812b78b1
commit e083ffb441
1415 changed files with 111223 additions and 21207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/muons/History
+10 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.66 2004/03/02 17:45:03 vnivanch Exp $
$Id: History,v 1.68 2004/05/27 16:43:08 vnivanch Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
27 May 04: V.Ivant (muons-V06-01-01)
- Set default regime of MuIonisation integral
- Minor fix in differential cross section for MuPairProduction
28 April 04: V.Ivant (muons-V06-01-00)
- MuPairProduction: fix minor energy non-conservation, fix
problem of calculation of maximumum energy transfer for
compounds
02 March 04: V.Ivant (muons-V06-00-02)
- Minor fix in initialisation of MuPairProductionModel
source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
+2 -2
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuBremsstrahlung.hh,v 1.19 2004/02/10 18:07:23 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuBremsstrahlung.hh,v 1.21 2004/05/07 16:47:15 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
source/processes/electromagnetic/muons/include/G4MuIonisation.hh
+2 -2
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuIonisation.hh,v 1.19 2004/02/10 18:07:23 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuIonisation.hh,v 1.21 2004/05/07 16:47:15 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
+4 -2
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuPairProduction.hh,v 1.18 2004/02/10 18:07:23 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuPairProduction.hh,v 1.21 2004/05/07 16:47:16 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
@@ -47,6 +47,7 @@
// 08-08-03 STD substitute standard (V.Ivanchenko)
// 12-11-03 G4EnergyLossSTD -> G4EnergyLossProcess (V.Ivanchenko)
// 21-01-04 Migrade to G4ParticleChangeForLoss (V.Ivanchenko)
// 28-04-04 Fix minor bug in energy balance (V.Ivanchenko)
//
// Class Description:
//
@@ -181,6 +182,7 @@ inline void G4MuPairProduction::SecondariesPostStep(
elpos = (*newp)[1];
fParticleChange.AddSecondary(elpos);
kinEnergy -= elpos->GetKineticEnergy();
kinEnergy -= 2.0*electron_mass_c2;
delete newp;
}
source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh
+9 -7
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuPairProductionModel.hh,v 1.11 2004/02/10 18:07:23 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuPairProductionModel.hh,v 1.12 2004/04/28 14:39:43 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
@@ -120,7 +120,7 @@ protected:
//private:
public:
G4double ComputMuPairLoss(G4double Z, G4double tkin, G4double cut);
G4double ComputMuPairLoss(G4double Z, G4double tkin, G4double cut, G4double tmax);
G4double ComputeMicroscopicCrossSection(G4double tkin,
G4double Z,
@@ -131,7 +131,7 @@ public:
G4double pairEnergy);
private:
const G4Element* SelectRandomAtom(G4double dt, G4int it, G4int iy,
const G4Element* SelectRandomAtom(G4double kinEnergy, G4double dt, G4int it,
const G4MaterialCutsCouple* couple);
void MakeSamplingTables();
@@ -215,12 +215,14 @@ void G4MuPairProductionModel::SetCurrentElement(G4double Z)
inline
G4double G4MuPairProductionModel::InterpolatedIntegralCrossSection(G4double dt, G4double dz,
G4int iz, G4int it, G4int iy, G4double z)
G4int iz, G4int it, G4int iy, G4double z)
{
G4double fac = 1./(zdat[iz] *(zdat[iz] +1.));
G4double fac1 = 1./(zdat[iz-1]*(zdat[iz-1]+1.));
G4double f0 = fac1*proba[iz-1][it-1][iy] + (fac*proba[iz][it-1][iy]-fac1*proba[iz-1][it-1][iy])*dz;
G4double f1 = fac1*proba[iz-1][it ][iy] + (fac*proba[iz][it ][iy]-fac1*proba[iz-1][it ][iy])*dz;
G4double f0 = fac1*proba[iz-1][it-1][iy] +
(fac*proba[iz][it-1][iy]-fac1*proba[iz-1][it-1][iy])*dz;
G4double f1 = fac1*proba[iz-1][it ][iy] +
(fac*proba[iz][it ][iy]-fac1*proba[iz-1][it ][iy])*dz;
return (f0 + (f1-f0)*dt)*z*(z+1.);
}
source/processes/electromagnetic/muons/src/G4MuIonisation.cc
+6 -9
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuIonisation.cc,v 1.40 2004/02/15 17:46:55 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuIonisation.cc,v 1.42 2004/05/27 17:29:35 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
@@ -60,6 +60,7 @@
// 08-08-03 STD substitute standard (V.Ivanchenko)
// 12-11-03 G4EnergyLossSTD -> G4EnergyLossProcess (V.Ivanchenko)
// 10-02-04 Calculation of radiative corrections using R.Kokoulin model (V.Ivanchenko)
// 27-05-04 Set integral to be a default regime (V.Ivanchenko)
//
// -------------------------------------------------------------------
//
@@ -90,7 +91,6 @@ G4MuIonisation::G4MuIonisation(const G4String& name)
SetLambdaBinning(120);
SetMinKinEnergy(0.1*keV);
SetMaxKinEnergy(100.0*TeV);
SetIntegral(false);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -106,12 +106,7 @@ void G4MuIonisation::InitialiseProcess()
mass = theParticle->GetPDGMass();
SetSecondaryParticle(G4Electron::Electron());
if(IsIntegral()) {
flucModel = new G4BohrFluctuations();
} else {
flucModel = new G4UniversalFluctuation();
}
flucModel = new G4UniversalFluctuation();
G4VEmModel* em = new G4BraggModel();
em->SetLowEnergyLimit(0.1*keV);
@@ -126,6 +121,8 @@ void G4MuIonisation::InitialiseProcess()
em2->SetHighEnergyLimit(100.0*TeV);
AddEmModel(3, em2, flucModel);
SetStepLimits(0.2, 1.0*mm);
ratio = electron_mass_c2/mass;
isInitialised = true;
}
source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc
+45 -32
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4MuPairProductionModel.cc,v 1.17 2004/03/02 17:45:03 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-01 $
// $Id: G4MuPairProductionModel.cc,v 1.19 2004/05/05 18:45:42 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-02 $
//
// -------------------------------------------------------------------
//
@@ -46,6 +46,8 @@
// 8 integration points in ComputeDMicroscopicCrossSection
// 12-01-04 Take min cut of e- and e+ not its sum (V.Ivanchenko)
// 10-02-04 Update parameterisation using R.Kokoulin model (V.Ivanchenko)
// 28-04-04 For complex materials repeat calculation of max energy for each
// material (V.Ivanchenko)
//
// Class Description:
@@ -141,7 +143,7 @@ G4bool G4MuPairProductionModel::IsInCharge(const G4ParticleDefinition* p)
void G4MuPairProductionModel::Initialise(const G4ParticleDefinition*,
const G4DataVector&)
{
{
if (!samplingTablesAreFilled) MakeSamplingTables();
}
@@ -153,10 +155,7 @@ G4double G4MuPairProductionModel::ComputeDEDX(const G4MaterialCutsCouple* couple
G4double cutEnergy)
{
G4double dedx = 0.0;
if (minPairEnergy >= cutEnergy || kineticEnergy <= lowestKinEnergy) return dedx;
G4double tmax = MaxSecondaryEnergy(particle, kineticEnergy);
G4double cut = std::min(cutEnergy,tmax);
if (cutEnergy <= minPairEnergy || kineticEnergy <= lowestKinEnergy) return dedx;
const G4Material* material = couple->GetMaterial();
const G4ElementVector* theElementVector = material->GetElementVector();
@@ -166,7 +165,10 @@ G4double G4MuPairProductionModel::ComputeDEDX(const G4MaterialCutsCouple* couple
// loop for elements in the material
for (size_t i=0; i<material->GetNumberOfElements(); i++) {
G4double Z = (*theElementVector)[i]->GetZ();
G4double loss = ComputMuPairLoss(Z, kineticEnergy, cut);
SetCurrentElement(Z);
G4double tmax = MaxSecondaryEnergy(particle, kineticEnergy);
G4double cut = std::min(cutEnergy,tmax);
G4double loss = ComputMuPairLoss(Z, kineticEnergy, cut, tmax);
dedx += loss*theAtomicNumDensityVector[i];
}
if (dedx < 0.) dedx = 0.;
@@ -176,15 +178,14 @@ G4double G4MuPairProductionModel::ComputeDEDX(const G4MaterialCutsCouple* couple
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuPairProductionModel::ComputMuPairLoss(G4double Z,
G4double tkin, G4double cutEnergy)
G4double tkin, G4double cutEnergy,
G4double tmax)
{
SetCurrentElement(Z);
G4double loss = 0.0;
G4double tmax = MaxSecondaryEnergy(particle, tkin);
G4double cut = cutEnergy;
if(tmax <= cutEnergy) cut = tmax;
if(cut <= minPairEnergy) return loss;
if(tmax <= cutEnergy || cut <= minPairEnergy) return loss;
// calculate the rectricted loss
// numerical integration in log(PairEnergy)
@@ -283,7 +284,7 @@ G4double G4MuPairProductionModel::ComputeDMicroscopicCrossSection(
G4double a3 = 1. - alf;
if (a3 <= 0.) return cross;
// zeta calculation
// zeta calculation
G4double bbb,g1,g2;
if( Z < 1.5 ) { bbb = bbbh ; g1 = g1h ; g2 = g2h ; }
else { bbb = bbbtf; g1 = g1tf; g2 = g2tf; }
@@ -367,10 +368,9 @@ G4double G4MuPairProductionModel::CrossSection(const G4MaterialCutsCouple* coupl
G4double maxEnergy)
{
G4double cross = 0.0;
G4double tmax = std::min(maxEnergy, MaxSecondaryEnergy(particle, kineticEnergy));
G4double cut = std::max(cutEnergy, minPairEnergy);
if (kineticEnergy <= lowestKinEnergy) return cross;
if (cut >= tmax || kineticEnergy <= lowestKinEnergy) return cross;
maxEnergy += particleMass;
const G4Material* material = couple->GetMaterial();
const G4ElementVector* theElementVector = material->GetElementVector();
@@ -378,10 +378,15 @@ G4double G4MuPairProductionModel::CrossSection(const G4MaterialCutsCouple* coupl
for (size_t i=0; i<material->GetNumberOfElements(); i++) {
G4double Z = (*theElementVector)[i]->GetZ();
G4double cr = ComputeMicroscopicCrossSection(kineticEnergy, Z, cut)
- ComputeMicroscopicCrossSection(kineticEnergy, Z, tmax);
SetCurrentElement(Z);
G4double tmax = std::min(maxEnergy,MaxSecondaryEnergy(particle, kineticEnergy));
G4double cut = std::max(minPairEnergy,cutEnergy);
if(cut < tmax) {
G4double cr = ComputeMicroscopicCrossSection(kineticEnergy, Z, cut)
- ComputeMicroscopicCrossSection(kineticEnergy, Z, tmax);
cross += theAtomNumDensityVector[i] * cr;
cross += theAtomNumDensityVector[i] * cr;
}
}
return cross;
}
@@ -461,26 +466,26 @@ std::vector<G4DynamicParticle*>* G4MuPairProductionModel::SampleSecondaries(
if(it == ntdat) it--;
G4double dt = log(kineticEnergy/tdat[it-1])/log(tdat[it]/tdat[it-1]);
// select randomly one element constituing the material
G4int iymin = 0;
G4int iymax = nbiny-1;
const G4Element* anElement = SelectRandomAtom(kineticEnergy, dt, it, couple);
SetCurrentElement(anElement->GetZ());
G4double maxPairEnergy = MaxSecondaryEnergy(particle,kineticEnergy);
G4double maxEnergy = std::min(tmax, maxPairEnergy);
G4double minEnergy = std::min(maxEnergy, cut);
G4int iymin = 0;
G4int iymax = nbiny;
if( minEnergy > minPairEnergy)
{
G4double xc = log(minEnergy/minPairEnergy)/log(maxPairEnergy/minPairEnergy);
iymin = (G4int)((log(xc) - ymin)/dy);
if(iymin >= nbiny) iymin = nbiny-1;
xc = log(maxEnergy/minPairEnergy)/log(maxPairEnergy/minPairEnergy);
iymax = (G4int)((log(xc) - ymin)/dy) + 1;
if(iymax > nbiny) iymax = nbiny;
if(iymax >= nbiny) iymax = nbiny-1;
}
// select randomly one element constituing the material
const G4Element* anElement = SelectRandomAtom(dt, it, iymin, couple);
SetCurrentElement(anElement->GetZ());
// sample e-e+ energy, pair energy first
G4int iz, iy;
@@ -509,14 +514,14 @@ std::vector<G4DynamicParticle*>* G4MuPairProductionModel::SampleSecondaries(
if(PairEnergy > maxEnergy) PairEnergy = maxEnergy;
// sample r=(E+-E-)/PairEnergy ( uniformly .....)
G4double rmax = (1.-6.*particleMass*particleMass/(totalEnergy*
(totalEnergy-PairEnergy)))
G4double rmax =
(1.-6.*particleMass*particleMass/(totalEnergy*(totalEnergy-PairEnergy)))
*sqrt(1.-minPairEnergy/PairEnergy);
G4double r = rmax * (-1.+2.*G4UniformRand()) ;
// compute energies from PairEnergy,r
G4double ElectronEnergy=(1.-r)*PairEnergy/2. ;
G4double PositronEnergy=(1.+r)*PairEnergy/2. ;
G4double ElectronEnergy = (1.-r)*PairEnergy*0.5;
G4double PositronEnergy = PairEnergy - ElectronEnergy;
// angles of the emitted particles ( Z - axis along the parent particle)
// (mean theta for the moment)
@@ -558,7 +563,8 @@ std::vector<G4DynamicParticle*>* G4MuPairProductionModel::SampleSecondaries(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
const G4Element* G4MuPairProductionModel::SelectRandomAtom(G4double dt, G4int it, G4int iy,
const G4Element* G4MuPairProductionModel::SelectRandomAtom(
G4double kinEnergy, G4double dt, G4int it,
const G4MaterialCutsCouple* couple)
{
// select randomly 1 element within the material
@@ -580,11 +586,18 @@ const G4Element* G4MuPairProductionModel::SelectRandomAtom(G4double dt, G4int it
size_t i;
for (i=0; i<nElements; i++) {
G4double Z = ((*theElementVector)[i])->GetZ();
SetCurrentElement(Z);
G4double maxPairEnergy = MaxSecondaryEnergy(particle,kinEnergy);
G4int iz;
for(iz=1; iz<nzdat; iz++) {if(Z <= zdat[iz]) break;}
if(iz == nzdat) iz--;
G4double dz = log(Z/zdat[iz-1])/log(zdat[iz]/zdat[iz-1]);
G4double xc = log(kinEnergy/minPairEnergy)/log(maxPairEnergy/minPairEnergy);
G4int iy = (G4int)((log(xc) - ymin)/dy);
if(iy >= nbiny) iy = nbiny-1;
G4double sigtot = InterpolatedIntegralCrossSection(dt, dz, iz, it, nbiny, Z);
G4double sigcut = InterpolatedIntegralCrossSection(dt, dz, iz, it, iy, Z);
sum += (sigtot - sigcut)*theAtomNumDensityVector[i];