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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/standard/include/G4ASTARStopping.hh
+7 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ASTARStopping.hh 91612 2015-07-29 08:51:51Z gcosmo $
// $Id: G4ASTARStopping.hh 96934 2016-05-18 09:10:41Z gcosmo $
#ifndef G4ASTARStopping_h
#define G4ASTARStopping_h 1
@@ -49,6 +49,8 @@
// Data on Stopping Powers of the He atoms from the NIST Data Base
// http://physics.nist.gov/PhysRefData/STAR/Text/ASTAR.html
//
// Current ASTAR database is available via url:
// http://physics.nist.gov/PhysRefData/Star/Text/ASTAR.html
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -61,7 +63,7 @@ class G4ASTARStopping
{
public:
G4ASTARStopping();
explicit G4ASTARStopping();
~G4ASTARStopping();
@@ -77,15 +79,15 @@ public:
private:
void AddData(const G4double* s, const G4Material*);
void AddData(const G4float* s, const G4Material*);
void FindData(G4int idx, const G4Material*);
void PrintWarning(G4int idx) const;
// hide assignment operator
G4ASTARStopping & operator=(const G4ASTARStopping &right);
G4ASTARStopping(const G4ASTARStopping&);
G4ASTARStopping & operator=(const G4ASTARStopping &right) = delete;
G4ASTARStopping(const G4ASTARStopping&) = delete;
size_t nvectors;
G4double emin;
source/processes/electromagnetic/standard/include/G4BetheBlochIonGasModel.hh
+8 -7
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BetheBlochIonGasModel.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4BetheBlochIonGasModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -57,22 +57,23 @@ class G4BetheBlochIonGasModel : public G4BetheBlochModel
public:
G4BetheBlochIonGasModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheBlochGasIon");
explicit G4BetheBlochIonGasModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheBlochGasIon");
virtual ~G4BetheBlochIonGasModel();
virtual G4double ChargeSquareRatio(const G4Track& track);
virtual G4double ChargeSquareRatio(const G4Track& track) final;
virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) final;
private:
// hide assignment operator
G4BetheBlochIonGasModel & operator=(const G4BetheBlochIonGasModel &right);
G4BetheBlochIonGasModel(const G4BetheBlochIonGasModel&);
G4BetheBlochIonGasModel & operator=
(const G4BetheBlochIonGasModel &right) = delete;
G4BetheBlochIonGasModel(const G4BetheBlochIonGasModel&) = delete;
G4double currentCharge;
};
source/processes/electromagnetic/standard/include/G4BetheBlochModel.hh
+17 -19
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BetheBlochModel.hh 93362 2015-10-19 13:45:19Z gcosmo $
// $Id: G4BetheBlochModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -74,15 +74,16 @@ class G4BetheBlochModel : public G4VEmModel
public:
G4BetheBlochModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "BetheBloch");
explicit G4BetheBlochModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "BetheBloch");
virtual ~G4BetheBlochModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double MinEnergyCut(const G4ParticleDefinition*,
const G4MaterialCutsCouple* couple);
const G4MaterialCutsCouple* couple) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
@@ -95,43 +96,43 @@ public:
G4double kineticEnergy,
G4double Z, G4double A,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) override;
virtual G4double GetChargeSquareRatio(const G4ParticleDefinition* p,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) override;
virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) override;
virtual void CorrectionsAlongStep(const G4MaterialCutsCouple* couple,
const G4DynamicParticle* dp,
G4double& eloss,
G4double&,
G4double length);
G4double length) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
protected:
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
G4double kinEnergy) override;
inline G4double GetChargeSquareRatio() const;
@@ -146,8 +147,8 @@ private:
inline void SetGenericIon(const G4ParticleDefinition* p);
// hide assignment operator
G4BetheBlochModel & operator=(const G4BetheBlochModel &right);
G4BetheBlochModel(const G4BetheBlochModel&);
G4BetheBlochModel & operator=(const G4BetheBlochModel &right) = delete;
G4BetheBlochModel(const G4BetheBlochModel&) = delete;
const G4ParticleDefinition* particle;
G4ParticleDefinition* theElectron;
@@ -163,11 +164,8 @@ private:
G4double ratio;
G4double formfact;
G4double twoln10;
G4double bg2lim;
G4double taulim;
G4double corrFactor;
G4bool isIon;
G4bool isInitialised;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -176,7 +174,7 @@ inline void G4BetheBlochModel::SetParticle(const G4ParticleDefinition* p)
{
if(particle != p) {
particle = p;
if(p->GetBaryonNumber() > 3 || p->GetPDGCharge() > 1.5*CLHEP::eplus)
if(p->GetBaryonNumber() > 3 || p->GetPDGCharge() > CLHEP::eplus)
{ isIon = true; }
SetupParameters();
}
source/processes/electromagnetic/standard/include/G4BetheHeitlerModel.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BetheHeitlerModel.hh 74581 2013-10-15 12:03:25Z gcosmo $
// $Id: G4BetheHeitlerModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -62,15 +62,16 @@ class G4BetheHeitlerModel : public G4VEmModel
public:
G4BetheHeitlerModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheHeitler");
explicit G4BetheHeitlerModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheHeitler");
virtual ~G4BetheHeitlerModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -78,13 +79,13 @@ public:
G4double Z,
G4double A=0.,
G4double cut=0.,
G4double emax=DBL_MAX);
G4double emax=DBL_MAX) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
private:
@@ -93,8 +94,8 @@ private:
G4double ScreenFunction2(G4double ScreenVariable);
// hide assignment operator
G4BetheHeitlerModel & operator=(const G4BetheHeitlerModel &right);
G4BetheHeitlerModel(const G4BetheHeitlerModel&);
G4BetheHeitlerModel & operator=(const G4BetheHeitlerModel &right) = delete;
G4BetheHeitlerModel(const G4BetheHeitlerModel&) = delete;
G4Pow* g4pow;
G4ParticleDefinition* theGamma;
source/processes/electromagnetic/standard/include/G4BohrFluctuations.hh
+11 -14
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BohrFluctuations.hh 72048 2013-07-04 12:39:58Z gcosmo $
// $Id: G4BohrFluctuations.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -60,28 +60,25 @@ class G4BohrFluctuations : public G4VEmFluctuationModel
public:
G4BohrFluctuations(const G4String& nam = "BohrFluc");
explicit G4BohrFluctuations(const G4String& nam = "BohrFluc");
virtual ~G4BohrFluctuations();
G4double SampleFluctuations(const G4MaterialCutsCouple*,
virtual G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double, G4double, G4double) override;
virtual G4double Dispersion(const G4Material*,
const G4DynamicParticle*,
G4double,
G4double,
G4double);
G4double, G4double) override;
G4double Dispersion( const G4Material*,
const G4DynamicParticle*,
G4double,
G4double);
void InitialiseMe(const G4ParticleDefinition*);
virtual void InitialiseMe(const G4ParticleDefinition*) override;
private:
// hide assignment operator
G4BohrFluctuations & operator=(const G4BohrFluctuations &right);
G4BohrFluctuations(const G4BohrFluctuations&);
G4BohrFluctuations & operator=(const G4BohrFluctuations &right) = delete;
G4BohrFluctuations(const G4BohrFluctuations&) = delete;
const G4ParticleDefinition* particle;
source/processes/electromagnetic/standard/include/G4BraggIonGasModel.hh
+7 -7
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BraggIonGasModel.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4BraggIonGasModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -59,24 +59,24 @@ class G4BraggIonGasModel : public G4BraggModel
public:
G4BraggIonGasModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BraggIonGas");
explicit G4BraggIonGasModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BraggIonGas");
virtual ~G4BraggIonGasModel();
// Access ion effective charge square ratio to unit charge
virtual G4double ChargeSquareRatio(const G4Track&);
virtual G4double ChargeSquareRatio(const G4Track&) final;
// Access ion effective charge
virtual G4double GetParticleCharge(const G4ParticleDefinition*,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) final;
private:
// hide assignment operator
G4BraggIonGasModel & operator=(const G4BraggIonGasModel &right);
G4BraggIonGasModel(const G4BraggIonGasModel&);
G4BraggIonGasModel & operator=(const G4BraggIonGasModel &right) = delete;
G4BraggIonGasModel(const G4BraggIonGasModel&) = delete;
G4double currentCharge;
};
source/processes/electromagnetic/standard/include/G4BraggIonModel.hh
+16 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BraggIonModel.hh 93362 2015-10-19 13:45:19Z gcosmo $
// $Id: G4BraggIonModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -70,15 +70,16 @@ class G4BraggIonModel : public G4VEmModel
public:
G4BraggIonModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "BraggIon");
explicit G4BraggIonModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "BraggIon");
virtual ~G4BraggIonModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double MinEnergyCut(const G4ParticleDefinition*,
const G4MaterialCutsCouple* couple);
const G4MaterialCutsCouple* couple) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
@@ -91,45 +92,45 @@ public:
G4double kineticEnergy,
G4double Z, G4double A,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
// Compute ion charge
virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
const G4Material*,
G4double kineticEnergy);
G4double kineticEnergy) override;
virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) override;
// add correction to energy loss and ompute non-ionizing energy loss
virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double& eloss,
G4double& niel,
G4double length);
G4double length) override;
protected:
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
G4double kinEnergy) final;
private:
@@ -138,8 +139,8 @@ private:
G4double HeEffChargeSquare(G4double z, G4double kinEnergyInMeV) const;
// hide assignment operator
G4BraggIonModel & operator=(const G4BraggIonModel &right);
G4BraggIonModel(const G4BraggIonModel&);
G4BraggIonModel & operator=(const G4BraggIonModel &right) = delete;
G4BraggIonModel(const G4BraggIonModel&) = delete;
G4bool HasMaterial(const G4Material* material);
@@ -176,7 +177,6 @@ private:
G4int iMolecula; // index in the molecula's table
G4int iASTAR; // index in ASTAR
G4bool isIon;
G4bool isInitialised;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/processes/electromagnetic/standard/include/G4BraggModel.hh
+14 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4BraggModel.hh 93362 2015-10-19 13:45:19Z gcosmo $
// $Id: G4BraggModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -73,12 +73,13 @@ class G4BraggModel : public G4VEmModel
public:
G4BraggModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "Bragg");
explicit G4BraggModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "Bragg");
virtual ~G4BraggModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
@@ -91,38 +92,38 @@ public:
G4double kineticEnergy,
G4double Z, G4double A,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
// Compute ion charge
virtual G4double GetChargeSquareRatio(const G4ParticleDefinition*,
const G4Material*,
G4double kineticEnergy);
G4double kineticEnergy) override;
virtual G4double GetParticleCharge(const G4ParticleDefinition* p,
const G4Material* mat,
G4double kineticEnergy);
G4double kineticEnergy) override;
protected:
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
G4double kinEnergy) final;
inline G4double GetChargeSquareRatio() const;
@@ -146,11 +147,9 @@ private:
G4double ChemicalFactor(G4double kineticEnergy, G4double eloss125) const;
void SetExpStopPower125(G4double value) {expStopPower125 = value;};
// hide assignment operator
G4BraggModel & operator=(const G4BraggModel &right);
G4BraggModel(const G4BraggModel&);
G4BraggModel & operator=(const G4BraggModel &right) = delete;
G4BraggModel(const G4BraggModel&) = delete;
G4EmCorrections* corr;
@@ -174,7 +173,6 @@ private:
G4int iMolecula; // index in the molecula's table
G4int iPSTAR; // index in PSTAR
G4bool isIon;
G4bool isInitialised;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
+9 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ComptonScattering.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4ComptonScattering.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//------------------ G4ComptonScattering physics process -----------------------
// by Michel Maire, April 1996
@@ -73,23 +73,26 @@ class G4ComptonScattering : public G4VEmProcess
{
public: // with description
G4ComptonScattering(const G4String& processName ="compt",
G4ProcessType type = fElectromagnetic);
explicit G4ComptonScattering(const G4String& processName ="compt",
G4ProcessType type = fElectromagnetic);
virtual ~G4ComptonScattering();
// true for Gamma only.
virtual G4bool IsApplicable(const G4ParticleDefinition&);
virtual G4bool IsApplicable(const G4ParticleDefinition&) final;
// Print few lines of informations about the process: validity range,
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
private:
G4ComptonScattering & operator=(const G4ComptonScattering &right) = delete;
G4ComptonScattering(const G4ComptonScattering&) = delete;
G4bool isInitialised;
};
source/processes/electromagnetic/standard/include/G4CoulombScattering.hh
+8 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CoulombScattering.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4CoulombScattering.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -57,27 +57,27 @@ class G4CoulombScattering : public G4VEmProcess
public:
G4CoulombScattering(const G4String& name = "CoulombScat");
explicit G4CoulombScattering(const G4String& name = "CoulombScat");
virtual ~G4CoulombScattering();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*,
const G4Material*);
const G4Material*) final;
private:
// hide assignment operator
G4CoulombScattering & operator=(const G4CoulombScattering &right);
G4CoulombScattering(const G4CoulombScattering&);
G4CoulombScattering & operator=(const G4CoulombScattering &right) = delete;
G4CoulombScattering(const G4CoulombScattering&) = delete;
G4double q2Max;
G4bool isInitialised;
source/processes/electromagnetic/standard/include/G4DeltaAngle.hh
+7 -8
View File
@@ -59,28 +59,27 @@ class G4DeltaAngle : public G4VEmAngularDistribution
public:
G4DeltaAngle(const G4String& name = "");
explicit G4DeltaAngle(const G4String& name = "");
virtual ~G4DeltaAngle();
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
G4double kinEnergyFinal,
G4int Z,
const G4Material* mat = 0);
G4double kinEnergyFinal, G4int Z,
const G4Material* mat = nullptr) final;
virtual G4ThreeVector& SampleDirectionForShell(
const G4DynamicParticle* dp,
G4double kinEnergyFinal,
G4int Z, G4int shellIdx,
const G4Material* mat = 0);
const G4Material* mat = nullptr) final;
void PrintGeneratorInformation() const;
virtual void PrintGeneratorInformation() const final;
private:
// hide assignment operator
G4DeltaAngle & operator=(const G4DeltaAngle &right);
G4DeltaAngle(const G4DeltaAngle&);
G4DeltaAngle & operator=(const G4DeltaAngle &right) = delete;
G4DeltaAngle(const G4DeltaAngle&) = delete;
const G4ParticleDefinition* fElectron;
std::vector<G4double> prob;
source/processes/electromagnetic/standard/include/G4DeltaAngleFreeScat.hh
+5 -5
View File
@@ -56,22 +56,22 @@ class G4DeltaAngleFreeScat : public G4VEmAngularDistribution
public:
G4DeltaAngleFreeScat(const G4String& name = "");
explicit G4DeltaAngleFreeScat(const G4String& name = "");
virtual ~G4DeltaAngleFreeScat();
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
G4double kinEnergyFinal,
G4int Z,
const G4Material* mat = 0);
const G4Material* mat = nullptr) final;
void PrintGeneratorInformation() const;
virtual void PrintGeneratorInformation() const final;
private:
// hide assignment operator
G4DeltaAngleFreeScat & operator=(const G4DeltaAngleFreeScat &right);
G4DeltaAngleFreeScat(const G4DeltaAngleFreeScat&);
G4DeltaAngleFreeScat & operator=(const G4DeltaAngleFreeScat &right) = delete;
G4DeltaAngleFreeScat(const G4DeltaAngleFreeScat&) = delete;
};
source/processes/electromagnetic/standard/include/G4DipBustGenerator.hh
+7 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4DipBustGenerator.hh 74581 2013-10-15 12:03:25Z gcosmo $
// $Id: G4DipBustGenerator.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -57,26 +57,25 @@ class G4DipBustGenerator : public G4VEmAngularDistribution
public:
G4DipBustGenerator(const G4String& name = "");
explicit G4DipBustGenerator(const G4String& name = "");
virtual ~G4DipBustGenerator();
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
G4double out_energy,
G4int Z,
const G4Material* mat = 0);
G4double out_energy, G4int Z,
const G4Material* mat = nullptr) final;
G4double PolarAngle(const G4double initial_energy,
const G4double final_energy,
const G4int Z);
void PrintGeneratorInformation() const;
virtual void PrintGeneratorInformation() const final;
private:
// hide assignment operator
G4DipBustGenerator & operator=(const G4DipBustGenerator &right);
G4DipBustGenerator(const G4DipBustGenerator&);
G4DipBustGenerator & operator=(const G4DipBustGenerator &right) = delete;
G4DipBustGenerator(const G4DipBustGenerator&) = delete;
};
source/processes/electromagnetic/standard/include/G4ESTARStopping.hh
+3 -3
View File
@@ -63,7 +63,7 @@ class G4ESTARStopping
{
public:
G4ESTARStopping(const G4String& datatype = "");
explicit G4ESTARStopping(const G4String& datatype = "");
~G4ESTARStopping();
@@ -80,8 +80,8 @@ private:
void AddData(const G4double* e, const G4double* s, G4int idx);
// hide assignment operator
G4ESTARStopping & operator=(const G4ESTARStopping &right);
G4ESTARStopping(const G4ESTARStopping&);
G4ESTARStopping & operator=(const G4ESTARStopping &right) = delete;
G4ESTARStopping(const G4ESTARStopping&) = delete;
char* dirPath;
source/processes/electromagnetic/standard/include/G4GammaConversion.hh
+10 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4GammaConversion.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4GammaConversion.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//
//------------------ G4GammaConversion physics process------------------------
@@ -77,26 +77,29 @@ class G4GammaConversion : public G4VEmProcess
{
public: // with description
G4GammaConversion(const G4String& processName ="conv",
G4ProcessType type = fElectromagnetic);
explicit G4GammaConversion(const G4String& processName ="conv",
G4ProcessType type = fElectromagnetic);
virtual ~G4GammaConversion();
// true for Gamma only.
virtual G4bool IsApplicable(const G4ParticleDefinition&);
virtual G4bool IsApplicable(const G4ParticleDefinition&) final;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*,
const G4Material*);
const G4Material*) override;
// Print few lines of informations about the process: validity range,
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
private:
G4GammaConversion & operator=(const G4GammaConversion &right) = delete;
G4GammaConversion(const G4GammaConversion&) = delete;
G4bool isInitialised;
};
source/processes/electromagnetic/standard/include/G4GoudsmitSaundersonMscModel.hh
+5 -3
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4GoudsmitSaundersonMscModel.hh 93663 2015-10-28 09:50:49Z gcosmo $
// $Id: G4GoudsmitSaundersonMscModel.hh 94933 2015-12-18 09:22:52Z gcosmo $
//
// ----------------------------------------------------------------------------
//
@@ -158,7 +158,7 @@ private:
G4double currentRange;
G4double fr,rangeinit,geombig,geomlimit;
G4double lambdalimit,tlimit;
G4double lambdalimit,tlimit,tgeom;
G4int charge,currentMaterialIndex;
G4bool firstStep;
@@ -196,9 +196,11 @@ private:
G4bool fIsEverythingWasDone;
G4bool fIsNoScatteringInMSC;
G4bool fIsNoDisplace;
G4bool fIsInsideSkin;
G4bool fIsWasOnBoundary;
G4bool fIsFirstRealStep;
//
static G4bool fgIsUseAccurate;
static G4bool fgIsCorrectRestriction;
static G4bool fgIsOptimizationOn;
};
source/processes/electromagnetic/standard/include/G4HeatedKleinNishinaCompton.hh
+7 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4HeatedKleinNishinaCompton.hh 82754 2014-07-08 14:06:13Z gcosmo $
// $Id: G4HeatedKleinNishinaCompton.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -59,8 +59,8 @@ class G4HeatedKleinNishinaCompton : public G4KleinNishinaCompton
public:
G4HeatedKleinNishinaCompton(const G4ParticleDefinition* p = 0,
const G4String& nam = "Heated-Klein-Nishina");
explicit G4HeatedKleinNishinaCompton(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "Heated-Klein-Nishina");
virtual ~G4HeatedKleinNishinaCompton();
@@ -68,7 +68,7 @@ public:
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) final;
inline void SetElectronTemperature(G4double t){ fTemperature = t; };
inline G4double GetElectronTemperature() { return fTemperature; };
@@ -76,8 +76,9 @@ public:
private:
// hide assignment operator
G4HeatedKleinNishinaCompton & operator=(const G4HeatedKleinNishinaCompton &right);
G4HeatedKleinNishinaCompton(const G4HeatedKleinNishinaCompton&);
G4HeatedKleinNishinaCompton & operator=
(const G4HeatedKleinNishinaCompton &right) = delete;
G4HeatedKleinNishinaCompton(const G4HeatedKleinNishinaCompton&) = delete;
G4double fTemperature; // electron temperature in energy units
source/processes/electromagnetic/standard/include/G4ICRU49NuclearStoppingModel.hh
+9 -12
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ICRU49NuclearStoppingModel.hh 67990 2013-03-13 10:56:28Z gcosmo $
// $Id: G4ICRU49NuclearStoppingModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -64,43 +64,40 @@ class G4ICRU49NuclearStoppingModel : public G4VEmModel
public:
G4ICRU49NuclearStoppingModel(const G4String& nam = "ICRU49NucStopping");
explicit G4ICRU49NuclearStoppingModel(const G4String& nam =
"ICRU49NucStopping");
virtual ~G4ICRU49NuclearStoppingModel();
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&);
const G4DataVector&) final;
// main method to compute dEdx
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy = DBL_MAX);
G4double cutEnergy = DBL_MAX) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double, G4double);
G4double, G4double) final;
inline void SetFluctuationFlag(G4bool);
private:
void InitialiseNuclearStopping();
G4double NuclearStoppingPower(G4double kineticEnergy,
G4double Z1, G4double Z2,
G4double A1, G4double A2);
// hide assignment operator
G4ICRU49NuclearStoppingModel & operator=(const G4ICRU49NuclearStoppingModel &right);
G4ICRU49NuclearStoppingModel(const G4ICRU49NuclearStoppingModel&);
G4ICRU49NuclearStoppingModel & operator=
(const G4ICRU49NuclearStoppingModel &right) = delete;
G4ICRU49NuclearStoppingModel(const G4ICRU49NuclearStoppingModel&) = delete;
G4Pow* g4pow;
static G4double ed[104];
static G4double ad[104];
G4double theZieglerFactor;
// flags
source/processes/electromagnetic/standard/include/G4ICRU73QOModel.hh
+17 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ICRU73QOModel.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4ICRU73QOModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -73,67 +73,68 @@ class G4ICRU73QOModel : public G4VEmModel
public:
G4ICRU73QOModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "ICRU73QO");
explicit G4ICRU73QOModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "ICRU73QO");
virtual ~G4ICRU73QOModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) final;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double Z, G4double A,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double);
G4double) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
// add correction to energy loss and compute non-ionizing energy loss
virtual void CorrectionsAlongStep(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double& eloss,
G4double& niel,
G4double length);
G4double length) override;
protected:
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
G4double kinEnergy) final;
private:
inline void SetParticle(const G4ParticleDefinition* p);
inline void SetLowestKinEnergy(const G4double val);
inline void SetLowestKinEnergy(G4double val);
G4double DEDX(const G4Material* material, G4double kineticEnergy);
G4double DEDXPerElement(G4int Z, G4double kineticEnergy);
// hide assignment operator
G4ICRU73QOModel & operator=(const G4ICRU73QOModel &right);
G4ICRU73QOModel(const G4ICRU73QOModel&);
G4ICRU73QOModel & operator=(const G4ICRU73QOModel &right) = delete;
G4ICRU73QOModel(const G4ICRU73QOModel&) = delete;
const G4ParticleDefinition* particle;
G4ParticleDefinition* theElectron;
@@ -248,7 +249,7 @@ G4ICRU73QOModel::GetShellStrength(G4int Z, G4int nbOfTheShell) const
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline void G4ICRU73QOModel::SetLowestKinEnergy(const G4double val)
inline void G4ICRU73QOModel::SetLowestKinEnergy(G4double val)
{
lowestKinEnergy = val;
}
source/processes/electromagnetic/standard/include/G4InitXscPAI.hh
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4InitXscPAI.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4InitXscPAI.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//
// G4InitXscPAI.hh -- header file
@@ -49,7 +49,7 @@ class G4InitXscPAI
{
public:
// Constructors
G4InitXscPAI( const G4MaterialCutsCouple* matCC);
explicit G4InitXscPAI( const G4MaterialCutsCouple* matCC);
virtual ~G4InitXscPAI() ;
@@ -121,8 +121,8 @@ protected :
private :
G4InitXscPAI & operator=(const G4InitXscPAI &right);
G4InitXscPAI(const G4InitXscPAI&);
G4InitXscPAI & operator=(const G4InitXscPAI &right) = delete;
G4InitXscPAI(const G4InitXscPAI&) = delete;
// Local class constants
source/processes/electromagnetic/standard/include/G4IonCoulombCrossSection.hh
+5 -4
View File
@@ -70,7 +70,7 @@ class G4IonCoulombCrossSection
{
public:
G4IonCoulombCrossSection();
explicit G4IonCoulombCrossSection();
virtual ~G4IonCoulombCrossSection();
@@ -92,8 +92,9 @@ private:
void SetScreenRSquare(G4int iz);
G4IonCoulombCrossSection & operator=(const G4IonCoulombCrossSection &right);
G4IonCoulombCrossSection(const G4IonCoulombCrossSection&);
G4IonCoulombCrossSection & operator=
(const G4IonCoulombCrossSection &right) = delete;
G4IonCoulombCrossSection(const G4IonCoulombCrossSection&) = delete;
const G4ParticleDefinition* theProton;
@@ -149,7 +150,7 @@ void G4IonCoulombCrossSection::SetupParticle(const G4ParticleDefinition* p)
mass = particle->GetPDGMass();
spin = particle->GetPDGSpin();
if(0.0 != spin) { spin = 0.5; }
G4double q = std::fabs(particle->GetPDGCharge()/CLHEP::eplus);
G4double q = particle->GetPDGCharge()/CLHEP::eplus;
chargeSquare = q*q;
tkin = 0.0;
}
source/processes/electromagnetic/standard/include/G4IonCoulombScatteringModel.hh
+9 -6
View File
@@ -72,11 +72,13 @@ class G4IonCoulombScatteringModel : public G4VEmModel
{
public:
G4IonCoulombScatteringModel(const G4String& nam = "IonCoulombScattering");
explicit G4IonCoulombScatteringModel(const G4String& nam =
"IonCoulombScattering");
virtual ~G4IonCoulombScatteringModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) final;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -84,13 +86,13 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) final;
@@ -109,8 +111,9 @@ private:
inline void SetupParticle(const G4ParticleDefinition*);
// hide assignment operator
G4IonCoulombScatteringModel & operator=(const G4IonCoulombScatteringModel &right);
G4IonCoulombScatteringModel(const G4IonCoulombScatteringModel&);
G4IonCoulombScatteringModel & operator=
(const G4IonCoulombScatteringModel &right) = delete;
G4IonCoulombScatteringModel(const G4IonCoulombScatteringModel&) = delete;
//protected:
source/processes/electromagnetic/standard/include/G4IonFluctuations.hh
+16 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4IonFluctuations.hh 73339 2013-08-26 06:54:49Z gcosmo $
// $Id: G4IonFluctuations.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -63,28 +63,29 @@ class G4IonFluctuations : public G4VEmFluctuationModel
public:
G4IonFluctuations(const G4String& nam = "IonFluc");
explicit G4IonFluctuations(const G4String& nam = "IonFluc");
virtual ~G4IonFluctuations();
// Sample fluctuations
G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmax,
G4double length,
G4double meanLoss);
virtual G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmax,
G4double length,
G4double meanLoss) override;
// Compute dispertion
G4double Dispersion(const G4Material*,
const G4DynamicParticle*,
G4double tmax,
G4double length);
virtual G4double Dispersion(const G4Material*,
const G4DynamicParticle*,
G4double tmax,
G4double length) override;
// Initialisation prerun
void InitialiseMe(const G4ParticleDefinition*);
virtual void InitialiseMe(const G4ParticleDefinition*) override;
// Initialisation prestep
void SetParticleAndCharge(const G4ParticleDefinition*, G4double q2);
virtual void SetParticleAndCharge(const G4ParticleDefinition*,
G4double q2) override;
private:
@@ -92,8 +93,8 @@ private:
G4double RelativisticFactor(const G4Material*, G4double Zeff);
// hide assignment operator
G4IonFluctuations & operator=(const G4IonFluctuations &right);
G4IonFluctuations(const G4IonFluctuations&);
G4IonFluctuations & operator=(const G4IonFluctuations &right) = delete;
G4IonFluctuations(const G4IonFluctuations&) = delete;
G4UniversalFluctuation uniFluct;
const G4ParticleDefinition* particle;
@@ -107,7 +108,6 @@ private:
// data members to speed up the fluctuation calculation
G4double parameter;
G4double minNumberInteractionsBohr;
G4double theBohrBeta2;
G4double minFraction;
G4double xmin;
source/processes/electromagnetic/standard/include/G4KleinNishinaCompton.hh
+11 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4KleinNishinaCompton.hh 93362 2015-10-19 13:45:19Z gcosmo $
// $Id: G4KleinNishinaCompton.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -60,15 +60,16 @@ class G4KleinNishinaCompton : public G4VEmModel
public:
G4KleinNishinaCompton(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "Klein-Nishina");
explicit G4KleinNishinaCompton(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "Klein-Nishina");
virtual ~G4KleinNishinaCompton();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -76,13 +77,13 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
protected:
@@ -94,8 +95,9 @@ protected:
private:
// hide assignment operator
G4KleinNishinaCompton & operator=(const G4KleinNishinaCompton &right);
G4KleinNishinaCompton(const G4KleinNishinaCompton&);
G4KleinNishinaCompton & operator=
(const G4KleinNishinaCompton &right) = delete;
G4KleinNishinaCompton(const G4KleinNishinaCompton&) = delete;
};
source/processes/electromagnetic/standard/include/G4KleinNishinaModel.hh
+9 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4KleinNishinaModel.hh 82754 2014-07-08 14:06:13Z gcosmo $
// $Id: G4KleinNishinaModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -61,14 +61,15 @@ class G4KleinNishinaModel : public G4VEmModel
public:
G4KleinNishinaModel(const G4String& nam = "KleinNishina");
explicit G4KleinNishinaModel(const G4String& nam = "KleinNishina");
virtual ~G4KleinNishinaModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -76,13 +77,13 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
protected:
@@ -94,8 +95,8 @@ protected:
private:
// hide assignment operator
G4KleinNishinaModel & operator=(const G4KleinNishinaModel &right);
G4KleinNishinaModel(const G4KleinNishinaModel&);
G4KleinNishinaModel & operator=(const G4KleinNishinaModel &right) = delete;
G4KleinNishinaModel(const G4KleinNishinaModel&) = delete;
G4LorentzVector lv1, lv2;
G4ThreeVector bst;
source/processes/electromagnetic/standard/include/G4ModifiedTsai.hh
+7 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ModifiedTsai.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4ModifiedTsai.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -65,22 +65,21 @@ class G4ModifiedTsai : public G4VEmAngularDistribution
public:
G4ModifiedTsai(const G4String& name = "");
explicit G4ModifiedTsai(const G4String& name = "");
virtual ~G4ModifiedTsai();
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
G4double out_energy,
G4int Z,
const G4Material* mat = 0);
G4double out_energy, G4int Z,
const G4Material* mat = nullptr) final;
void PrintGeneratorInformation() const;
virtual void PrintGeneratorInformation() const final;
private:
// hide assignment operator
G4ModifiedTsai & operator=(const G4ModifiedTsai &right);
G4ModifiedTsai(const G4ModifiedTsai&);
G4ModifiedTsai & operator=(const G4ModifiedTsai &right) = delete;
G4ModifiedTsai(const G4ModifiedTsai&) = delete;
};
source/processes/electromagnetic/standard/include/G4MollerBhabhaModel.hh
+13 -12
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4MollerBhabhaModel.hh 93362 2015-10-19 13:45:19Z gcosmo $
// $Id: G4MollerBhabhaModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -65,12 +65,13 @@ class G4MollerBhabhaModel : public G4VEmModel
public:
G4MollerBhabhaModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "MollerBhabha");
explicit G4MollerBhabhaModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "MollerBhabha");
virtual ~G4MollerBhabhaModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
@@ -83,31 +84,31 @@ public:
G4double kineticEnergy,
G4double Z, G4double A,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
protected:
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
G4double kinEnergy) final;
inline void SetParticle(const G4ParticleDefinition* p);
inline void SetParticle(const G4ParticleDefinition* p);
const G4ParticleDefinition* particle;
G4ParticleDefinition* theElectron;
@@ -120,8 +121,8 @@ protected:
private:
// hide assignment operator
G4MollerBhabhaModel & operator=(const G4MollerBhabhaModel &right);
G4MollerBhabhaModel(const G4MollerBhabhaModel&);
G4MollerBhabhaModel & operator=(const G4MollerBhabhaModel &right) = delete;
G4MollerBhabhaModel(const G4MollerBhabhaModel&) = delete;
G4bool isInitialised;
source/processes/electromagnetic/standard/include/G4MottCoefficients.hh
+3 -3
View File
@@ -69,7 +69,7 @@ class G4MottCoefficients
public:
G4MottCoefficients();
explicit G4MottCoefficients();
virtual ~G4MottCoefficients();
@@ -77,8 +77,8 @@ public:
private:
G4MottCoefficients & operator=(const G4MottCoefficients &right);
G4MottCoefficients(const G4MottCoefficients&);
G4MottCoefficients & operator=(const G4MottCoefficients &right) = delete;
G4MottCoefficients(const G4MottCoefficients&) = delete;
};
source/processes/electromagnetic/standard/include/G4NISTStoppingData.hh
+21
View File
@@ -86,6 +86,27 @@ static const G4int molecularIndex[numberOfMolecula] = {
static const G4double fac = CLHEP::MeV*CLHEP::cm2/CLHEP::g;
static const G4double mvx = CLHEP::MeV;
static const G4double T0[78] = {
0.001*mvx, 0.0015*mvx, 0.002*mvx, 0.0025*mvx, 0.003*mvx,
0.004*mvx, 0.005*mvx, 0.006*mvx, 0.007*mvx, 0.008*mvx,
0.009*mvx, 0.01*mvx, 0.0125*mvx,0.015*mvx, 0.0175*mvx,
0.02*mvx, 0.0225*mvx, 0.025*mvx, 0.0275*mvx, 0.03*mvx,
0.035*mvx, 0.04*mvx, 0.045*mvx, 0.05*mvx, 0.055*mvx,
0.06*mvx, 0.065*mvx, 0.07*mvx, 0.075*mvx, 0.08*mvx,
0.085*mvx, 0.09*mvx, 0.095*mvx, 0.1*mvx, 0.125*mvx,
0.15*mvx, 0.175*mvx, 0.2*mvx, 0.225*mvx, 0.25*mvx,
0.275*mvx, 0.3*mvx, 0.35*mvx, 0.4*mvx, 0.45*mvx,
0.5*mvx, 0.55*mvx, 0.6*mvx, 0.65*mvx, 0.7*mvx,
0.75*mvx, 0.8*mvx, 0.85*mvx, 0.9*mvx, 0.95*mvx,
1.*mvx, 1.25*mvx, 1.5*mvx, 1.75*mvx, 2.*mvx,
2.25*mvx, 2.5*mvx, 2.75*mvx, 3.*mvx, 3.5*mvx,
4.*mvx, 4.5*mvx, 5.*mvx, 5.5*mvx, 6.*mvx,
6.5*mvx, 7.*mvx, 7.5*mvx, 8.*mvx, 8.5*mvx,
9.*mvx, 9.5*mvx, 10.*mvx };
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/processes/electromagnetic/standard/include/G4NuclearStopping.hh
+9 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4NuclearStopping.hh 78837 2014-01-28 08:44:36Z gcosmo $
// $Id: G4NuclearStopping.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -----------------------------------------------------------------------------
//
@@ -68,37 +68,37 @@ class G4NuclearStopping : public G4VEmProcess
public: // with description
G4NuclearStopping(const G4String& processName="nuclearStopping");
explicit G4NuclearStopping(const G4String& processName="nuclearStopping");
virtual ~G4NuclearStopping();
// returns true for charged particles, false otherwise
G4bool IsApplicable (const G4ParticleDefinition& p);
G4bool IsApplicable (const G4ParticleDefinition& p) final;
// implementation of pure virtual method
G4double AlongStepGetPhysicalInteractionLength(const G4Track& track,
G4double previousStepSize,
G4double currentMinimumStep,
G4double& proposedSafety,
G4GPILSelection* selection);
G4GPILSelection* selection) final;
// implementation of energy loss along step
G4VParticleChange* AlongStepDoIt(const G4Track& track,
const G4Step& step);
const G4Step& step) final;
// Print few lines of informations about the process: validity range,
void PrintInfo();
virtual void PrintInfo() final;
protected:
// This function initialise process
void InitialiseProcess(const G4ParticleDefinition*);
void InitialiseProcess(const G4ParticleDefinition*) final;
private:
// copy constructor and hide assignment operator
G4NuclearStopping(G4NuclearStopping &);
G4NuclearStopping & operator=(const G4NuclearStopping &right);
G4NuclearStopping(G4NuclearStopping &) = delete;
G4NuclearStopping & operator=(const G4NuclearStopping &right) = delete;
G4ParticleChangeForLoss nParticleChange;
source/processes/electromagnetic/standard/include/G4PAIModel.hh
+16 -14
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PAIModel.hh 89821 2015-04-30 14:56:43Z gcosmo $
// $Id: G4PAIModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -71,44 +71,46 @@ class G4PAIModel : public G4VEmModel, public G4VEmFluctuationModel
public:
G4PAIModel(const G4ParticleDefinition* p = 0, const G4String& nam = "PAI");
explicit G4PAIModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "PAI");
virtual ~G4PAIModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) final;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) final;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) final;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) final;
virtual G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double,
G4double,
G4double);
G4double) final;
virtual G4double Dispersion( const G4Material*,
const G4DynamicParticle*,
G4double,
G4double);
G4double) final;
void DefineForRegion(const G4Region* r);
virtual void DefineForRegion(const G4Region* r) final;
inline G4PAIModelData* GetPAIModelData();
@@ -120,8 +122,8 @@ public:
protected:
G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy) final;
private:
@@ -130,8 +132,8 @@ private:
inline void SetParticle(const G4ParticleDefinition* p);
// hide assignment operator
G4PAIModel & operator=(const G4PAIModel &right);
G4PAIModel(const G4PAIModel&);
G4PAIModel & operator=(const G4PAIModel &right) = delete;
G4PAIModel(const G4PAIModel&) = delete;
G4int fVerbose;
source/processes/electromagnetic/standard/include/G4PAIModelData.hh
+3 -12
View File
@@ -70,7 +70,7 @@ class G4PAIModelData
public:
G4PAIModelData(G4double tmin, G4double tmax, G4int verbose);
explicit G4PAIModelData(G4double tmin, G4double tmax, G4int verbose);
~G4PAIModelData();
@@ -97,8 +97,8 @@ private:
G4double position) const;
// hide assignment operator
G4PAIModelData & operator=(const G4PAIModelData &right);
G4PAIModelData(const G4PAIModelData&);
G4PAIModelData & operator=(const G4PAIModelData &right) = delete;
G4PAIModelData(const G4PAIModelData&) = delete;
G4int fTotBin;
G4double fLowestKineticEnergy;
@@ -112,16 +112,7 @@ private:
std::vector<G4PhysicsTable*> fPAIxscBank;
std::vector<G4PhysicsTable*> fPAIdEdxBank;
std::vector<G4PhysicsLogVector*> fdEdxTable;
// std::vector<G4PhysicsLogVector*> fdNdxCutTable;
//std::vector<G4PhysicsLogVector*> fdEdxCutTable;
};
#endif
source/processes/electromagnetic/standard/include/G4PAIPhotData.hh
+3 -3
View File
@@ -68,7 +68,7 @@ class G4PAIPhotData
public:
G4PAIPhotData(G4double tmin, G4double tmax, G4int verbose);
explicit G4PAIPhotData(G4double tmin, G4double tmax, G4int verbose);
~G4PAIPhotData();
@@ -109,8 +109,8 @@ private:
G4double position) const;
// hide assignment operator
G4PAIPhotData & operator=(const G4PAIPhotData &right);
G4PAIPhotData(const G4PAIPhotData&);
G4PAIPhotData & operator=(const G4PAIPhotData &right) = delete;
G4PAIPhotData(const G4PAIPhotData&) = delete;
G4int fTotBin;
G4double fLowestKineticEnergy;
source/processes/electromagnetic/standard/include/G4PAIPhotModel.hh
+15 -13
View File
@@ -66,44 +66,46 @@ class G4PAIPhotModel : public G4VEmModel, public G4VEmFluctuationModel
public:
G4PAIPhotModel(const G4ParticleDefinition* p = 0, const G4String& nam = "PAI");
explicit G4PAIPhotModel(const G4ParticleDefinition* p = nullptr,
const G4String& nam = "PAI");
virtual ~G4PAIPhotModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) final;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) final;
virtual G4double ComputeDEDXPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy);
G4double cutEnergy) final;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) final;
virtual G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double,
G4double,
G4double);
G4double) final;
virtual G4double Dispersion( const G4Material*,
const G4DynamicParticle*,
G4double,
G4double);
G4double) final;
void DefineForRegion(const G4Region* r);
virtual void DefineForRegion(const G4Region* r) final;
inline G4PAIPhotData* GetPAIPhotData();
@@ -115,8 +117,8 @@ public:
protected:
G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy);
virtual G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
G4double kinEnergy) final;
private:
@@ -125,8 +127,8 @@ private:
inline void SetParticle(const G4ParticleDefinition* p);
// hide assignment operator
G4PAIPhotModel & operator=(const G4PAIPhotModel &right);
G4PAIPhotModel(const G4PAIPhotModel&);
G4PAIPhotModel & operator=(const G4PAIPhotModel &right) = delete;
G4PAIPhotModel(const G4PAIPhotModel&) = delete;
G4int fVerbose;
source/processes/electromagnetic/standard/include/G4PAIxSection.hh
+105 -120
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PAIxSection.hh 75582 2013-11-04 12:13:01Z gcosmo $
// $Id: G4PAIxSection.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//
// G4PAIxSection.hh -- header file
@@ -84,165 +84,153 @@ public:
G4double maxEnergyTransfer,
G4double betaGammaSq );
// G4PAIxSection(const G4PAIxSection& right);
// Destructor
~G4PAIxSection();
~G4PAIxSection();
void Initialize(const G4Material* material,
G4double maxEnergyTransfer, G4double betaGammaSq, G4SandiaTable*);
void Initialize(const G4Material* material, G4double maxEnergyTransfer,
G4double betaGammaSq, G4SandiaTable*);
// Operators
// G4PAIxSection& operator=(const G4PAIxSection& right);
// G4int operator==(const G4PAIxSection& right)const;
// G4int operator!=(const G4PAIxSection& right)const;
// Methods
// General control functions
// General control functions
void ComputeLowEnergyCof(const G4Material* material);
void ComputeLowEnergyCof();
void ComputeLowEnergyCof();
void InitPAI();
void InitPAI();
void NormShift( G4double betaGammaSq );
void NormShift( G4double betaGammaSq );
void SplainPAI( G4double betaGammaSq );
void SplainPAI( G4double betaGammaSq );
// Physical methods
// Physical methods
G4double RutherfordIntegral( G4int intervalNumber,
G4double limitLow,
G4double limitHigh );
G4double RutherfordIntegral( G4int intervalNumber,
G4double limitLow,
G4double limitHigh );
G4double ImPartDielectricConst( G4int intervalNumber,
G4double energy );
G4double ImPartDielectricConst( G4int intervalNumber,
G4double energy );
G4double GetPhotonRange( G4double energy );
G4double GetElectronRange( G4double energy );
G4double GetPhotonRange( G4double energy );
G4double GetElectronRange( G4double energy );
G4double RePartDielectricConst(G4double energy);
G4double RePartDielectricConst(G4double energy);
G4double DifPAIxSection( G4int intervalNumber,
G4double betaGammaSq );
G4double DifPAIxSection( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxCerenkov( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxMM( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxCerenkov( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxMM( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxPlasmon( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxPlasmon( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxResonance( G4int intervalNumber,
G4double betaGammaSq );
G4double PAIdNdxResonance( G4int intervalNumber,
G4double betaGammaSq );
void IntegralPAIxSection();
void IntegralCerenkov();
void IntegralMM();
void IntegralPlasmon();
void IntegralResonance();
void IntegralPAIxSection();
void IntegralCerenkov();
void IntegralMM();
void IntegralPlasmon();
void IntegralResonance();
G4double SumOverInterval(G4int intervalNumber);
G4double SumOverIntervaldEdx(G4int intervalNumber);
G4double SumOverInterCerenkov(G4int intervalNumber);
G4double SumOverInterMM(G4int intervalNumber);
G4double SumOverInterPlasmon(G4int intervalNumber);
G4double SumOverInterResonance(G4int intervalNumber);
G4double SumOverInterval(G4int intervalNumber);
G4double SumOverIntervaldEdx(G4int intervalNumber);
G4double SumOverInterCerenkov(G4int intervalNumber);
G4double SumOverInterMM(G4int intervalNumber);
G4double SumOverInterPlasmon(G4int intervalNumber);
G4double SumOverInterResonance(G4int intervalNumber);
G4double SumOverBorder( G4int intervalNumber,
G4double energy );
G4double SumOverBorderdEdx( G4int intervalNumber,
G4double energy );
G4double SumOverBordCerenkov( G4int intervalNumber,
G4double energy );
G4double SumOverBordMM( G4int intervalNumber,
G4double energy );
G4double SumOverBordPlasmon( G4int intervalNumber,
G4double energy );
G4double SumOverBordResonance( G4int intervalNumber,
G4double energy );
G4double SumOverBorder( G4int intervalNumber,
G4double energy );
G4double SumOverBorderdEdx( G4int intervalNumber,
G4double energy );
G4double SumOverBordCerenkov( G4int intervalNumber,
G4double energy );
G4double SumOverBordMM( G4int intervalNumber,
G4double energy );
G4double SumOverBordPlasmon( G4int intervalNumber,
G4double energy );
G4double SumOverBordResonance( G4int intervalNumber,
G4double energy );
G4double GetStepEnergyLoss( G4double step );
G4double GetStepCerenkovLoss( G4double step );
G4double GetStepMMLoss( G4double step );
G4double GetStepPlasmonLoss( G4double step );
G4double GetStepResonanceLoss( G4double step );
G4double GetStepEnergyLoss( G4double step );
G4double GetStepCerenkovLoss( G4double step );
G4double GetStepMMLoss( G4double step );
G4double GetStepPlasmonLoss( G4double step );
G4double GetStepResonanceLoss( G4double step );
G4double GetEnergyTransfer();
G4double GetCerenkovEnergyTransfer();
G4double GetMMEnergyTransfer();
G4double GetPlasmonEnergyTransfer();
G4double GetResonanceEnergyTransfer();
G4double GetRutherfordEnergyTransfer();
G4double GetEnergyTransfer();
G4double GetCerenkovEnergyTransfer();
G4double GetMMEnergyTransfer();
G4double GetPlasmonEnergyTransfer();
G4double GetResonanceEnergyTransfer();
G4double GetRutherfordEnergyTransfer();
// Inline access functions
// Inline access functions
G4int GetNumberOfGammas() const { return fNumberOfGammas; }
G4int GetNumberOfGammas() const { return fNumberOfGammas; }
G4int GetSplineSize() const { return fSplineNumber; }
G4int GetSplineSize() const { return fSplineNumber; }
G4int GetIntervalNumber() const { return fIntervalNumber; }
G4int GetIntervalNumber() const { return fIntervalNumber; }
G4double GetEnergyInterval(G4int i){ return fEnergyInterval[i]; }
G4double GetEnergyInterval(G4int i){ return fEnergyInterval[i]; }
G4double GetDifPAIxSection(G4int i){ return fDifPAIxSection[i]; }
G4double GetPAIdNdxCerenkov(G4int i){ return fdNdxCerenkov[i]; }
G4double GetPAIdNdxMM(G4int i){ return fdNdxMM[i]; }
G4double GetPAIdNdxPlasmon(G4int i){ return fdNdxPlasmon[i]; }
G4double GetPAIdNdxResonance(G4int i){ return fdNdxResonance[i]; }
G4double GetDifPAIxSection(G4int i){ return fDifPAIxSection[i]; }
G4double GetPAIdNdxCerenkov(G4int i){ return fdNdxCerenkov[i]; }
G4double GetPAIdNdxMM(G4int i){ return fdNdxMM[i]; }
G4double GetPAIdNdxPlasmon(G4int i){ return fdNdxPlasmon[i]; }
G4double GetPAIdNdxResonance(G4int i){ return fdNdxResonance[i]; }
G4double GetMeanEnergyLoss() const {return fIntegralPAIxSection[0]; }
G4double GetMeanCerenkovLoss() const {return fIntegralCerenkov[0]; }
G4double GetMeanMMLoss() const {return fIntegralMM[0]; }
G4double GetMeanPlasmonLoss() const {return fIntegralPlasmon[0]; }
G4double GetMeanResonanceLoss() const {return fIntegralResonance[0]; }
G4double GetMeanEnergyLoss() const {return fIntegralPAIxSection[0]; }
G4double GetMeanCerenkovLoss() const {return fIntegralCerenkov[0]; }
G4double GetMeanMMLoss() const {return fIntegralMM[0]; }
G4double GetMeanPlasmonLoss() const {return fIntegralPlasmon[0]; }
G4double GetMeanResonanceLoss() const {return fIntegralResonance[0]; }
G4double GetNormalizationCof() const { return fNormalizationCof; }
G4double GetNormalizationCof() const { return fNormalizationCof; }
G4double GetLowEnergyCof() const { return fLowEnergyCof; }
G4double GetLowEnergyCof() const { return fLowEnergyCof; }
void SetVerbose(G4int v){fVerbose=v;};
inline G4double GetPAItable(G4int i,G4int j) const;
inline G4double GetLorentzFactor(G4int i) const;
inline G4double GetPAItable(G4int i,G4int j) const;
inline G4double GetLorentzFactor(G4int i) const;
inline G4double GetSplineEnergy(G4int i) const;
inline G4double GetSplineEnergy(G4int i) const;
inline G4double GetIntegralPAIxSection(G4int i) const;
inline G4double GetIntegralPAIdEdx(G4int i) const;
inline G4double GetIntegralCerenkov(G4int i) const;
inline G4double GetIntegralMM(G4int i) const;
inline G4double GetIntegralPlasmon(G4int i) const;
inline G4double GetIntegralResonance(G4int i) const;
inline G4double GetIntegralPAIxSection(G4int i) const;
inline G4double GetIntegralPAIdEdx(G4int i) const;
inline G4double GetIntegralCerenkov(G4int i) const;
inline G4double GetIntegralMM(G4int i) const;
inline G4double GetIntegralPlasmon(G4int i) const;
inline G4double GetIntegralResonance(G4int i) const;
private :
void CallError(G4int i, const G4String& methodName) const;
G4PAIxSection & operator=(const G4PAIxSection &right);
G4PAIxSection(const G4PAIxSection&);
G4PAIxSection & operator=(const G4PAIxSection &right) = delete;
G4PAIxSection(const G4PAIxSection&) = delete;
// Local class constants
// Local class constants
static const G4double fDelta; // energy shift from interval border = 0.001
static const G4double fError; // error in lin-log approximation = 0.005
static const G4double fDelta; // energy shift from interval border = 0.001
static const G4double fError; // error in lin-log approximation = 0.005
static G4int fNumberOfGammas; // = 111;
static const G4double fLorentzFactor[112]; // static gamma array
static G4int fNumberOfGammas; // = 111;
static const G4double fLorentzFactor[112]; // static gamma array
static
const G4int fRefGammaNumber ; // The number of gamma for creation of spline (15)
static
const G4int fRefGammaNumber; //The number of gamma for creation of spline (15)
G4int fIntervalNumber ; // The number of energy intervals
G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
G4int fIntervalNumber ; // The number of energy intervals
G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
// G4double fBetaGammaSq; // (beta*gamma)^2
// G4double fBetaGammaSq; // (beta*gamma)^2
G4int fMaterialIndex; // current material index
G4double fDensity; // Current density
@@ -251,7 +239,7 @@ G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
G4int fSplineNumber; // Current size of spline
G4int fVerbose; // verbose flag
// Arrays of Sandia coefficients
// Arrays of Sandia coefficients
G4OrderedTable* fMatSandiaMatrix;
@@ -263,9 +251,8 @@ G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
G4DataVector fA3;
G4DataVector fA4;
static
const G4int fMaxSplineSize ; // Max size of output splain arrays = 500
static
const G4int fMaxSplineSize ; // Max size of output splain arrays = 500
G4DataVector fSplineEnergy; // energy points of splain
G4DataVector fRePartDielectricConst; // Real part of dielectric const
@@ -284,9 +271,7 @@ const G4int fMaxSplineSize ; // Max size of output splain arrays = 50
G4DataVector fIntegralMM; // Integral MM N>omega ?
G4DataVector fIntegralResonance; // Integral resonance N>omega ?
G4double fPAItable[500][112]; // Output array
G4double fPAItable[500][112]; // Output array
};
source/processes/electromagnetic/standard/include/G4PAIySection.hh
+27 -29
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PAIySection.hh 70170 2013-05-24 13:32:33Z gcosmo $
// $Id: G4PAIySection.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//
// G4PAIySection.hh -- header file
@@ -53,14 +53,14 @@ class G4PAIySection
{
public:
G4PAIySection();
explicit G4PAIySection();
~G4PAIySection();
void Initialize(const G4Material* material,
G4double maxEnergyTransfer, G4double betaGammaSq, G4SandiaTable*);
void Initialize(const G4Material* material, G4double maxEnergyTransfer,
G4double betaGammaSq, G4SandiaTable*);
void ComputeLowEnergyCof(const G4Material* material);
void ComputeLowEnergyCof(const G4Material* material);
void InitPAI();
@@ -151,20 +151,23 @@ private :
static const G4double fDelta; // energy shift from interval border = 0.001
static const G4double fError; // error in lin-log approximation = 0.005
static G4int fNumberOfGammas; // = 111;
static G4int fNumberOfGammas; // = 111;
static const G4double fLorentzFactor[112]; // static gamma array
static
const G4int fRefGammaNumber ; // The number of gamma for creation of spline (15)
const G4int fRefGammaNumber; // The number of gamma for creation of spline (15)
G4int fIntervalNumber ; // The number of energy intervals
G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
G4int fIntervalNumber ; // The number of energy intervals
G4double fNormalizationCof; // Normalization cof for PhotoAbsorptionXsection
G4double betaBohr;
G4double betaBohr4;
G4double fDensity; // Current density
G4double fElectronDensity; // Current electron (number) density
G4double fLowEnergyCof; // Correction cof for low energy region
G4double fLowEnergyCof; // Correction cof for low energy region
G4int fSplineNumber; // Current size of spline
G4int fVerbose; // verbose flag
G4int fVerbose; // verbose flag
G4SandiaTable* fSandia;
@@ -175,29 +178,24 @@ private :
G4DataVector fA4;
static
const G4int fMaxSplineSize ; // Max size of output splain arrays = 500
const G4int fMaxSplineSize; // Max size of output splain arrays = 500
G4DataVector fSplineEnergy; // energy points of splain
G4DataVector fRePartDielectricConst; // Real part of dielectric const
G4DataVector fImPartDielectricConst; // Imaginary part of dielectric const
G4DataVector fIntegralTerm; // Integral term in PAI cross section
G4DataVector fDifPAIySection; // Differential PAI cross section
G4DataVector fdNdxCerenkov; // dNdx of Cerenkov collisions
G4DataVector fdNdxPlasmon; // dNdx of Plasmon collisions
G4DataVector fSplineEnergy; // energy points of splain
G4DataVector fRePartDielectricConst; // Real part of dielectric const
G4DataVector fImPartDielectricConst; // Imaginary part of dielectric const
G4DataVector fIntegralTerm; // Integral term in PAI cross section
G4DataVector fDifPAIySection; // Differential PAI cross section
G4DataVector fdNdxCerenkov; // dNdx of Cerenkov collisions
G4DataVector fdNdxPlasmon; // dNdx of Plasmon collisions
G4DataVector fIntegralPAIySection; // Integral PAI cross section ?
G4DataVector fIntegralPAIdEdx; // Integral PAI dEdx ?
G4DataVector fIntegralCerenkov; // Integral Cerenkov N>omega ?
G4DataVector fIntegralPlasmon; // Integral Plasmon N>omega ?
G4double fPAItable[500][112]; // Output array
G4DataVector fIntegralPAIySection; // Integral PAI cross section ?
G4DataVector fIntegralPAIdEdx; // Integral PAI dEdx ?
G4DataVector fIntegralCerenkov; // Integral Cerenkov N>omega ?
G4DataVector fIntegralPlasmon; // Integral Plasmon N>omega ?
G4double fPAItable[500][112]; // Output array
};
//////////////// Inline methods //////////////////////////////////
//
inline G4double G4PAIySection::GetPAItable(G4int i, G4int j) const
{
return fPAItable[i][j];
source/processes/electromagnetic/standard/include/G4PEEffectFluoModel.hh
+8 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PEEffectFluoModel.hh 84397 2014-10-15 07:19:14Z gcosmo $
// $Id: G4PEEffectFluoModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -60,35 +60,35 @@ class G4PEEffectFluoModel : public G4VEmModel
public:
G4PEEffectFluoModel(const G4String& nam = "PhotoElectric");
explicit G4PEEffectFluoModel(const G4String& nam = "PhotoElectric");
virtual ~G4PEEffectFluoModel();
virtual
void Initialise(const G4ParticleDefinition*, const G4DataVector&);
void Initialise(const G4ParticleDefinition*, const G4DataVector&) override;
virtual
G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
G4double kinEnergy,
G4double Z,
G4double A,
G4double, G4double);
G4double, G4double) override;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
private:
G4PEEffectFluoModel & operator=(const G4PEEffectFluoModel &right);
G4PEEffectFluoModel(const G4PEEffectFluoModel&);
G4PEEffectFluoModel & operator=(const G4PEEffectFluoModel &right) = delete;
G4PEEffectFluoModel(const G4PEEffectFluoModel&) = delete;
G4ParticleDefinition* theGamma;
G4ParticleDefinition* theElectron;
source/processes/electromagnetic/standard/include/G4PSTARStopping.hh
+14 -11
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PSTARStopping.hh 83008 2014-07-24 14:49:52Z gcosmo $
// $Id: G4PSTARStopping.hh 96934 2016-05-18 09:10:41Z gcosmo $
#ifndef G4PSTARStopping_h
#define G4PSTARStopping_h 1
@@ -48,6 +48,9 @@
//
// Data on Stopping Powers from the NIST Data Base
// http://physics.nist.gov/PhysRefData/STAR/Text/PSTAR.html
//
// Current PSTAR database is available via url:
// http://physics.nist.gov/PhysRefData/Star/Text/PSTAR.html
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -61,7 +64,7 @@ class G4PSTARStopping
{
public:
G4PSTARStopping();
explicit G4PSTARStopping();
~G4PSTARStopping();
@@ -77,17 +80,17 @@ public:
private:
void AddData(const G4double* s, const G4Material*);
void AddData(const G4float* s, const G4Material*);
void FindData(G4int idx, const G4Material*);
void PrintWarning(G4int idx) const;
// hide assignment operator
G4PSTARStopping & operator=(const G4PSTARStopping &right);
G4PSTARStopping(const G4PSTARStopping&);
G4PSTARStopping & operator=(const G4PSTARStopping &right) = delete;
G4PSTARStopping(const G4PSTARStopping&) = delete;
size_t nvectors;
G4int nvectors;
G4double emin;
std::vector<const G4Material*> materials;
std::vector<G4LPhysicsFreeVector*> sdata;
@@ -98,7 +101,7 @@ private:
inline G4int G4PSTARStopping:: GetIndex (const G4Material* mat) const
{
G4int idx = -1;
for (size_t i=0; i<nvectors; ++i){
for (G4int i=0; i<nvectors; ++i){
if (mat == materials[i]){
idx = i;
break;
@@ -112,7 +115,7 @@ inline G4int G4PSTARStopping:: GetIndex (const G4Material* mat) const
inline G4int G4PSTARStopping::GetIndex(const G4String& nam) const
{
G4int idx = -1;
for (size_t i=0; i<nvectors; ++i){
for (G4int i=0; i<nvectors; ++i){
if (nam == materials[i]->GetName()){
idx = i;
break;
@@ -127,9 +130,9 @@ inline G4double
G4PSTARStopping::GetElectronicDEDX(G4int idx, G4double energy) const
{
G4double res = 0.0;
if (idx<0 || idx>= G4int(nvectors)) { PrintWarning(idx); }
if(energy < emin) { res = (*(sdata[idx]))[0]*std::sqrt(energy/emin); }
else { res = sdata[idx]->Value(energy); }
if (idx<0 || idx>= nvectors) { PrintWarning(idx); }
else if(energy < emin) { res = (*(sdata[idx]))[0]*std::sqrt(energy/emin); }
else { res = sdata[idx]->Value(energy); }
return res;
}
source/processes/electromagnetic/standard/include/G4PairProductionRelModel.hh
+15 -13
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PairProductionRelModel.hh 73607 2013-09-02 10:04:03Z gcosmo $
// $Id: G4PairProductionRelModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -63,15 +63,16 @@ class G4PairProductionRelModel : public G4VEmModel
public:
G4PairProductionRelModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheHeitlerLPM");
explicit G4PairProductionRelModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "BetheHeitlerLPM");
virtual ~G4PairProductionRelModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -79,19 +80,19 @@ public:
G4double Z,
G4double A=0.,
G4double cut=0.,
G4double emax=DBL_MAX);
G4double emax=DBL_MAX) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
virtual void SetupForMaterial(const G4ParticleDefinition*,
const G4Material*,G4double);
const G4Material*,G4double) override;
// * fast inline functions *
inline void SetCurrentElement(G4double /*Z*/);
inline void SetCurrentElement(G4double Z);
// set / get methods
inline void SetLPMconstant(G4double val);
@@ -119,8 +120,9 @@ protected:
G4double ComputeRelDXSectionPerAtom(G4double eplusEnergy, G4double totalEnergy, G4double Z);
// hide assignment operator
G4PairProductionRelModel & operator=(const G4PairProductionRelModel &right);
G4PairProductionRelModel(const G4PairProductionRelModel&);
G4PairProductionRelModel & operator=
(const G4PairProductionRelModel &right) = delete;
G4PairProductionRelModel(const G4PairProductionRelModel&) = delete;
G4NistManager* nist;
@@ -150,7 +152,7 @@ protected:
static const G4double facFel;
static const G4double facFinel;
static const G4double preS1, logTwo;
static const G4double preS1, logTwo, xsfactor, Egsmall;
};
@@ -194,7 +196,7 @@ inline void G4PairProductionRelModel::SetCurrentElement(G4double Z)
if(Z != currentZ) {
currentZ = Z;
G4int iz = G4int(Z);
G4int iz = G4lrint(Z);
z13 = nist->GetZ13(iz);
z23 = z13*z13;
lnZ = nist->GetLOGZ(iz);
source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
+6 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4PhotoElectricEffect.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4PhotoElectricEffect.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
//------------------ G4PhotoElectricEffect physics process ------------------
// by Michel Maire, 24 May 1996
@@ -81,20 +81,20 @@ class G4PhotoElectricEffect : public G4VEmProcess
{
public: // with description
G4PhotoElectricEffect(const G4String& processName ="phot",
G4ProcessType type = fElectromagnetic);
explicit G4PhotoElectricEffect(const G4String& processName ="phot",
G4ProcessType type = fElectromagnetic);
virtual ~G4PhotoElectricEffect();
// true for Gamma only.
virtual G4bool IsApplicable(const G4ParticleDefinition&);
virtual G4bool IsApplicable(const G4ParticleDefinition&) final;
// Print few lines of informations about the process: validity range,
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
private:
source/processes/electromagnetic/standard/include/G4SauterGavrilaAngularDistribution.hh
+7 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4SauterGavrilaAngularDistribution.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4SauterGavrilaAngularDistribution.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -57,22 +57,23 @@ class G4SauterGavrilaAngularDistribution : public G4VEmAngularDistribution
public:
G4SauterGavrilaAngularDistribution();
explicit G4SauterGavrilaAngularDistribution();
virtual ~G4SauterGavrilaAngularDistribution();
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
G4double e = 0.0,
G4int shellId = 0,
const G4Material* mat = 0);
const G4Material* mat = 0) final;
void PrintGeneratorInformation() const;
virtual void PrintGeneratorInformation() const final;
private:
// hide assignment operator
G4SauterGavrilaAngularDistribution & operator=(const G4SauterGavrilaAngularDistribution &right);
G4SauterGavrilaAngularDistribution(const G4SauterGavrilaAngularDistribution&);
G4SauterGavrilaAngularDistribution & operator=
(const G4SauterGavrilaAngularDistribution &right) = delete;
G4SauterGavrilaAngularDistribution(const G4SauterGavrilaAngularDistribution&) = delete;
};
source/processes/electromagnetic/standard/include/G4ScreeningMottCrossSection.hh
+7 -10
View File
@@ -79,16 +79,18 @@
#include "G4Pow.hh"
#include "G4LossTableManager.hh"
class G4ParticleDefinition;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
static const G4int DIM = 750;
class G4ParticleDefinition;
class G4ScreeningMottCrossSection
{
public:
G4ScreeningMottCrossSection();
explicit G4ScreeningMottCrossSection();
virtual ~G4ScreeningMottCrossSection();
@@ -100,7 +102,7 @@ public:
inline void SetupParticle(const G4ParticleDefinition*);
void SetupKinematic(G4double kinEnergy ,G4double Z);
void SetupKinematic(G4double kinEnergy ,G4int Z);
G4double NuclearCrossSection();
G4ThreeVector GetNewDirection();
@@ -165,7 +167,7 @@ private:
// target nucleus
G4double targetZ;
G4int targetZ;
G4double targetA;
G4double targetMass;
G4double Trec;
@@ -178,11 +180,6 @@ private:
G4double e2;
//angle
static const G4int DIM = 950;
G4double angle[DIM];
G4double tet[DIM];
G4double dangle[DIM];
G4double cross[DIM];
};
source/processes/electromagnetic/standard/include/G4UniversalFluctuation.hh
+63 -16
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4UniversalFluctuation.hh 81365 2014-05-27 12:56:32Z gcosmo $
// $Id: G4UniversalFluctuation.hh 95832 2016-02-26 11:12:31Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -43,7 +43,7 @@
// 07-02-03 change signature (V.Ivanchenko)
// 13-02-03 Add name (V.Ivanchenko)
// 16-10-03 Changed interface to Initialisation (V.Ivanchenko)
// 07-02-05 define problim = 5.e-3 (mma)
// 07-02-05 define problem = 5.e-3 (mma)
//
// Class Description:
//
@@ -58,37 +58,48 @@
#include "G4VEmFluctuationModel.hh"
#include "G4ParticleDefinition.hh"
#include "G4Poisson.hh"
#include <CLHEP/Random/RandomEngine.h>
class G4UniversalFluctuation : public G4VEmFluctuationModel
{
public:
G4UniversalFluctuation(const G4String& nam = "UniFluc");
explicit G4UniversalFluctuation(const G4String& nam = "UniFluc");
virtual ~G4UniversalFluctuation();
virtual G4double SampleFluctuations(const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double,
G4double,
G4double);
const G4DynamicParticle*,
G4double,
G4double,
G4double) override;
virtual G4double Dispersion( const G4Material*,
const G4DynamicParticle*,
G4double,
G4double);
virtual G4double Dispersion(const G4Material*,
const G4DynamicParticle*,
G4double,
G4double) override;
virtual void InitialiseMe(const G4ParticleDefinition*);
virtual void InitialiseMe(const G4ParticleDefinition*) final;
// Initialisation prestep
virtual void SetParticleAndCharge(const G4ParticleDefinition*, G4double q2);
virtual void SetParticleAndCharge(const G4ParticleDefinition*,
G4double q2) final;
private:
inline void AddExcitation(CLHEP::HepRandomEngine* rndm,
G4double a, G4double e, G4double& eav,
G4double& eloss, G4double& esig2);
inline void SampleGauss(CLHEP::HepRandomEngine* rndm,
G4double eav, G4double esig2,
G4double& eloss);
// hide assignment operator
G4UniversalFluctuation & operator=(const G4UniversalFluctuation &right);
G4UniversalFluctuation(const G4UniversalFluctuation&);
G4UniversalFluctuation & operator=(const G4UniversalFluctuation &right) = delete;
G4UniversalFluctuation(const G4UniversalFluctuation&) = delete;
const G4ParticleDefinition* particle;
const G4Material* lastMaterial;
@@ -117,7 +128,6 @@ private:
G4double e1,e2;
G4double minNumberInteractionsBohr;
G4double theBohrBeta2;
G4double minLoss;
G4double nmaxCont;
G4double rate,fw;
@@ -129,5 +139,42 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline void
G4UniversalFluctuation::AddExcitation(CLHEP::HepRandomEngine* rndm,
G4double ax, G4double ex, G4double& eav,
G4double& eloss, G4double& esig2)
{
if(ax > nmaxCont) {
eav += ax*ex;
esig2 += ax*ex*ex;
} else if(ax > 0.) {
G4double p = G4double(G4Poisson(ax));
eloss += p*ex;
if(p > 0.) { eloss += (1.-2.*rndm->flat())*ex; }
}
}
inline void
G4UniversalFluctuation::SampleGauss(CLHEP::HepRandomEngine* rndm,
G4double eav, G4double esig2,
G4double& eloss)
{
G4double x = eav;
if(esig2 > 0.0) {
G4double sig = sqrt(esig2);
G4double deltae = std::min(4.*sig, eav);
if(deltae < 0.25*sig) {
x += (2.*rndm->flat() - 1.)*deltae;
} else {
do {
x = G4RandGauss::shoot(rndm, eav, sig);
} while (x < eav-deltae || x > eav+deltae);
// Loop checking, 23-Feb-2016, Vladimir Ivanchenko
}
}
eloss += x;
}
#endif
source/processes/electromagnetic/standard/include/G4UrbanMscModel.hh
+45 -42
View File
@@ -67,8 +67,6 @@ class G4ParticleChangeForMSC;
class G4SafetyHelper;
class G4LossTableManager;
static const G4double c_highland = 13.6*CLHEP::MeV ;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
class G4UrbanMscModel : public G4VMscModel
@@ -76,29 +74,33 @@ class G4UrbanMscModel : public G4VMscModel
public:
G4UrbanMscModel(const G4String& nam = "UrbanMsc");
explicit G4UrbanMscModel(const G4String& nam = "UrbanMsc");
virtual ~G4UrbanMscModel();
void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
void StartTracking(G4Track*);
virtual void StartTracking(G4Track*) override;
G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition* particle,
G4double KineticEnergy,
G4double AtomicNumber,
G4double AtomicWeight=0.,
G4double cut =0.,
G4double emax=DBL_MAX);
virtual G4double
ComputeCrossSectionPerAtom(const G4ParticleDefinition* particle,
G4double KineticEnergy,
G4double AtomicNumber,
G4double AtomicWeight=0.,
G4double cut =0.,
G4double emax=DBL_MAX) override;
G4ThreeVector& SampleScattering(const G4ThreeVector&, G4double safety);
virtual G4ThreeVector& SampleScattering(const G4ThreeVector&,
G4double safety) override;
G4double ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep);
virtual G4double
ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep) override;
G4double ComputeGeomPathLength(G4double truePathLength);
virtual G4double ComputeGeomPathLength(G4double truePathLength) override;
G4double ComputeTrueStepLength(G4double geomStepLength);
virtual G4double ComputeTrueStepLength(G4double geomStepLength) override;
G4double ComputeTheta0(G4double truePathLength, G4double KineticEnergy);
@@ -121,8 +123,8 @@ private:
inline G4double SimpleScattering(G4double xmeanth, G4double x2meanth);
// hide assignment operator
G4UrbanMscModel & operator=(const G4UrbanMscModel &right);
G4UrbanMscModel(const G4UrbanMscModel&);
G4UrbanMscModel & operator=(const G4UrbanMscModel &right) = delete;
G4UrbanMscModel(const G4UrbanMscModel&) = delete;
CLHEP::HepRandomEngine* rndmEngineMod;
@@ -207,45 +209,46 @@ void G4UrbanMscModel::SetParticle(const G4ParticleDefinition* p)
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline
G4double G4UrbanMscModel::Randomizetlimit()
inline G4double G4UrbanMscModel::Randomizetlimit()
{
G4double temptlimit = tlimit;
if(tlimit > tlimitmin)
{
G4double delta = tlimit-tlimitmin;
do {
temptlimit = G4RandGauss::shoot(rndmEngineMod,tlimit,0.3*tlimit);
// Loop checking, 03-Aug-2015, Vladimir Ivanchenko
} while ((temptlimit < tlimitmin) ||
(temptlimit > 2.*tlimit-tlimitmin));
temptlimit = G4RandGauss::shoot(rndmEngineMod,tlimit,0.1*delta);
// Loop checking, 10-Apr-2016, Laszlo Urban
} while ((temptlimit < tlimit-delta) ||
(temptlimit > tlimit+delta));
}
else temptlimit = tlimitmin;
else { temptlimit = tlimitmin; }
return temptlimit;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline
void G4UrbanMscModel::UpdateCache()
inline void G4UrbanMscModel::UpdateCache()
{
lnZ = G4Log(Zeff);
// correction in theta0 formula
G4double w = G4Exp(lnZ/6.);
G4double facz = 0.990395+w*(-0.168386+w*0.093286) ;
coeffth1 = facz*(1. - 8.7780e-2/Zeff);
coeffth2 = facz*(4.0780e-2 + 1.7315e-4*Zeff);
lnZ = G4Log(Zeff);
// correction in theta0 formula
G4double w = G4Exp(lnZ/6.);
G4double facz = 0.990395+w*(-0.168386+w*0.093286) ;
coeffth1 = facz*(1. - 8.7780e-2/Zeff);
coeffth2 = facz*(4.0780e-2 + 1.7315e-4*Zeff);
// tail parameters
G4double Z13 = w*w;
coeffc1 = 2.3785 - Z13*(4.1981e-1 - Z13*6.3100e-2);
coeffc2 = 4.7526e-1 + Z13*(1.7694 - Z13*3.3885e-1);
coeffc3 = 2.3683e-1 - Z13*(1.8111 - Z13*3.2774e-1);
coeffc4 = 1.7888e-2 + Z13*(1.9659e-2 - Z13*2.6664e-3);
// tail parameters
G4double Z13 = w*w;
coeffc1 = 2.3785 - Z13*(4.1981e-1 - Z13*6.3100e-2);
coeffc2 = 4.7526e-1 + Z13*(1.7694 - Z13*3.3885e-1);
coeffc3 = 2.3683e-1 - Z13*(1.8111 - Z13*3.2774e-1);
coeffc4 = 1.7888e-2 + Z13*(1.9659e-2 - Z13*2.6664e-3);
Z2 = Zeff*Zeff;
Z23 = Z13*Z13;
Z2 = Zeff*Zeff;
Z23 = Z13*Z13;
Zold = Zeff;
Zold = Zeff;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/processes/electromagnetic/standard/include/G4WaterStopping.hh
+6 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4WaterStopping.hh 83008 2014-07-24 14:49:52Z gcosmo $
// $Id: G4WaterStopping.hh 96934 2016-05-18 09:10:41Z gcosmo $
#ifndef G4WaterStopping_h
#define G4WaterStopping_h 1
@@ -58,7 +58,7 @@ class G4WaterStopping
{
public:
G4WaterStopping(G4EmCorrections* corr = 0, G4bool splineFlag = true);
explicit G4WaterStopping(G4EmCorrections* corr = 0, G4bool splineFlag = true);
~G4WaterStopping();
@@ -72,12 +72,12 @@ private:
G4double factor);
// hide assignment operator
G4WaterStopping & operator=(const G4WaterStopping &right);
G4WaterStopping(const G4WaterStopping&);
G4WaterStopping & operator=(const G4WaterStopping &right) = delete;
G4WaterStopping(const G4WaterStopping&) = delete;
G4bool spline;
G4int Z[17];
G4double A[17];
static const G4int Z[17];
static const G4double A[17];
G4double emin;
std::vector<G4LPhysicsFreeVector*> dedx;
};
source/processes/electromagnetic/standard/include/G4WentzelOKandVIxSection.hh
+6 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4WentzelOKandVIxSection.hh 80656 2014-05-06 08:31:39Z gcosmo $
// $Id: G4WentzelOKandVIxSection.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -73,13 +73,13 @@ class G4WentzelOKandVIxSection
public:
G4WentzelOKandVIxSection(G4bool combined = true);
explicit G4WentzelOKandVIxSection(G4bool combined = true);
virtual ~G4WentzelOKandVIxSection();
void Initialise(const G4ParticleDefinition*, G4double CosThetaLim);
void SetupParticle(const G4ParticleDefinition*);
void SetupParticle(const G4ParticleDefinition*) ;
// return cos(ThetaMax) for msc and cos(thetaMin) for single scattering
// cut = DBL_MAX means no scattering off electrons
@@ -114,8 +114,9 @@ private:
void ComputeMaxElectronScattering(G4double cut);
// hide assignment operator
G4WentzelOKandVIxSection & operator=(const G4WentzelOKandVIxSection &right);
G4WentzelOKandVIxSection(const G4WentzelOKandVIxSection&);
G4WentzelOKandVIxSection & operator=
(const G4WentzelOKandVIxSection &right) = delete;
G4WentzelOKandVIxSection(const G4WentzelOKandVIxSection&) = delete;
const G4ParticleDefinition* theProton;
const G4ParticleDefinition* theElectron;
source/processes/electromagnetic/standard/include/G4WentzelVIModel.hh
+19 -15
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4WentzelVIModel.hh 89893 2015-05-04 07:29:17Z gcosmo $
// $Id: G4WentzelVIModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -68,33 +68,36 @@ class G4WentzelVIModel : public G4VMscModel
public:
G4WentzelVIModel(G4bool comb = true, const G4String& nam = "WentzelVIUni");
explicit G4WentzelVIModel(G4bool comb = true,
const G4String& nam = "WentzelVIUni");
virtual ~G4WentzelVIModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
void StartTracking(G4Track*);
virtual void StartTracking(G4Track*) override;
virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
G4double KineticEnergy,
G4double AtomicNumber,
G4double AtomicWeight=0.,
G4double cut = DBL_MAX,
G4double emax= DBL_MAX);
G4double emax= DBL_MAX) override;
virtual G4ThreeVector& SampleScattering(const G4ThreeVector&,
G4double safety);
G4double safety) override;
virtual G4double ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep);
virtual G4double
ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep) override;
virtual G4double ComputeGeomPathLength(G4double truePathLength);
virtual G4double ComputeGeomPathLength(G4double truePathLength) override;
virtual G4double ComputeTrueStepLength(G4double geomStepLength);
virtual G4double ComputeTrueStepLength(G4double geomStepLength) override;
// defines low energy limit on energy transfer to atomic electron
inline void SetFixedCut(G4double);
@@ -131,8 +134,8 @@ private:
inline void SetupParticle(const G4ParticleDefinition*);
// hide assignment operator
G4WentzelVIModel & operator=(const G4WentzelVIModel &right);
G4WentzelVIModel(const G4WentzelVIModel&);
G4WentzelVIModel & operator=(const G4WentzelVIModel &right) = delete;
G4WentzelVIModel(const G4WentzelVIModel&) = delete;
protected:
@@ -179,11 +182,12 @@ private:
size_t idx2;
// data for single scattering mode
G4double xtsec;
G4int minNCollisions;
G4int nelments;
std::vector<G4double> xsecn;
std::vector<G4double> prob;
G4int nelments;
G4double xtsec;
G4double numlimit;
// projectile
source/processes/electromagnetic/standard/include/G4WentzelVIRelModel.hh
+14 -12
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4WentzelVIRelModel.hh 79067 2014-02-14 09:48:52Z gcosmo $
// $Id: G4WentzelVIRelModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -71,30 +71,32 @@ class G4WentzelVIRelModel : public G4VMscModel
public:
G4WentzelVIRelModel(G4bool combined = true);
explicit G4WentzelVIRelModel(G4bool combined = true);
virtual ~G4WentzelVIRelModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
void StartTracking(G4Track*);
virtual void StartTracking(G4Track*) override;
virtual G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
G4double KineticEnergy,
G4double AtomicNumber,
G4double AtomicWeight=0.,
G4double cut = DBL_MAX,
G4double emax= DBL_MAX);
G4double emax= DBL_MAX) override;
virtual G4ThreeVector& SampleScattering(const G4ThreeVector&,
G4double safety);
G4double safety) override;
virtual G4double ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep);
virtual G4double
ComputeTruePathLengthLimit(const G4Track& track,
G4double& currentMinimalStep) override;
virtual G4double ComputeGeomPathLength(G4double truePathLength);
virtual G4double ComputeGeomPathLength(G4double truePathLength) override;
virtual G4double ComputeTrueStepLength(G4double geomStepLength);
virtual G4double ComputeTrueStepLength(G4double geomStepLength) override;
private:
@@ -105,8 +107,8 @@ private:
inline void DefineMaterial(const G4MaterialCutsCouple*);
// hide assignment operator
G4WentzelVIRelModel & operator=(const G4WentzelVIRelModel &right);
G4WentzelVIRelModel(const G4WentzelVIRelModel&);
G4WentzelVIRelModel & operator=(const G4WentzelVIRelModel &right) = delete;
G4WentzelVIRelModel(const G4WentzelVIRelModel&) = delete;
G4LossTableManager* theManager;
G4NistManager* fNistManager;
source/processes/electromagnetic/standard/include/G4WentzelVIRelXSection.hh
+5 -4
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4WentzelVIRelXSection.hh 94676 2015-12-02 09:51:20Z gunter $
// $Id: G4WentzelVIRelXSection.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -73,7 +73,7 @@ class G4WentzelVIRelXSection
public:
G4WentzelVIRelXSection(G4bool combined = true);
explicit G4WentzelVIRelXSection(G4bool combined = true);
virtual ~G4WentzelVIRelXSection();
@@ -113,8 +113,9 @@ private:
void ComputeMaxElectronScattering(G4double cut);
// hide assignment operator
G4WentzelVIRelXSection & operator=(const G4WentzelVIRelXSection &right);
G4WentzelVIRelXSection(const G4WentzelVIRelXSection&);
G4WentzelVIRelXSection & operator=
(const G4WentzelVIRelXSection &right) = delete;
G4WentzelVIRelXSection(const G4WentzelVIRelXSection&) = delete;
const G4ParticleDefinition* theProton;
const G4ParticleDefinition* theElectron;
source/processes/electromagnetic/standard/include/G4XrayRayleighModel.hh
+2 -2
View File
@@ -44,8 +44,8 @@ class G4XrayRayleighModel : public G4VEmModel
public:
G4XrayRayleighModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "XrayRayleigh");
explicit G4XrayRayleighModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "XrayRayleigh");
virtual ~G4XrayRayleighModel();
source/processes/electromagnetic/standard/include/G4alphaIonisation.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4alphaIonisation.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4alphaIonisation.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -60,30 +60,31 @@ class G4alphaIonisation : public G4VEnergyLossProcess
{
public:
G4alphaIonisation(const G4String& name = "alphaIoni");
explicit G4alphaIonisation(const G4String& name = "alphaIoni");
virtual ~G4alphaIonisation();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*);
virtual void
InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*) override;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
const G4Material*, G4double cut);
const G4Material*, G4double cut) final;
inline G4double BetheBlochEnergyThreshold();
private:
// hide assignment operator
G4alphaIonisation & operator=(const G4alphaIonisation &right);
G4alphaIonisation(const G4alphaIonisation&);
G4alphaIonisation & operator=(const G4alphaIonisation &right) = delete;
G4alphaIonisation(const G4alphaIonisation&) = delete;
const G4ParticleDefinition* theParticle;
source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
+9 -8
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eBremsstrahlung.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4eBremsstrahlung.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -83,27 +83,28 @@ class G4eBremsstrahlung : public G4VEnergyLossProcess
public:
G4eBremsstrahlung(const G4String& name = "eBrem");
explicit G4eBremsstrahlung(const G4String& name = "eBrem");
virtual ~G4eBremsstrahlung();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*);
virtual void
InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*) override;
G4bool isInitialised;
private:
// hide assignment operator
G4eBremsstrahlung & operator=(const G4eBremsstrahlung &right);
G4eBremsstrahlung(const G4eBremsstrahlung&);
G4eBremsstrahlung & operator=(const G4eBremsstrahlung &right) = delete;
G4eBremsstrahlung(const G4eBremsstrahlung&) = delete;
};
source/processes/electromagnetic/standard/include/G4eCoulombScatteringModel.hh
+11 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eCoulombScatteringModel.hh 91612 2015-07-29 08:51:51Z gcosmo $
// $Id: G4eCoulombScatteringModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -80,14 +80,15 @@ class G4eCoulombScatteringModel : public G4VEmModel
public:
G4eCoulombScatteringModel(G4bool combined = true);
explicit G4eCoulombScatteringModel(G4bool combined = true);
virtual ~G4eCoulombScatteringModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -95,17 +96,17 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double MinPrimaryEnergy(const G4Material*,
const G4ParticleDefinition*,
G4double);
G4double) final;
// defines low energy limit of the model
inline void SetLowEnergyThreshold(G4double val);
@@ -128,8 +129,9 @@ protected:
private:
// hide assignment operator
G4eCoulombScatteringModel & operator=(const G4eCoulombScatteringModel &right);
G4eCoulombScatteringModel(const G4eCoulombScatteringModel&);
G4eCoulombScatteringModel & operator=
(const G4eCoulombScatteringModel &right) = delete;
G4eCoulombScatteringModel(const G4eCoulombScatteringModel&) = delete;
//protected:
source/processes/electromagnetic/standard/include/G4eIonisation.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eIonisation.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4eIonisation.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -82,28 +82,29 @@ class G4eIonisation : public G4VEnergyLossProcess
public:
G4eIonisation(const G4String& name = "eIoni");
explicit G4eIonisation(const G4String& name = "eIoni");
virtual ~G4eIonisation();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*);
virtual void
InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*) override;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition*,
const G4Material*, G4double cut);
const G4Material*, G4double cut) final;
private:
// hide assignment operator
G4eIonisation & operator=(const G4eIonisation &right);
G4eIonisation(const G4eIonisation&);
G4eIonisation & operator=(const G4eIonisation &right) = delete;
G4eIonisation(const G4eIonisation&) = delete;
const G4ParticleDefinition* theElectron;
source/processes/electromagnetic/standard/include/G4eMultipleScattering.hh
+5 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eMultipleScattering.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4eMultipleScattering.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -----------------------------------------------------------------------------
//
@@ -62,20 +62,20 @@ class G4eMultipleScattering : public G4VMultipleScattering
{
public: // with description
G4eMultipleScattering(const G4String& processName = "msc");
explicit G4eMultipleScattering(const G4String& processName = "msc");
virtual ~G4eMultipleScattering();
// returns true for charged particles, false otherwise
G4bool IsApplicable (const G4ParticleDefinition& p);
G4bool IsApplicable (const G4ParticleDefinition& p) final;
// Print few lines of informations about the process: validity range,
void PrintInfo();
void PrintInfo() override;
protected:
// This function initialise models
void InitialiseProcess(const G4ParticleDefinition*);
void InitialiseProcess(const G4ParticleDefinition*) override;
private: // data members
source/processes/electromagnetic/standard/include/G4eSingleCoulombScatteringModel.hh
+11 -9
View File
@@ -68,11 +68,15 @@ class G4eSingleCoulombScatteringModel : public G4VEmModel
public:
G4eSingleCoulombScatteringModel(const G4String& nam = "eSingleCoulombScat");
explicit G4eSingleCoulombScatteringModel(const G4String& nam = "eSingleCoulombScat");
virtual ~G4eSingleCoulombScatteringModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) final;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel) final;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -80,13 +84,13 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) final;
inline void SetRecoilThreshold(G4double eth);
@@ -97,8 +101,9 @@ private:
inline void SetupParticle(const G4ParticleDefinition*);
// hide assignment operator
G4eSingleCoulombScatteringModel & operator=(const G4eSingleCoulombScatteringModel &right);
G4eSingleCoulombScatteringModel(const G4eSingleCoulombScatteringModel&);
G4eSingleCoulombScatteringModel & operator=
(const G4eSingleCoulombScatteringModel &right) = delete;
G4eSingleCoulombScatteringModel(const G4eSingleCoulombScatteringModel&) = delete;
G4IonTable* theIonTable;
G4ParticleChangeForGamma* fParticleChange;
@@ -119,9 +124,6 @@ private:
G4double mass;
G4double lowEnergyLimit;
//private:
G4bool isInitialised;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
source/processes/electromagnetic/standard/include/G4eeToTwoGammaModel.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eeToTwoGammaModel.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4eeToTwoGammaModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -62,12 +62,13 @@ class G4eeToTwoGammaModel : public G4VEmModel
public:
G4eeToTwoGammaModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "eplus2gg");
explicit G4eeToTwoGammaModel(const G4ParticleDefinition* p = 0,
const G4String& nam = "eplus2gg");
virtual ~G4eeToTwoGammaModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual G4double ComputeCrossSectionPerElectron(
const G4ParticleDefinition*,
@@ -81,25 +82,25 @@ public:
G4double Z,
G4double A = 0.,
G4double cutEnergy = 0.,
G4double maxEnergy = DBL_MAX);
G4double maxEnergy = DBL_MAX) final;
virtual G4double CrossSectionPerVolume(const G4Material*,
const G4ParticleDefinition*,
G4double kineticEnergy,
G4double cutEnergy,
G4double maxEnergy);
G4double maxEnergy) final;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
private:
// hide assignment operator
G4eeToTwoGammaModel & operator=(const G4eeToTwoGammaModel &right);
G4eeToTwoGammaModel(const G4eeToTwoGammaModel&);
G4eeToTwoGammaModel & operator=(const G4eeToTwoGammaModel &right) = delete;
G4eeToTwoGammaModel(const G4eeToTwoGammaModel&) = delete;
G4double pi_rcl2;
G4ParticleDefinition* theGamma;
source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
+7 -7
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4eplusAnnihilation.hh 68797 2013-04-05 13:27:11Z gcosmo $
// $Id: G4eplusAnnihilation.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -67,27 +67,27 @@ class G4eplusAnnihilation : public G4VEmProcess
public:
G4eplusAnnihilation(const G4String& name = "annihil");
explicit G4eplusAnnihilation(const G4String& name = "annihil");
virtual ~G4eplusAnnihilation();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
virtual G4VParticleChange* AtRestDoIt(
const G4Track& track,
const G4Step& stepData);
const G4Step& stepData) override;
virtual G4double AtRestGetPhysicalInteractionLength(
const G4Track& track,
G4ForceCondition* condition
);
) override;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
protected:
virtual void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
private:
source/processes/electromagnetic/standard/include/G4hCoulombScatteringModel.hh
+11 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4hCoulombScatteringModel.hh 91612 2015-07-29 08:51:51Z gcosmo $
// $Id: G4hCoulombScatteringModel.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -69,14 +69,15 @@ class G4hCoulombScatteringModel : public G4VEmModel
public:
G4hCoulombScatteringModel(G4bool combined = true);
explicit G4hCoulombScatteringModel(G4bool combined = true);
virtual ~G4hCoulombScatteringModel();
virtual void Initialise(const G4ParticleDefinition*, const G4DataVector&);
virtual void Initialise(const G4ParticleDefinition*,
const G4DataVector&) override;
virtual void InitialiseLocal(const G4ParticleDefinition*,
G4VEmModel* masterModel);
G4VEmModel* masterModel) override;
virtual G4double ComputeCrossSectionPerAtom(
const G4ParticleDefinition*,
@@ -84,17 +85,17 @@ public:
G4double Z,
G4double A,
G4double cut,
G4double emax);
G4double emax) override;
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
const G4MaterialCutsCouple*,
const G4DynamicParticle*,
G4double tmin,
G4double maxEnergy);
G4double maxEnergy) override;
virtual G4double MinPrimaryEnergy(const G4Material*,
const G4ParticleDefinition*,
G4double);
G4double) final;
// defines low energy limit of the model
inline void SetLowEnergyThreshold(G4double val);
@@ -117,8 +118,9 @@ protected:
private:
// hide assignment operator
G4hCoulombScatteringModel & operator=(const G4hCoulombScatteringModel &right);
G4hCoulombScatteringModel(const G4hCoulombScatteringModel&);
G4hCoulombScatteringModel & operator=
(const G4hCoulombScatteringModel &right) = delete;
G4hCoulombScatteringModel(const G4hCoulombScatteringModel&) = delete;
G4IonTable* theIonTable;
G4ParticleChangeForGamma* fParticleChange;
source/processes/electromagnetic/standard/include/G4hIonisation.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4hIonisation.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4hIonisation.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -87,28 +87,29 @@ class G4hIonisation : public G4VEnergyLossProcess
public:
G4hIonisation(const G4String& name = "hIoni");
explicit G4hIonisation(const G4String& name = "hIoni");
virtual ~G4hIonisation();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) override;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
const G4Material*, G4double cut);
const G4Material*, G4double cut) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() final;
protected:
virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*);
virtual void
InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*) override;
private:
// hide assignment operator
G4hIonisation & operator=(const G4hIonisation &right);
G4hIonisation(const G4hIonisation&);
G4hIonisation & operator=(const G4hIonisation &right) = delete;
G4hIonisation(const G4hIonisation&) = delete;
G4bool isInitialised;
source/processes/electromagnetic/standard/include/G4hMultipleScattering.hh
+5 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4hMultipleScattering.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4hMultipleScattering.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -----------------------------------------------------------------------------
//
@@ -64,20 +64,20 @@ class G4hMultipleScattering : public G4VMultipleScattering
{
public: // with description
G4hMultipleScattering(const G4String& processName="msc");
explicit G4hMultipleScattering(const G4String& processName="msc");
virtual ~G4hMultipleScattering();
// returns true for charged particles, false otherwise
G4bool IsApplicable (const G4ParticleDefinition& p);
virtual G4bool IsApplicable (const G4ParticleDefinition& p) final;
// Print few lines of informations about the process: validity range,
void PrintInfo();
virtual void PrintInfo() override;
protected:
// This function initialise models
void InitialiseProcess(const G4ParticleDefinition*);
virtual void InitialiseProcess(const G4ParticleDefinition*) override;
private: // data members
source/processes/electromagnetic/standard/include/G4ionIonisation.hh
+10 -9
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ionIonisation.hh 66241 2012-12-13 18:34:42Z gunter $
// $Id: G4ionIonisation.hh 96934 2016-05-18 09:10:41Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -79,14 +79,14 @@ class G4ionIonisation : public G4VEnergyLossProcess
{
public:
G4ionIonisation(const G4String& name = "ionIoni");
explicit G4ionIonisation(const G4String& name = "ionIoni");
virtual ~G4ionIonisation();
virtual G4bool IsApplicable(const G4ParticleDefinition& p);
virtual G4bool IsApplicable(const G4ParticleDefinition& p) final;
// Print out of the class parameters
virtual void PrintInfo();
virtual void PrintInfo() override;
void AddStoppingData(G4int Z, G4int A, const G4String& materialName,
G4PhysicsVector* dVector);
@@ -95,19 +95,20 @@ public:
protected:
virtual void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*);
virtual void
InitialiseEnergyLossProcess(const G4ParticleDefinition*,
const G4ParticleDefinition*) override;
virtual G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
const G4Material*, G4double cut);
const G4Material*, G4double cut) final;
inline G4double BetheBlochEnergyThreshold();
private:
// hide assignment operator
G4ionIonisation & operator=(const G4ionIonisation &right);
G4ionIonisation(const G4ionIonisation&);
G4ionIonisation & operator=(const G4ionIonisation &right) = delete;
G4ionIonisation(const G4ionIonisation&) = delete;
G4EmCorrections* corr;