Import Geant4 10.3.0.beta source tree
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4mplIonisationWithDeltaModel.cc 91869 2015-08-07 15:21:02Z gcosmo $
|
||||
// $Id: G4mplIonisationWithDeltaModel.cc 97391 2016-06-02 10:08:45Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
std::vector<G4double>* G4mplIonisationWithDeltaModel::dedx0 = 0;
|
||||
std::vector<G4double>* G4mplIonisationWithDeltaModel::dedx0 = nullptr;
|
||||
|
||||
G4mplIonisationWithDeltaModel::G4mplIonisationWithDeltaModel(G4double mCharge,
|
||||
const G4String& nam)
|
||||
@@ -86,11 +86,11 @@ G4mplIonisationWithDeltaModel::G4mplIonisationWithDeltaModel(G4double mCharge,
|
||||
pi_hbarc2_over_mc2 = pi * hbarc * hbarc / electron_mass_c2;
|
||||
chargeSquare = magCharge * magCharge;
|
||||
dedxlim = 45.*nmpl*nmpl*GeV*cm2/g;
|
||||
fParticleChange = 0;
|
||||
fParticleChange = nullptr;
|
||||
theElectron = G4Electron::Electron();
|
||||
G4cout << "### Monopole ionisation model with d-electron production, Gmag= "
|
||||
<< magCharge/eplus << G4endl;
|
||||
monopole = 0;
|
||||
monopole = nullptr;
|
||||
mass = 0.0;
|
||||
}
|
||||
|
||||
@@ -108,9 +108,9 @@ void G4mplIonisationWithDeltaModel::SetParticle(const G4ParticleDefinition* p)
|
||||
monopole = p;
|
||||
mass = monopole->GetPDGMass();
|
||||
G4double emin =
|
||||
std::min(LowEnergyLimit(),0.1*mass*(1/sqrt(1 - betalow*betalow) - 1));
|
||||
std::min(LowEnergyLimit(),0.1*mass*(1./sqrt(1. - betalow*betalow) - 1.));
|
||||
G4double emax =
|
||||
std::max(HighEnergyLimit(),10*mass*(1/sqrt(1 - beta2lim) - 1));
|
||||
std::max(HighEnergyLimit(),10*mass*(1./sqrt(1. - beta2lim) - 1.));
|
||||
SetLowEnergyLimit(emin);
|
||||
SetHighEnergyLimit(emax);
|
||||
}
|
||||
@@ -137,7 +137,7 @@ G4mplIonisationWithDeltaModel::Initialise(const G4ParticleDefinition* p,
|
||||
const G4Material* material =
|
||||
theCoupleTable->GetMaterialCutsCouple(i)->GetMaterial();
|
||||
G4double eDensity = material->GetElectronDensity();
|
||||
G4double vF = electron_Compton_length*pow(3*pi*pi*eDensity,0.3333333333);
|
||||
G4double vF = electron_Compton_length*pow(3.*pi*pi*eDensity,0.3333333333);
|
||||
(*dedx0)[i] = pi_hbarc2_over_mc2*eDensity*nmpl*nmpl*
|
||||
(G4Log(2*vF/fine_structure_const) - 0.5)/vF;
|
||||
}
|
||||
@@ -218,7 +218,7 @@ G4mplIonisationWithDeltaModel::ComputeDEDXAhlen(const G4Material* material,
|
||||
// now compute the total ionization loss
|
||||
dedx *= pi_hbarc2_over_mc2 * eDensity * nmpl * nmpl;
|
||||
|
||||
if (dedx < 0.0) { dedx = 0; }
|
||||
if (dedx < 0.0) { dedx = 0.; }
|
||||
return dedx;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user