Import Geant4 11.2.0.beta source tree
This commit is contained in:
@@ -49,19 +49,19 @@ class G4DalitzDecayChannel : public G4VDecayChannel
|
||||
const G4String& theLeptonName,
|
||||
const G4String& theAntiLeptonName);
|
||||
|
||||
virtual ~G4DalitzDecayChannel();
|
||||
~G4DalitzDecayChannel() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4DalitzDecayChannel(const G4DalitzDecayChannel&);
|
||||
G4DalitzDecayChannel(const G4DalitzDecayChannel&) = default;
|
||||
G4DalitzDecayChannel& operator=(const G4DalitzDecayChannel&);
|
||||
// Copy constructor and assignment operator
|
||||
|
||||
private:
|
||||
|
||||
G4DalitzDecayChannel();
|
||||
G4DalitzDecayChannel() = default;
|
||||
|
||||
enum{idGamma=0, idLepton=1, idAntiLepton=2};
|
||||
};
|
||||
|
||||
@@ -59,10 +59,10 @@ class G4DecayTableMessenger : public G4UImessenger
|
||||
public:
|
||||
|
||||
G4DecayTableMessenger(G4ParticleTable* pTable = nullptr);
|
||||
virtual ~G4DecayTableMessenger();
|
||||
~G4DecayTableMessenger() override;
|
||||
|
||||
virtual void SetNewValue(G4UIcommand* command, G4String newValues);
|
||||
virtual G4String GetCurrentValue(G4UIcommand* command);
|
||||
void SetNewValue(G4UIcommand* command, G4String newValues) override;
|
||||
G4String GetCurrentValue(G4UIcommand* command) override;
|
||||
|
||||
G4DecayTableMessenger(const G4DecayTableMessenger&) = delete;
|
||||
G4DecayTableMessenger& operator= (const G4DecayTableMessenger&) = delete;
|
||||
|
||||
@@ -61,12 +61,12 @@ G4DynamicParticle::GetElectronOccupancy() const
|
||||
|
||||
inline G4int G4DynamicParticle::GetTotalOccupancy() const
|
||||
{
|
||||
return (theElectronOccupancy) ? theElectronOccupancy->GetTotalOccupancy() : 0;
|
||||
return (theElectronOccupancy) != nullptr ? theElectronOccupancy->GetTotalOccupancy() : 0;
|
||||
}
|
||||
|
||||
inline G4int G4DynamicParticle::GetOccupancy(G4int orbit) const
|
||||
{
|
||||
return (theElectronOccupancy) ? theElectronOccupancy->GetOccupancy(orbit) : 0;
|
||||
return (theElectronOccupancy) != nullptr ? theElectronOccupancy->GetOccupancy(orbit) : 0;
|
||||
}
|
||||
|
||||
inline void G4DynamicParticle::AddElectron(G4int orbit, G4int number)
|
||||
|
||||
@@ -46,8 +46,8 @@ class G4HyperNucleiProperties
|
||||
|
||||
public:
|
||||
|
||||
G4HyperNucleiProperties() {}
|
||||
~G4HyperNucleiProperties() {}
|
||||
G4HyperNucleiProperties() = default;
|
||||
~G4HyperNucleiProperties() = default;
|
||||
|
||||
static G4double GetAtomicMass(G4int A, G4int Z, G4int L);
|
||||
// Calculate Mass Excess of nucleus A, Z, L(number of Lambda)
|
||||
|
||||
@@ -68,7 +68,7 @@ class G4Ions : public G4ParticleDefinition
|
||||
G4int isomer = 0
|
||||
);
|
||||
|
||||
virtual ~G4Ions();
|
||||
~G4Ions() override = default;
|
||||
|
||||
inline G4Ions* IonsDefinition();
|
||||
inline G4Ions* Ions();
|
||||
@@ -100,7 +100,7 @@ class G4Ions : public G4ParticleDefinition
|
||||
|
||||
protected:
|
||||
|
||||
G4Ions();
|
||||
G4Ions() = default;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class G4IsotopeProperty
|
||||
{
|
||||
public:
|
||||
|
||||
G4IsotopeProperty();
|
||||
G4IsotopeProperty() = default;
|
||||
virtual ~G4IsotopeProperty();
|
||||
// Constructor & destructor
|
||||
|
||||
@@ -106,7 +106,7 @@ class G4IsotopeProperty
|
||||
G4DecayTable* fDecayTable = nullptr; // decay Table
|
||||
G4double fMagneticMoment = 0.0; // magnetic moment
|
||||
G4int fIsomerLevel = -1; // isomer level
|
||||
G4Ions::G4FloatLevelBase fFloatLevelBase; // floating level base
|
||||
G4Ions::G4FloatLevelBase fFloatLevelBase{G4Ions::G4FloatLevelBase::no_Float}; // floating level base
|
||||
};
|
||||
|
||||
// ------------------------
|
||||
|
||||
@@ -43,10 +43,10 @@ class G4KL3DecayChannel : public G4VDecayChannel
|
||||
const G4String& thePionName,
|
||||
const G4String& theLeptonName,
|
||||
const G4String& theNutrinoName);
|
||||
virtual ~G4KL3DecayChannel();
|
||||
~G4KL3DecayChannel() override = default;
|
||||
// Constructor & destructor
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
inline void SetDalitzParameter(G4double aLambda, G4double aXi );
|
||||
inline G4double GetDalitzParameterLambda() const;
|
||||
@@ -54,7 +54,7 @@ class G4KL3DecayChannel : public G4VDecayChannel
|
||||
|
||||
protected:
|
||||
|
||||
G4KL3DecayChannel(const G4KL3DecayChannel&);
|
||||
G4KL3DecayChannel(const G4KL3DecayChannel&) = default;
|
||||
G4KL3DecayChannel& operator=(const G4KL3DecayChannel&);
|
||||
// Copy constructor and assignment operator
|
||||
|
||||
@@ -83,7 +83,7 @@ class G4KL3DecayChannel : public G4VDecayChannel
|
||||
|
||||
private:
|
||||
|
||||
G4KL3DecayChannel();
|
||||
G4KL3DecayChannel() = default;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -46,16 +46,16 @@ class G4MuonDecayChannel : public G4VDecayChannel
|
||||
|
||||
G4MuonDecayChannel(const G4String& parentName,
|
||||
G4double BR);
|
||||
virtual ~G4MuonDecayChannel();
|
||||
~G4MuonDecayChannel() override = default;
|
||||
// Constructor & destructor
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4MuonDecayChannel();
|
||||
G4MuonDecayChannel() = default;
|
||||
|
||||
G4MuonDecayChannel(const G4MuonDecayChannel&);
|
||||
G4MuonDecayChannel(const G4MuonDecayChannel&) = default;
|
||||
G4MuonDecayChannel& operator=(const G4MuonDecayChannel&);
|
||||
// Copy constructor and assignment operator
|
||||
};
|
||||
|
||||
@@ -54,19 +54,19 @@ class G4MuonDecayChannelWithSpin : public G4MuonDecayChannel
|
||||
|
||||
G4MuonDecayChannelWithSpin(const G4String& theParentName,
|
||||
G4double theBR);
|
||||
virtual ~G4MuonDecayChannelWithSpin();
|
||||
~G4MuonDecayChannelWithSpin() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4MuonDecayChannelWithSpin(const G4MuonDecayChannelWithSpin&);
|
||||
G4MuonDecayChannelWithSpin(const G4MuonDecayChannelWithSpin&) = default;
|
||||
G4MuonDecayChannelWithSpin& operator=(const G4MuonDecayChannelWithSpin&);
|
||||
// Copy constructor and assignment operator
|
||||
|
||||
private:
|
||||
|
||||
G4MuonDecayChannelWithSpin();
|
||||
G4MuonDecayChannelWithSpin() = default;
|
||||
|
||||
// Radiative Correction Factors
|
||||
|
||||
|
||||
@@ -56,19 +56,19 @@ class G4MuonRadiativeDecayChannelWithSpin : public G4VDecayChannel
|
||||
|
||||
G4MuonRadiativeDecayChannelWithSpin(const G4String& theParentName,
|
||||
G4double theBR);
|
||||
virtual ~G4MuonRadiativeDecayChannelWithSpin();
|
||||
~G4MuonRadiativeDecayChannelWithSpin() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4MuonRadiativeDecayChannelWithSpin(const G4MuonRadiativeDecayChannelWithSpin&);
|
||||
G4MuonRadiativeDecayChannelWithSpin(const G4MuonRadiativeDecayChannelWithSpin&) = default;
|
||||
G4MuonRadiativeDecayChannelWithSpin& operator=(const G4MuonRadiativeDecayChannelWithSpin&);
|
||||
// Copy constructor and assignment operator
|
||||
|
||||
private:
|
||||
|
||||
G4MuonRadiativeDecayChannelWithSpin();
|
||||
G4MuonRadiativeDecayChannelWithSpin() = default;
|
||||
|
||||
G4double fron(G4double Pmu, G4double x, G4double y,
|
||||
G4double cthetaE, G4double cthetaG, G4double cthetaEG);
|
||||
|
||||
@@ -56,7 +56,7 @@ class G4MuonicAtom : public G4Ions
|
||||
G4double NCLifeTime = -1.0
|
||||
);
|
||||
|
||||
virtual ~G4MuonicAtom();
|
||||
~G4MuonicAtom() override = default;
|
||||
G4MuonicAtom* MuonicAtomDefinition();
|
||||
G4MuonicAtom* MuonicAtom();
|
||||
G4Ions const* GetBaseIon() const;
|
||||
|
||||
@@ -45,13 +45,13 @@ class G4NeutronBetaDecayChannel : public G4VDecayChannel
|
||||
|
||||
G4NeutronBetaDecayChannel(const G4String& theParentName,
|
||||
G4double theBR);
|
||||
virtual ~G4NeutronBetaDecayChannel();
|
||||
~G4NeutronBetaDecayChannel() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4NeutronBetaDecayChannel();
|
||||
G4NeutronBetaDecayChannel() = default;
|
||||
|
||||
G4NeutronBetaDecayChannel(const G4NeutronBetaDecayChannel&);
|
||||
G4NeutronBetaDecayChannel& operator=(const G4NeutronBetaDecayChannel&);
|
||||
|
||||
@@ -45,8 +45,8 @@ class G4NucleiProperties
|
||||
{
|
||||
public:
|
||||
|
||||
G4NucleiProperties() {}
|
||||
~G4NucleiProperties() {}
|
||||
G4NucleiProperties() = default;
|
||||
~G4NucleiProperties() = default;
|
||||
|
||||
static G4double GetNuclearMass(const G4double A, const G4double Z);
|
||||
static G4double GetNuclearMass(const G4int A, const G4int Z);
|
||||
|
||||
@@ -52,7 +52,7 @@ class G4NucleiPropertiesTableAME12
|
||||
{
|
||||
public:
|
||||
|
||||
~G4NucleiPropertiesTableAME12() {}
|
||||
~G4NucleiPropertiesTableAME12() = default;
|
||||
// Destructor
|
||||
|
||||
enum {nEntries = 3353,MaxA = 295, ZMax = 120};
|
||||
@@ -63,7 +63,7 @@ class G4NucleiPropertiesTableAME12
|
||||
|
||||
private:
|
||||
|
||||
G4NucleiPropertiesTableAME12();
|
||||
G4NucleiPropertiesTableAME12() = default;
|
||||
// Default constructor - this class should only be created once!
|
||||
|
||||
static G4double GetMassExcess(G4int Z, G4int A);
|
||||
|
||||
@@ -44,7 +44,7 @@ class G4NucleiPropertiesTheoreticalTable
|
||||
{
|
||||
public:
|
||||
|
||||
~G4NucleiPropertiesTheoreticalTable(){}
|
||||
~G4NucleiPropertiesTheoreticalTable()= default;
|
||||
|
||||
enum {nEntries = 8979, shortTableSize = 137};
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ class G4NuclideTable : public G4VIsotopeTable
|
||||
|
||||
using G4IsotopeList = std::vector<G4IsotopeProperty*>;
|
||||
|
||||
virtual ~G4NuclideTable();
|
||||
~G4NuclideTable() override;
|
||||
|
||||
G4NuclideTable (const G4NuclideTable&) = delete;
|
||||
G4NuclideTable& operator = (const G4NuclideTable&) = delete;
|
||||
@@ -83,10 +83,10 @@ class G4NuclideTable : public G4VIsotopeTable
|
||||
|
||||
inline std::size_t GetSizeOfIsotopeList();
|
||||
|
||||
virtual G4IsotopeProperty* GetIsotope(G4int Z, G4int A, G4double E,
|
||||
G4Ions::G4FloatLevelBase flb=G4Ions::G4FloatLevelBase::no_Float);
|
||||
virtual G4IsotopeProperty* GetIsotopeByIsoLvl(G4int Z, G4int A,
|
||||
G4int lvl=0);
|
||||
G4IsotopeProperty* GetIsotope(G4int Z, G4int A, G4double E,
|
||||
G4Ions::G4FloatLevelBase flb=G4Ions::G4FloatLevelBase::no_Float) override;
|
||||
G4IsotopeProperty* GetIsotopeByIsoLvl(G4int Z, G4int A,
|
||||
G4int lvl=0) override;
|
||||
// It will replace the pure virtual one in the abstract base class.
|
||||
// Z: Atomic Number
|
||||
// A: Atomic Mass
|
||||
@@ -171,20 +171,20 @@ G4double G4NuclideTable::GetLevelTolerance()
|
||||
inline
|
||||
std::size_t G4NuclideTable::GetSizeOfIsotopeList()
|
||||
{
|
||||
return (fIsotopeList ? fIsotopeList->size() : static_cast<size_t>(0) );
|
||||
return (fIsotopeList != nullptr ? fIsotopeList->size() : static_cast<size_t>(0) );
|
||||
}
|
||||
|
||||
inline
|
||||
std::size_t G4NuclideTable::entries() const
|
||||
{
|
||||
return (fIsotopeList ? fIsotopeList->size() : std::size_t(0) );
|
||||
return (fIsotopeList != nullptr ? fIsotopeList->size() : std::size_t(0) );
|
||||
}
|
||||
|
||||
inline
|
||||
G4IsotopeProperty* G4NuclideTable::GetIsotopeByIndex(std::size_t idx) const
|
||||
{
|
||||
if (fIsotopeList && idx<fIsotopeList->size() ) return (*fIsotopeList)[idx];
|
||||
else return nullptr;
|
||||
if ((fIsotopeList != nullptr) && idx<fIsotopeList->size() ) return (*fIsotopeList)[idx];
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -51,12 +51,12 @@ class G4NuclideTableMessenger : public G4UImessenger
|
||||
public:
|
||||
|
||||
G4NuclideTableMessenger(G4NuclideTable* nuclideTable = nullptr);
|
||||
virtual ~G4NuclideTableMessenger();
|
||||
~G4NuclideTableMessenger() override;
|
||||
|
||||
G4NuclideTableMessenger(const G4NuclideTableMessenger&) = delete;
|
||||
G4NuclideTableMessenger& operator=(const G4NuclideTableMessenger&) = delete;
|
||||
|
||||
virtual void SetNewValue(G4UIcommand* command, G4String newValues);
|
||||
void SetNewValue(G4UIcommand* command, G4String newValues) override;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ class G4PDGCodeChecker
|
||||
public:
|
||||
|
||||
G4PDGCodeChecker();
|
||||
~G4PDGCodeChecker();
|
||||
~G4PDGCodeChecker() = default;
|
||||
|
||||
G4int CheckPDGCode(G4int code, const G4String& type);
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ class G4PDefManager
|
||||
|
||||
private:
|
||||
|
||||
G4int totalobj;
|
||||
G4int totalobj{0};
|
||||
G4Mutex mutex;
|
||||
};
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ G4bool G4ParticleDefinition::GetPDGStable() const
|
||||
{
|
||||
if(IsGeneralIon())
|
||||
{ return (GetIonLifeTime()<0.); }
|
||||
else
|
||||
{ return thePDGStable; }
|
||||
|
||||
return thePDGStable;
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -216,8 +216,7 @@ G4int G4ParticleDefinition::GetParticleDefinitionID() const
|
||||
inline
|
||||
G4bool G4ParticleDefinition::IsHypernucleus() const
|
||||
{
|
||||
if ( GetNumberOfLambdasInHypernucleus() > 0 ) return true;
|
||||
return false;
|
||||
return GetNumberOfLambdasInHypernucleus() > 0;
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -234,8 +233,7 @@ G4int G4ParticleDefinition::GetNumberOfLambdasInHypernucleus() const
|
||||
inline
|
||||
G4bool G4ParticleDefinition::IsAntiHypernucleus() const
|
||||
{
|
||||
if ( GetNumberOfAntiLambdasInAntiHypernucleus() > 0 ) return true;
|
||||
return false;
|
||||
return GetNumberOfAntiLambdasInAntiHypernucleus() > 0;
|
||||
}
|
||||
|
||||
inline
|
||||
|
||||
@@ -77,13 +77,13 @@ class G4ParticleMessenger : public G4UImessenger
|
||||
public:
|
||||
|
||||
G4ParticleMessenger(G4ParticleTable* pTable = nullptr);
|
||||
virtual ~G4ParticleMessenger();
|
||||
~G4ParticleMessenger() override;
|
||||
|
||||
G4ParticleMessenger(const G4ParticleMessenger&) = delete;
|
||||
G4ParticleMessenger& operator=(const G4ParticleMessenger&) = delete;
|
||||
|
||||
void SetNewValue(G4UIcommand* command, G4String newValues);
|
||||
G4String GetCurrentValue(G4UIcommand* command);
|
||||
void SetNewValue(G4UIcommand* command, G4String newValues) override;
|
||||
G4String GetCurrentValue(G4UIcommand* command) override;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ class G4ParticlePropertyData
|
||||
|
||||
G4ParticlePropertyData(const G4ParticlePropertyData& right);
|
||||
|
||||
virtual ~G4ParticlePropertyData();
|
||||
virtual ~G4ParticlePropertyData() = default;
|
||||
|
||||
G4ParticlePropertyData& operator=(const G4ParticlePropertyData& right);
|
||||
|
||||
|
||||
@@ -47,10 +47,9 @@ G4int G4ParticlePropertyData::GetQuarkContent(G4int flavor) const
|
||||
{
|
||||
return theQuarkContent[flavor-1];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -60,10 +59,9 @@ G4int G4ParticlePropertyData::GetAntiQuarkContent(G4int flavor) const
|
||||
{
|
||||
return theAntiQuarkContent[flavor-1];
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
inline
|
||||
|
||||
@@ -60,13 +60,13 @@ class G4ParticlePropertyMessenger : public G4UImessenger
|
||||
public:
|
||||
|
||||
G4ParticlePropertyMessenger(G4ParticleTable* pTable = nullptr);
|
||||
virtual ~G4ParticlePropertyMessenger();
|
||||
~G4ParticlePropertyMessenger() override;
|
||||
|
||||
G4ParticlePropertyMessenger(const G4ParticlePropertyMessenger&) = delete;
|
||||
G4ParticlePropertyMessenger& operator=(const G4ParticlePropertyMessenger&) = delete;
|
||||
|
||||
virtual void SetNewValue(G4UIcommand* command, G4String newValues);
|
||||
virtual G4String GetCurrentValue(G4UIcommand* command);
|
||||
void SetNewValue(G4UIcommand* command, G4String newValues) override;
|
||||
G4String GetCurrentValue(G4UIcommand* command) override;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ template < class K, class V > class G4ParticleTableIterator
|
||||
{
|
||||
if(!defined) return false;
|
||||
++it;
|
||||
return it!=mydict->end() ? true : false;
|
||||
return static_cast<bool>(it!=mydict->end());
|
||||
}
|
||||
|
||||
G4bool operator()()
|
||||
|
||||
@@ -54,7 +54,7 @@ class G4ParticlesWorkspace
|
||||
using pool_type = G4TWorkspacePool<G4ParticlesWorkspace>;
|
||||
|
||||
G4ParticlesWorkspace(G4bool verbose=false);
|
||||
~G4ParticlesWorkspace();
|
||||
~G4ParticlesWorkspace() = default;
|
||||
|
||||
void UseWorkspace(); // Take ownership
|
||||
void ReleaseWorkspace(); // Release ownership
|
||||
|
||||
@@ -56,7 +56,7 @@ class G4PhaseSpaceDecayChannel : public G4VDecayChannel
|
||||
const G4String& theDaughterName5 = "" );
|
||||
// Constructors
|
||||
|
||||
virtual ~G4PhaseSpaceDecayChannel();
|
||||
~G4PhaseSpaceDecayChannel() override = default;
|
||||
// Destructor
|
||||
|
||||
G4bool SetDaughterMasses( G4double masses[]);
|
||||
@@ -65,8 +65,8 @@ class G4PhaseSpaceDecayChannel : public G4VDecayChannel
|
||||
|
||||
G4bool SampleDaughterMasses();
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4bool IsOKWithParentMass(G4double parentMass);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
G4bool IsOKWithParentMass(G4double parentMass) override;
|
||||
|
||||
static G4double Pmx(G4double e, G4double p1, G4double p2);
|
||||
|
||||
|
||||
@@ -49,15 +49,15 @@ class G4PionRadiativeDecayChannel : public G4VDecayChannel
|
||||
|
||||
G4PionRadiativeDecayChannel(const G4String& theParentName,
|
||||
G4double theBR);
|
||||
virtual ~G4PionRadiativeDecayChannel();
|
||||
~G4PionRadiativeDecayChannel() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4PionRadiativeDecayChannel();
|
||||
G4PionRadiativeDecayChannel() = default;
|
||||
|
||||
G4PionRadiativeDecayChannel(const G4PionRadiativeDecayChannel&);
|
||||
G4PionRadiativeDecayChannel(const G4PionRadiativeDecayChannel&) = default;
|
||||
G4PionRadiativeDecayChannel& operator=(const G4PionRadiativeDecayChannel&);
|
||||
// Copy constructor and assignment operator
|
||||
};
|
||||
|
||||
@@ -236,7 +236,7 @@ inline
|
||||
G4double G4PrimaryParticle::GetTotalMomentum() const
|
||||
{
|
||||
if (mass<0.) return kinE;
|
||||
else return std::sqrt(kinE*(kinE+2.*mass));
|
||||
return std::sqrt(kinE*(kinE+2.*mass));
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -278,7 +278,7 @@ G4double G4PrimaryParticle::GetPz() const
|
||||
inline G4double G4PrimaryParticle::GetTotalEnergy() const
|
||||
{
|
||||
if (mass<0.) return kinE;
|
||||
else return kinE+mass;
|
||||
return kinE+mass;
|
||||
}
|
||||
|
||||
inline
|
||||
|
||||
@@ -50,7 +50,7 @@ class G4PrimaryVertex
|
||||
{
|
||||
public:
|
||||
|
||||
G4PrimaryVertex();
|
||||
G4PrimaryVertex() = default;
|
||||
G4PrimaryVertex(G4double x0,G4double y0,G4double z0,G4double t0);
|
||||
G4PrimaryVertex(G4ThreeVector xyz0, G4double t0);
|
||||
// Constructors
|
||||
|
||||
@@ -47,15 +47,15 @@ class G4TauLeptonicDecayChannel : public G4VDecayChannel
|
||||
G4TauLeptonicDecayChannel(const G4String& theParentName,
|
||||
G4double theBR,
|
||||
const G4String& theLeptonName);
|
||||
virtual ~G4TauLeptonicDecayChannel();
|
||||
~G4TauLeptonicDecayChannel() override = default;
|
||||
|
||||
virtual G4DecayProducts* DecayIt(G4double);
|
||||
G4DecayProducts* DecayIt(G4double) override;
|
||||
|
||||
protected:
|
||||
|
||||
G4TauLeptonicDecayChannel();
|
||||
G4TauLeptonicDecayChannel() = default;
|
||||
|
||||
G4TauLeptonicDecayChannel(const G4TauLeptonicDecayChannel&);
|
||||
G4TauLeptonicDecayChannel(const G4TauLeptonicDecayChannel&) = default;
|
||||
G4TauLeptonicDecayChannel& operator=(const G4TauLeptonicDecayChannel&);
|
||||
|
||||
private:
|
||||
|
||||
@@ -208,13 +208,12 @@ G4ParticleDefinition* G4VDecayChannel::GetDaughter(G4int anIndex)
|
||||
{
|
||||
return G4MT_daughters[anIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
if (verboseLevel>0)
|
||||
|
||||
if (verboseLevel>0)
|
||||
G4cout << "G4VDecayChannel::GetDaughter index out of range "
|
||||
<< anIndex << G4endl;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -224,15 +223,14 @@ const G4String& G4VDecayChannel::GetDaughterName(G4int anIndex) const
|
||||
{
|
||||
return *daughters_name[anIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
if (verboseLevel>0)
|
||||
|
||||
if (verboseLevel>0)
|
||||
{
|
||||
G4cout << "G4VDecayChannel::GetDaughterName ";
|
||||
G4cout << "index out of range " << anIndex << G4endl;
|
||||
}
|
||||
return GetNoName();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -242,15 +240,14 @@ G4double G4VDecayChannel::GetDaughterMass(G4int anIndex) const
|
||||
{
|
||||
return G4MT_daughters_mass[anIndex];
|
||||
}
|
||||
else
|
||||
{
|
||||
if (verboseLevel>0)
|
||||
|
||||
if (verboseLevel>0)
|
||||
{
|
||||
G4cout << "G4VDecayChannel::GetDaughterMass ";
|
||||
G4cout << "index out of range " << anIndex << G4endl;
|
||||
}
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline
|
||||
@@ -277,7 +274,7 @@ G4double G4VDecayChannel::GetParentMass() const
|
||||
inline
|
||||
void G4VDecayChannel::SetParent(const G4String& particle_name)
|
||||
{
|
||||
if (parent_name != nullptr) delete parent_name;
|
||||
delete parent_name;
|
||||
parent_name = new G4String(particle_name);
|
||||
G4MT_parent = nullptr;
|
||||
}
|
||||
|
||||
@@ -45,15 +45,15 @@ class G4VIsotopeTable
|
||||
{
|
||||
public:
|
||||
|
||||
G4VIsotopeTable();
|
||||
G4VIsotopeTable() = default;
|
||||
explicit G4VIsotopeTable(const G4String&);
|
||||
// Constructors
|
||||
|
||||
G4VIsotopeTable(const G4VIsotopeTable&);
|
||||
G4VIsotopeTable(const G4VIsotopeTable&) = default;
|
||||
G4VIsotopeTable& operator=(const G4VIsotopeTable&);
|
||||
// Copy contructor and assignment operator
|
||||
|
||||
virtual ~G4VIsotopeTable();
|
||||
virtual ~G4VIsotopeTable() = default;
|
||||
// Destructor
|
||||
|
||||
virtual G4IsotopeProperty* GetIsotope(G4int Z, G4int A, G4double E,
|
||||
|
||||
@@ -44,8 +44,8 @@ class G4VUserPrimaryParticleInformation
|
||||
{
|
||||
public:
|
||||
|
||||
G4VUserPrimaryParticleInformation();
|
||||
virtual ~G4VUserPrimaryParticleInformation();
|
||||
G4VUserPrimaryParticleInformation() = default;
|
||||
virtual ~G4VUserPrimaryParticleInformation() = default;
|
||||
|
||||
virtual void Print() const = 0;
|
||||
};
|
||||
|
||||
@@ -44,8 +44,8 @@ class G4VUserPrimaryVertexInformation
|
||||
{
|
||||
public:
|
||||
|
||||
G4VUserPrimaryVertexInformation();
|
||||
virtual ~G4VUserPrimaryVertexInformation();
|
||||
G4VUserPrimaryVertexInformation() = default;
|
||||
virtual ~G4VUserPrimaryVertexInformation() = default;
|
||||
|
||||
virtual void Print() const = 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user