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

Import Geant4 10.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 14:11:04 +02:00
parent c9b32a6c0a
commit d4af681f38
4886 changed files with 420149 additions and 1023309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/muons/History
+8 -1
View File
@@ -1,4 +1,4 @@
$Id: History 87062 2014-11-24 11:45:21Z gcosmo $
$Id: History 91743 2015-08-04 11:49:58Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,13 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
03 August 15: V.Ivant (emmuons-V10-01-01)
- Technical tag: substitute tabs by spaces,
add comments to do/while and while loops
04 March 15: V.Ivanchenko (emmuons-V10-01-00)
- G4MuMultipleScattering - do not redefine step limit type
21 November 14: V.Ivanchenko (emmuons-V10-00-04)
- G4EnergyLossForExtrapolator - fixed problem of thread safe
initialisation
source/processes/electromagnetic/muons/src/G4MuBetheBlochModel.cc
+13 -14
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4MuBetheBlochModel.cc 85023 2014-10-23 09:56:39Z gcosmo $
// $Id: G4MuBetheBlochModel.cc 91743 2015-08-04 11:49:58Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -68,7 +68,7 @@
G4double G4MuBetheBlochModel::xgi[]={ 0.0199, 0.1017, 0.2372, 0.4083, 0.5917,
0.7628, 0.8983, 0.9801 };
G4double G4MuBetheBlochModel::wgi[]={ 0.0506, 0.1112, 0.1569, 0.1813, 0.1813,
0.1569, 0.1112, 0.0506 };
@@ -114,7 +114,7 @@ G4double G4MuBetheBlochModel::MinEnergyCut(const G4ParticleDefinition*,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
G4double G4MuBetheBlochModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy)
G4double kinEnergy)
{
G4double tau = kinEnergy/mass;
G4double tmax = 2.0*electron_mass_c2*tau*(tau + 2.) /
@@ -185,7 +185,7 @@ G4double G4MuBetheBlochModel::ComputeCrossSectionPerElectron(
G4double G4MuBetheBlochModel::ComputeCrossSectionPerAtom(
const G4ParticleDefinition* p,
G4double kineticEnergy,
G4double Z, G4double,
G4double Z, G4double,
G4double cutEnergy,
G4double maxEnergy)
{
@@ -197,7 +197,7 @@ G4double G4MuBetheBlochModel::ComputeCrossSectionPerAtom(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuBetheBlochModel::CrossSectionPerVolume(
const G4Material* material,
const G4Material* material,
const G4ParticleDefinition* p,
G4double kineticEnergy,
G4double cutEnergy,
@@ -212,9 +212,9 @@ G4double G4MuBetheBlochModel::CrossSectionPerVolume(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuBetheBlochModel::ComputeDEDXPerVolume(const G4Material* material,
const G4ParticleDefinition* p,
G4double kineticEnergy,
G4double cut)
const G4ParticleDefinition* p,
G4double kineticEnergy,
G4double cut)
{
G4double tmax = MaxSecondaryEnergy(p, kineticEnergy);
G4double tau = kineticEnergy/mass;
@@ -275,10 +275,10 @@ G4double G4MuBetheBlochModel::ComputeDEDXPerVolume(const G4Material* material,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void G4MuBetheBlochModel::SampleSecondaries(vector<G4DynamicParticle*>* vdp,
const G4MaterialCutsCouple*,
const G4DynamicParticle* dp,
G4double minKinEnergy,
G4double maxEnergy)
const G4MaterialCutsCouple*,
const G4DynamicParticle* dp,
G4double minKinEnergy,
G4double maxEnergy)
{
G4double tmax = MaxSecondaryKinEnergy(dp);
G4double maxKinEnergy = min(maxEnergy,tmax);
@@ -320,8 +320,7 @@ void G4MuBetheBlochModel::SampleSecondaries(vector<G4DynamicParticle*>* vdp,
<< " tmin= " << minKinEnergy << " max= " << maxKinEnergy
<< G4endl;
}
// Loop checking, 03-Aug-2015, Vladimir Ivanchenko
} while( grej*G4UniformRand() > f );
G4double deltaMomentum =
source/processes/electromagnetic/muons/src/G4MuBremsstrahlungModel.cc
+13 -13
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4MuBremsstrahlungModel.cc 85023 2014-10-23 09:56:39Z gcosmo $
// $Id: G4MuBremsstrahlungModel.cc 91743 2015-08-04 11:49:58Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -74,7 +74,6 @@
#include "G4ElementVector.hh"
#include "G4ProductionCutsTable.hh"
#include "G4ParticleChangeForLoss.hh"
//#include "G4LossTableManager.hh"
#include "G4Log.hh"
#include "G4Exp.hh"
@@ -114,7 +113,7 @@ G4MuBremsstrahlungModel::G4MuBremsstrahlungModel(const G4ParticleDefinition* p,
G4double dn = 1.54*nist->GetA27(i);
fDN[i] = dn;
if(1 < i) {
fDN[i] /= std::pow(dn, 1./G4double(i));
fDN[i] /= std::pow(dn, 1./G4double(i));
}
}
}
@@ -130,7 +129,7 @@ G4MuBremsstrahlungModel::~G4MuBremsstrahlungModel()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuBremsstrahlungModel::MinEnergyCut(const G4ParticleDefinition*,
const G4MaterialCutsCouple*)
const G4MaterialCutsCouple*)
{
return minThreshold;
}
@@ -138,8 +137,8 @@ G4double G4MuBremsstrahlungModel::MinEnergyCut(const G4ParticleDefinition*,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuBremsstrahlungModel::MinPrimaryEnergy(const G4Material*,
const G4ParticleDefinition*,
G4double cut)
const G4ParticleDefinition*,
G4double cut)
{
return std::max(lowestKinEnergy,cut);
}
@@ -162,7 +161,7 @@ void G4MuBremsstrahlungModel::Initialise(const G4ParticleDefinition* p,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4MuBremsstrahlungModel::InitialiseLocal(const G4ParticleDefinition* p,
G4VEmModel* masterModel)
G4VEmModel* masterModel)
{
if(p == particle && lowestKinEnergy < HighEnergyLimit()) {
SetElementSelectors(masterModel->GetElementSelectors());
@@ -172,7 +171,7 @@ void G4MuBremsstrahlungModel::InitialiseLocal(const G4ParticleDefinition* p,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuBremsstrahlungModel::ComputeDEDXPerVolume(
const G4Material* material,
const G4Material* material,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy)
@@ -341,7 +340,7 @@ G4double G4MuBremsstrahlungModel::ComputeDMicroscopicCrossSection(
G4double G4MuBremsstrahlungModel::ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double Z, G4double,
G4double Z, G4double,
G4double cutEnergy,
G4double maxEnergy)
{
@@ -363,10 +362,10 @@ G4double G4MuBremsstrahlungModel::ComputeCrossSectionPerAtom(
void G4MuBremsstrahlungModel::SampleSecondaries(
std::vector<G4DynamicParticle*>* vdp,
const G4MaterialCutsCouple* couple,
const G4DynamicParticle* dp,
G4double minEnergy,
G4double maxEnergy)
const G4MaterialCutsCouple* couple,
const G4DynamicParticle* dp,
G4double minEnergy,
G4double maxEnergy)
{
G4double kineticEnergy = dp->GetKineticEnergy();
// check against insufficient energy
@@ -400,6 +399,7 @@ void G4MuBremsstrahlungModel::SampleSecondaries(
epksi = MeV*G4Exp(lnepksi);
func2 = epksi*ComputeDMicroscopicCrossSection(kineticEnergy,Z,epksi);
// Loop checking, 03-Aug-2015, Vladimir Ivanchenko
} while(func2 < func1*G4UniformRand());
G4double gEnergy = epksi;
source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc
+1 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4MuMultipleScattering.cc 68035 2013-03-13 14:12:34Z gcosmo $
// $Id: G4MuMultipleScattering.cc 88678 2015-03-05 08:34:20Z gcosmo $
//
// -----------------------------------------------------------------------------
//
@@ -58,7 +58,6 @@ G4MuMultipleScattering::G4MuMultipleScattering(const G4String& pnam)
: G4VMultipleScattering(pnam)
{
isInitialized = false;
SetStepLimitType(fMinimal);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/processes/electromagnetic/muons/src/G4MuPairProductionModel.cc
+41 -40
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4MuPairProductionModel.cc 83686 2014-09-09 12:40:23Z gcosmo $
// $Id: G4MuPairProductionModel.cc 91743 2015-08-04 11:49:58Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -93,9 +93,9 @@
const G4int G4MuPairProductionModel::zdat[]={1, 4, 13, 29, 92};
const G4double G4MuPairProductionModel::adat[]={1.01, 9.01,26.98, 63.55, 238.03};
const G4double G4MuPairProductionModel::xgi[]={ 0.0199, 0.1017, 0.2372, 0.4083,
0.5917, 0.7628, 0.8983, 0.9801 };
0.5917, 0.7628, 0.8983, 0.9801 };
const G4double G4MuPairProductionModel::wgi[]={ 0.0506, 0.1112, 0.1569, 0.1813,
0.1813, 0.1569, 0.1112, 0.0506 };
0.1813, 0.1569, 0.1112, 0.0506 };
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -144,7 +144,7 @@ G4MuPairProductionModel::~G4MuPairProductionModel()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuPairProductionModel::MinPrimaryEnergy(const G4Material*,
const G4ParticleDefinition*,
const G4ParticleDefinition*,
G4double cut)
{
return std::max(lowestKinEnergy,cut);
@@ -185,7 +185,7 @@ void G4MuPairProductionModel::Initialise(const G4ParticleDefinition* p,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
void G4MuPairProductionModel::InitialiseLocal(const G4ParticleDefinition* p,
G4VEmModel* masterModel)
G4VEmModel* masterModel)
{
if(p == particle && lowestKinEnergy < HighEnergyLimit()) {
SetElementSelectors(masterModel->GetElementSelectors());
@@ -196,7 +196,7 @@ void G4MuPairProductionModel::InitialiseLocal(const G4ParticleDefinition* p,
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuPairProductionModel::ComputeDEDXPerVolume(
const G4Material* material,
const G4Material* material,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy)
@@ -223,9 +223,9 @@ G4double G4MuPairProductionModel::ComputeDEDXPerVolume(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4double G4MuPairProductionModel::ComputMuPairLoss(G4double Z,
G4double tkin,
G4double cutEnergy,
G4double tmax)
G4double tkin,
G4double cutEnergy,
G4double tmax)
{
G4double loss = 0.0;
@@ -417,7 +417,7 @@ G4double G4MuPairProductionModel::ComputeDMicroscopicCrossSection(
G4double G4MuPairProductionModel::ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double Z, G4double,
G4double Z, G4double,
G4double cutEnergy,
G4double maxEnergy)
{
@@ -454,9 +454,9 @@ void G4MuPairProductionModel::MakeSamplingTables()
G4double maxPairEnergy = MaxSecondaryEnergyForElement(kinEnergy, Z);
/*
G4cout << "it= " << it << " E= " << kinEnergy
<< " " << particle->GetParticleName()
<< " maxE= " << maxPairEnergy << " minE= " << minPairEnergy
<< " ymin= " << ymin << G4endl;
<< " " << particle->GetParticleName()
<< " maxE= " << maxPairEnergy << " minE= " << minPairEnergy
<< " ymin= " << ymin << G4endl;
*/
G4double coef = G4Log(minPairEnergy/kinEnergy)/ymin;
G4double ymax = G4Log(maxPairEnergy/kinEnergy)/coef;
@@ -468,8 +468,8 @@ void G4MuPairProductionModel::MakeSamplingTables()
G4double x = ymin;
/*
G4cout << "Z= " << currentZ << " z13= " << z13
<< " mE= " << maxPairEnergy << " ymin= " << ymin
<< " dy= " << dy << " c= " << coef << G4endl;
<< " mE= " << maxPairEnergy << " ymin= " << ymin
<< " dy= " << dy << " c= " << coef << G4endl;
*/
// start from zero
pv->PutValue(0, it, 0.0);
@@ -477,23 +477,23 @@ void G4MuPairProductionModel::MakeSamplingTables()
for (size_t i=0; i<nbiny; ++i) {
if(0 == it) { pv->PutX(i, x); }
if(0 == it) { pv->PutX(i, x); }
if(i < imax) {
G4double ep = kinEnergy*G4Exp(coef*(x + dy*0.5));
if(i < imax) {
G4double ep = kinEnergy*G4Exp(coef*(x + dy*0.5));
// not multiplied by interval, because table
// not multiplied by interval, because table
// will be used only for sampling
//G4cout << "i= " << i << " x= " << x << "E= " << kinEnergy
// << " Egamma= " << ep << G4endl;
xSec += ep*ComputeDMicroscopicCrossSection(kinEnergy, Z, ep);
//G4cout << "i= " << i << " x= " << x << "E= " << kinEnergy
// << " Egamma= " << ep << G4endl;
xSec += ep*ComputeDMicroscopicCrossSection(kinEnergy, Z, ep);
// last bin before the kinematic limit
} else if(i == imax) {
G4double ep = kinEnergy*G4Exp(coef*(x + fac*dy*0.5));
xSec += ep*fac*ComputeDMicroscopicCrossSection(kinEnergy, Z, ep);
}
pv->PutValue(i + 1, it, xSec);
// last bin before the kinematic limit
} else if(i == imax) {
G4double ep = kinEnergy*G4Exp(coef*(x + fac*dy*0.5));
xSec += ep*fac*ComputeDMicroscopicCrossSection(kinEnergy, Z, ep);
}
pv->PutValue(i + 1, it, xSec);
x += dy;
}
kinEnergy *= factore;
@@ -509,15 +509,15 @@ void G4MuPairProductionModel::MakeSamplingTables()
void G4MuPairProductionModel::SampleSecondaries(
std::vector<G4DynamicParticle*>* vdp,
const G4MaterialCutsCouple* couple,
const G4DynamicParticle* aDynamicParticle,
G4double tmin,
G4double tmax)
const G4MaterialCutsCouple* couple,
const G4DynamicParticle* aDynamicParticle,
G4double tmin,
G4double tmax)
{
G4double kineticEnergy = aDynamicParticle->GetKineticEnergy();
//G4cout << "------- G4MuPairProductionModel::SampleSecondaries E(MeV)= "
// << kineticEnergy << " "
// << aDynamicParticle->GetDefinition()->GetParticleName() << G4endl;
// << kineticEnergy << " "
// << aDynamicParticle->GetDefinition()->GetParticleName() << G4endl;
G4double totalEnergy = kineticEnergy + particleMass;
G4double totalMomentum =
sqrt(kineticEnergy*(kineticEnergy + 2.0*particleMass));
@@ -529,7 +529,7 @@ void G4MuPairProductionModel::SampleSecondaries(
// define interval of energy transfer
G4double maxPairEnergy = MaxSecondaryEnergyForElement(kineticEnergy,
anElement->GetZ());
anElement->GetZ());
G4double maxEnergy = std::min(tmax, maxPairEnergy);
G4double minEnergy = std::max(tmin, minPairEnergy);
@@ -580,16 +580,17 @@ void G4MuPairProductionModel::SampleSecondaries(
G4double lz1= nist->GetLOGZ(iz1);
G4double lz2= nist->GetLOGZ(iz2);
//G4cout << count << ". x= " << x << " x2= " << x2
// << " Z1= " << iz1 << " Z2= " << iz2 << G4endl;
// << " Z1= " << iz1 << " Z2= " << iz2 << G4endl;
x += (x2 - x)*(lnZ - lz1)/(lz2 - lz1);
}
//G4cout << "x= " << x << " coeff= " << coeff << G4endl;
PairEnergy = kineticEnergy*G4Exp(x*coeff);
// Loop checking, 03-Aug-2015, Vladimir Ivanchenko
} while((PairEnergy < minEnergy || PairEnergy > maxEnergy) && 10 > count);
//G4cout << "## PairEnergy(GeV)= " << PairEnergy/GeV
// << " Etot(GeV)= " << totalEnergy/GeV << G4endl;
// << " Etot(GeV)= " << totalEnergy/GeV << G4endl;
// sample r=(E+-E-)/PairEnergy ( uniformly .....)
G4double rmax =
@@ -622,12 +623,12 @@ void G4MuPairProductionModel::SampleSecondaries(
// create G4DynamicParticle object for the particle1
G4DynamicParticle* aParticle1 =
new G4DynamicParticle(theElectron, gDirection,
ElectronEnergy - electron_mass_c2);
ElectronEnergy - electron_mass_c2);
// create G4DynamicParticle object for the particle2
G4DynamicParticle* aParticle2 =
new G4DynamicParticle(thePositron, gDirection,
PositronEnergy - electron_mass_c2);
PositronEnergy - electron_mass_c2);
// primary change
kineticEnergy -= (ElectronEnergy + PositronEnergy);
@@ -654,7 +655,7 @@ void G4MuPairProductionModel::DataCorrupted(G4int Z, G4double logTkin)
<< " IsMasterThread= " << IsMaster()
<< " Model " << GetName();
G4Exception("G4MuPairProductionModel::()","em0033",FatalException,
ed,"");
ed,"");
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......