Import Geant4 11.0.0.beta source tree
This commit is contained in:
@@ -58,25 +58,13 @@
|
||||
|
||||
G4VMscModel::G4VMscModel(const G4String& nam):
|
||||
G4VEmModel(nam),
|
||||
safetyHelper(nullptr),
|
||||
ionisation(nullptr),
|
||||
facrange(0.04),
|
||||
facgeom(2.5),
|
||||
facsafety(0.6),
|
||||
skin(1.0),
|
||||
dtrl(0.05),
|
||||
lambdalimit(1.*CLHEP::mm),
|
||||
geomMin(1.e-6*CLHEP::mm),
|
||||
geomMax(1.e50*CLHEP::mm),
|
||||
fDisplacement(0.,0.,0.),
|
||||
steppingAlgorithm(fUseSafety),
|
||||
samplez(false),
|
||||
latDisplasment(true)
|
||||
steppingAlgorithm(fUseSafety)
|
||||
{
|
||||
dedx = 2.0*CLHEP::MeV*CLHEP::cm2/CLHEP::g;
|
||||
localrange = DBL_MAX;
|
||||
localtkin = 0.0;
|
||||
currentPart = nullptr;
|
||||
dedx = 2.0*CLHEP::MeV*CLHEP::cm2/CLHEP::g;
|
||||
SetUseBaseMaterials(false);
|
||||
}
|
||||
|
||||
@@ -91,29 +79,30 @@ G4ParticleChangeForMSC*
|
||||
G4VMscModel::GetParticleChangeForMSC(const G4ParticleDefinition* p)
|
||||
{
|
||||
// recomputed for each new run
|
||||
if(!safetyHelper) {
|
||||
if(nullptr == safetyHelper) {
|
||||
safetyHelper = G4TransportationManager::GetTransportationManager()
|
||||
->GetSafetyHelper();
|
||||
safetyHelper->InitialiseHelper();
|
||||
}
|
||||
G4ParticleChangeForMSC* change = nullptr;
|
||||
if (pParticleChange) {
|
||||
if (nullptr != pParticleChange) {
|
||||
change = static_cast<G4ParticleChangeForMSC*>(pParticleChange);
|
||||
} else {
|
||||
change = new G4ParticleChangeForMSC();
|
||||
}
|
||||
if(p) {
|
||||
if(nullptr != p) {
|
||||
|
||||
// table is never built for GenericIon
|
||||
if(p->GetParticleName() == "GenericIon") {
|
||||
if(xSectionTable) {
|
||||
if(nullptr != xSectionTable) {
|
||||
xSectionTable->clearAndDestroy();
|
||||
delete xSectionTable;
|
||||
xSectionTable = nullptr;
|
||||
}
|
||||
|
||||
// table is always built for low mass particles
|
||||
} else if(p->GetPDGMass() < 4.5*GeV || ForceBuildTableFlag()) {
|
||||
} else if(p->GetPDGMass() < CLHEP::GeV || ForceBuildTableFlag()) {
|
||||
// } else if(p->GetPDGMass() < 4.5*CLHEP::GeV || ForceBuildTableFlag()) {
|
||||
|
||||
G4EmParameters* param = G4EmParameters::Instance();
|
||||
idxTable = 0;
|
||||
@@ -164,9 +153,9 @@ void G4VMscModel::DumpParameters(std::ostream& out) const
|
||||
else if (steppingAlgorithm == fMinimal) alg = "Minimal";
|
||||
else if (steppingAlgorithm == fUseSafetyPlus) alg = "SafetyPlus";
|
||||
|
||||
out << std::setw(22) << "StepLim=" << alg << " Rfact=" << facrange
|
||||
out << std::setw(18) << "StepLim=" << alg << " Rfact=" << facrange
|
||||
<< " Gfact=" << facgeom << " Sfact=" << facsafety << " DispFlag:" << latDisplasment
|
||||
<< " Skin=" << skin << " Llimit=" << lambdalimit << G4endl;
|
||||
<< " Skin=" << skin << " Llim=" << lambdalimit/CLHEP::mm << " mm" << G4endl;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Reference in New Issue
Block a user