Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 107366 2017-11-09 10:55:20Z gcosmo $
|
||||
$Id: History 110571 2018-05-30 13:06:17Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,17 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
30 May 18: V.Ivant (emmuons-V10-04-02)
|
||||
- G4MuPairProductionModel - added minor protection
|
||||
|
||||
25 April 18: V.Ivant (emmuons-V10-04-01)
|
||||
- G4ePairProduction - fixed model name
|
||||
|
||||
12 February 18: V.Ivant (emmuons-V10-04-00)
|
||||
- G4MuMultipleScattering, G4MuPairProduction, G4MuIonisation,
|
||||
G4ePairProduction, G4MuBremsstrahlungModel, G4MuBremsstrahlung,
|
||||
G4MuBetheBlochModel - use default destructor
|
||||
|
||||
08 November 17: D.Sawkey (emmuons-V10-03-06)
|
||||
- G4MuMultipleScattering - modify ProcessDescription text
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBetheBlochModel.hh 97392 2016-06-02 10:10:32Z gcosmo $
|
||||
// $Id: G4MuBetheBlochModel.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -74,7 +74,7 @@ public:
|
||||
explicit G4MuBetheBlochModel(const G4ParticleDefinition* p = nullptr,
|
||||
const G4String& nam = "MuBetheBloch");
|
||||
|
||||
virtual ~G4MuBetheBlochModel();
|
||||
~G4MuBetheBlochModel() = default;
|
||||
|
||||
virtual void Initialise(const G4ParticleDefinition*,
|
||||
const G4DataVector&) override;
|
||||
@@ -136,8 +136,6 @@ private:
|
||||
G4double massSquare;
|
||||
G4double ratio;
|
||||
G4double twoln10;
|
||||
//G4double bg2lim;
|
||||
//G4double taulim;
|
||||
G4double alphaprime;
|
||||
static G4double xgi[8],wgi[8];
|
||||
};
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBremsstrahlung.hh 106716 2017-10-20 09:40:09Z gcosmo $
|
||||
// $Id: G4MuBremsstrahlung.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
|
||||
explicit G4MuBremsstrahlung(const G4String& processName = "muBrems");
|
||||
|
||||
virtual ~G4MuBremsstrahlung();
|
||||
~G4MuBremsstrahlung() = default;
|
||||
|
||||
virtual G4bool IsApplicable(const G4ParticleDefinition& p) override;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBremsstrahlungModel.hh 103220 2017-03-22 11:35:04Z gcosmo $
|
||||
// $Id: G4MuBremsstrahlungModel.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
explicit G4MuBremsstrahlungModel(const G4ParticleDefinition* p = nullptr,
|
||||
const G4String& nam = "MuBrem");
|
||||
|
||||
virtual ~G4MuBremsstrahlungModel();
|
||||
~G4MuBremsstrahlungModel() = default;
|
||||
|
||||
virtual void Initialise(const G4ParticleDefinition*,
|
||||
const G4DataVector&) override;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuIonisation.hh 106716 2017-10-20 09:40:09Z gcosmo $
|
||||
// $Id: G4MuIonisation.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -89,7 +89,7 @@ public:
|
||||
|
||||
explicit G4MuIonisation(const G4String& name = "muIoni");
|
||||
|
||||
virtual ~G4MuIonisation();
|
||||
~G4MuIonisation() = default;
|
||||
|
||||
virtual G4bool IsApplicable(const G4ParticleDefinition& p) override;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuMultipleScattering.hh 107056 2017-11-01 14:52:32Z gcosmo $
|
||||
// $Id: G4MuMultipleScattering.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
//
|
||||
@@ -64,7 +64,7 @@ public: // with description
|
||||
|
||||
explicit G4MuMultipleScattering(const G4String& processName="muMsc");
|
||||
|
||||
virtual ~G4MuMultipleScattering();
|
||||
~G4MuMultipleScattering() = default;
|
||||
|
||||
// returns true for charged particles, false otherwise
|
||||
G4bool IsApplicable (const G4ParticleDefinition& p) override;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuPairProduction.hh 106716 2017-10-20 09:40:09Z gcosmo $
|
||||
// $Id: G4MuPairProduction.hh 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
|
||||
explicit G4MuPairProduction(const G4String& processName = "muPairProd");
|
||||
|
||||
virtual ~G4MuPairProduction();
|
||||
~G4MuPairProduction() = default;
|
||||
|
||||
virtual G4bool IsApplicable(const G4ParticleDefinition& p) override;
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
|
||||
explicit G4ePairProduction(const G4String& processName = "ePairProd");
|
||||
|
||||
virtual ~G4ePairProduction();
|
||||
~G4ePairProduction() = default;
|
||||
|
||||
virtual G4bool IsApplicable(const G4ParticleDefinition& p) override;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBetheBlochModel.cc 97392 2016-06-02 10:10:32Z gcosmo $
|
||||
// $Id: G4MuBetheBlochModel.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -100,11 +100,6 @@ G4MuBetheBlochModel::G4MuBetheBlochModel(const G4ParticleDefinition* p,
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4MuBetheBlochModel::~G4MuBetheBlochModel()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4double G4MuBetheBlochModel::MinEnergyCut(const G4ParticleDefinition*,
|
||||
const G4MaterialCutsCouple* couple)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBremsstrahlung.cc 107056 2017-11-01 14:52:32Z gcosmo $
|
||||
// $Id: G4MuBremsstrahlung.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -85,11 +85,6 @@ G4MuBremsstrahlung::G4MuBremsstrahlung(const G4String& name)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4MuBremsstrahlung::~G4MuBremsstrahlung()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4bool G4MuBremsstrahlung::IsApplicable(const G4ParticleDefinition& p)
|
||||
{
|
||||
return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuBremsstrahlungModel.cc 97392 2016-06-02 10:10:32Z gcosmo $
|
||||
// $Id: G4MuBremsstrahlungModel.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -123,11 +123,6 @@ G4MuBremsstrahlungModel::G4MuBremsstrahlungModel(const G4ParticleDefinition* p,
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4MuBremsstrahlungModel::~G4MuBremsstrahlungModel()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4double G4MuBremsstrahlungModel::MinEnergyCut(const G4ParticleDefinition*,
|
||||
const G4MaterialCutsCouple*)
|
||||
{
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuIonisation.cc 107056 2017-11-01 14:52:32Z gcosmo $
|
||||
// $Id: G4MuIonisation.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -109,11 +109,6 @@ G4MuIonisation::G4MuIonisation(const G4String& name)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4MuIonisation::~G4MuIonisation()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4bool G4MuIonisation::IsApplicable(const G4ParticleDefinition& p)
|
||||
{
|
||||
return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuMultipleScattering.cc 107366 2017-11-09 10:55:20Z gcosmo $
|
||||
// $Id: G4MuMultipleScattering.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -----------------------------------------------------------------------------
|
||||
//
|
||||
@@ -62,11 +62,6 @@ G4MuMultipleScattering::G4MuMultipleScattering(const G4String& pnam)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4MuMultipleScattering::~G4MuMultipleScattering()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4bool G4MuMultipleScattering::IsApplicable (const G4ParticleDefinition& p)
|
||||
{
|
||||
return (p.GetPDGCharge() != 0.0 && !p.IsShortLived());
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuPairProduction.cc 107056 2017-11-01 14:52:32Z gcosmo $
|
||||
// $Id: G4MuPairProduction.cc 108424 2018-02-13 11:19:25Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -94,11 +94,6 @@ G4MuPairProduction::G4MuPairProduction(const G4String& name)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4MuPairProduction::~G4MuPairProduction()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4bool G4MuPairProduction::IsApplicable(const G4ParticleDefinition& p)
|
||||
{
|
||||
return (p.GetPDGCharge() != 0.0 && p.GetPDGMass() > 10.0*MeV);
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4MuPairProductionModel.cc 97392 2016-06-02 10:10:32Z gcosmo $
|
||||
// $Id: G4MuPairProductionModel.cc 110571 2018-05-30 13:06:17Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -324,7 +324,7 @@ G4double G4MuPairProductionModel::ComputeDMicroscopicCrossSection(
|
||||
G4double c3 = 0.75*sqrte*particleMass;
|
||||
if (residEnergy <= c3*z13) { return cross; }
|
||||
|
||||
G4double c7 = 4.*CLHEP::electron_mass_c2;
|
||||
static const G4double c7 = 4.*CLHEP::electron_mass_c2;
|
||||
G4double c8 = 6.*particleMass*particleMass;
|
||||
G4double alf = c7/pairEnergy;
|
||||
G4double a3 = 1. - alf;
|
||||
@@ -620,14 +620,14 @@ void G4MuPairProductionModel::SampleSecondaries(
|
||||
// the angles of e- and e+ assumed to be the same as virtual gamma
|
||||
|
||||
// create G4DynamicParticle object for the particle1
|
||||
G4double ekin = std::max(ElectronEnergy - electron_mass_c2,0.0);
|
||||
G4DynamicParticle* aParticle1 =
|
||||
new G4DynamicParticle(theElectron, gDirection,
|
||||
ElectronEnergy - electron_mass_c2);
|
||||
new G4DynamicParticle(theElectron, gDirection, ekin);
|
||||
|
||||
// create G4DynamicParticle object for the particle2
|
||||
ekin = std::max(PositronEnergy - electron_mass_c2,0.0);
|
||||
G4DynamicParticle* aParticle2 =
|
||||
new G4DynamicParticle(thePositron, gDirection,
|
||||
PositronEnergy - electron_mass_c2);
|
||||
new G4DynamicParticle(thePositron, gDirection, ekin);
|
||||
|
||||
// primary change
|
||||
kineticEnergy -= (ElectronEnergy + PositronEnergy);
|
||||
|
||||
@@ -70,11 +70,6 @@ G4ePairProduction::G4ePairProduction(const G4String& name)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4ePairProduction::~G4ePairProduction()
|
||||
{}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
G4bool G4ePairProduction::IsApplicable(const G4ParticleDefinition& p)
|
||||
{
|
||||
return (G4Electron::Electron() == &p || G4Positron::Positron() == &p);
|
||||
@@ -100,7 +95,7 @@ void G4ePairProduction::InitialiseEnergyLossProcess(
|
||||
|
||||
theParticle = part;
|
||||
|
||||
G4MuPairProductionModel* mod = new G4MuPairProductionModel(part);
|
||||
G4MuPairProductionModel* mod = new G4MuPairProductionModel(part, "ePairProd");
|
||||
SetEmModel(mod);
|
||||
|
||||
lowestKinEnergy = std::max(lowestKinEnergy, part->GetPDGMass()*8.0);
|
||||
|
||||
Reference in New Issue
Block a user