Import Geant4 11.2.0.beta source tree

This commit is contained in:
Gabriele Cosmo
2023-06-30 09:09:57 +02:00
parent aef78ca386
commit dd1f179cda
3780 changed files with 212808 additions and 142780 deletions
-21
View File
@@ -1,21 +0,0 @@
# --------------------------------------------------------------
# GNUmakefile for particles library. Gabriele Cosmo, 4/4/97.
# --------------------------------------------------------------
name := G4particles
ifndef G4INSTALL
G4INSTALL = ../..
endif
GLOBLIBS = libG4geometry.lib libG4materials.lib libG4graphics_reps.lib
GLOBLIBS += libG4intercoms.lib libG4global.lib
SUBDIRS = management bosons leptons shortlived
SUBDIRS += hadrons/mesons hadrons/barions hadrons/ions
SUBDIRS += adjoint utils
SUBLIBS = G4partman G4bosons G4leptons G4shortlived
SUBLIBS += G4mesons G4baryons G4ions
SUBLIBS += G4partadj G4partutils
include $(G4INSTALL)/config/globlib.gmk
+21 -3
View File
@@ -6,7 +6,22 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2023-02-23 Alberto Ribon (particles-V11-00-18)
## 2023-06-13 Ben Morgan (particles-V11-01-06)
- Apply core/recommended clang-tidy fixes
## 2023-06-10 Vladimir Ivanchenko (particles-V11-01-05)
- G4IonTable - attempt to fix non-reproducibility for HP physics and isometers
with floating levels
## 2023-05-25 Vladimir Ivanchenko (particles-V11-01-04)
- G4IonTable - fix GetIon(..) method for the case if the ground state level
of an isomere is floating (Geant4 Forum thread 10448); removed some
duplications in FindIon and GetIon methods - only two methods of each kind
have full implementation, others redirect calls
- G4NuclideTable - take into account floating ground state levels
- G4Ion - added protection against unphysical index of floating level
## 2023-02-23 Alberto Ribon (particles-V11-01-03)
- G4XicZero, G4AntiXicZero : updated mean lifetime values according to the
PDG-2022.
- Note: the particles' properties in Geant4 are currently consistent with
@@ -15,15 +30,18 @@ It must **not** be used as a substitute for writing good git commit messages!
Xi_c0 and Omega_c0. For this reason, only the latter two have been
updated, while the rest will be updated in the near future.
## 2023-02-07 Sandro Wenzel (particles-V11-00-17)
## 2023-02-07 Sandro Wenzel (particles-V11-01-02)
- G4OmegacZero, G4AntiOmegacZero : fixed mean lifetime according to the PDG.
Thanks to Francesco Mazzaschi of ALICE for reporting it.
## 2023-01-11 Alberto Ribon (particles-V11-00-16)
## 2023-01-11 Alberto Ribon (particles-V11-01-01)
- G4AntiNeutron : set the "PDG stable" flag to "false", as for G4Neutron
(this has no practical consequences, i.e. anti_neutron decays regardless
of this flag, but it is confusing).
## 2022-12-12 Ben Morgan (particles-V11-01-00)
- Remove obsolete GNUmakefile scripts
## 2022-11-18 Gabriele Cosmo (particles-V11-00-15)
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1
in G4IonTable.
-21
View File
@@ -1,21 +0,0 @@
# --------------------------------------------------------------
# GNUmakefile for adjoint library. Hisaya Kurashige, 06/11/08.
# --------------------------------------------------------------
name := G4partadj
ifndef G4INSTALL
G4INSTALL = ../../..
endif
include $(G4INSTALL)/config/architecture.gmk
CPPFLAGS += -DG4PARTICLES_ALLOC_EXPORT
CPPFLAGS += \
-I$(G4BASE)/global/management/include \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/particles/management/include
include $(G4INSTALL)/config/common.gmk
@@ -54,7 +54,7 @@ class G4AdjointAlpha : public G4AdjointIons
private:
static G4AdjointAlpha* theInstance;
G4AdjointAlpha(){}
~G4AdjointAlpha(){}
~G4AdjointAlpha() override= default;
public:
static G4AdjointAlpha* Definition();
@@ -54,7 +54,7 @@ class G4AdjointDeuteron : public G4AdjointIons
private:
static G4AdjointDeuteron* theInstance;
G4AdjointDeuteron(){}
~G4AdjointDeuteron(){}
~G4AdjointDeuteron() override= default;
public:
static G4AdjointDeuteron* Definition();
@@ -55,7 +55,7 @@ class G4AdjointElectron : public G4ParticleDefinition
private:
static G4AdjointElectron* theInstance;
G4AdjointElectron(){}
~G4AdjointElectron(){}
~G4AdjointElectron() override= default;
public:
static G4AdjointElectron* Definition();
@@ -55,7 +55,7 @@ class G4AdjointElectronFI : public G4ParticleDefinition
private:
static G4AdjointElectronFI* theInstance;
G4AdjointElectronFI(){}
~G4AdjointElectronFI(){}
~G4AdjointElectronFI() override= default;
public:
static G4AdjointElectronFI* Definition();
@@ -60,7 +60,7 @@ class G4AdjointGamma : public G4ParticleDefinition
G4AdjointGamma(){}
public:
~G4AdjointGamma(){}
~G4AdjointGamma() override= default;
static G4AdjointGamma* Definition();
static G4AdjointGamma* AdjointGammaDefinition();
@@ -55,7 +55,7 @@ class G4AdjointGenericIon : public G4AdjointIons
private:
static G4AdjointGenericIon* theInstance;
G4AdjointGenericIon(){}
~G4AdjointGenericIon(){}
~G4AdjointGenericIon() override= default;
public:
static G4AdjointGenericIon* Definition();
@@ -54,7 +54,7 @@ class G4AdjointHe3 : public G4AdjointIons
private:
static G4AdjointHe3* theInstance;
G4AdjointHe3(){}
~G4AdjointHe3(){}
~G4AdjointHe3() override= default;
public:
static G4AdjointHe3* Definition();
@@ -60,7 +60,7 @@ class G4AdjointIons : public G4ParticleDefinition
// the normal particle properties.
protected:
G4AdjointIons(){};
G4AdjointIons() = default;
public: //With Description
@@ -80,7 +80,7 @@ class G4AdjointIons : public G4ParticleDefinition
);
public:
virtual ~G4AdjointIons();
~G4AdjointIons() override = default;
G4AdjointIons* IonsDefinition();
G4AdjointIons* Ions();
@@ -55,7 +55,7 @@ class G4AdjointPositron : public G4ParticleDefinition
private:
static G4AdjointPositron* theInstance;
G4AdjointPositron(){}
~G4AdjointPositron(){}
~G4AdjointPositron() override= default;
public:
static G4AdjointPositron* Definition();
@@ -55,7 +55,7 @@ class G4AdjointProton : public G4ParticleDefinition
private:
static G4AdjointProton* theInstance;
G4AdjointProton(){}
~G4AdjointProton(){}
~G4AdjointProton() override= default;
public:
static G4AdjointProton* Definition();
@@ -54,7 +54,7 @@ class G4AdjointTriton : public G4AdjointIons
private:
static G4AdjointTriton* theInstance;
G4AdjointTriton(){}
~G4AdjointTriton(){}
~G4AdjointTriton() override= default;
public:
static G4AdjointTriton* Definition();
@@ -33,16 +33,16 @@
// ### ADJOINT ALPHA ###
// ######################################################################
G4AdjointAlpha* G4AdjointAlpha::theInstance = 0;
G4AdjointAlpha* G4AdjointAlpha::theInstance = nullptr;
G4AdjointAlpha* G4AdjointAlpha::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_alpha";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4AdjointIons* anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==0)
auto anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==nullptr)
{
// create particle
//
@@ -59,7 +59,7 @@ G4AdjointAlpha* G4AdjointAlpha::Definition()
0, +1, 0,
0, 0, 0,
"adjoint_nucleus", 0, +4, 1000020040,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "static", 0,
0.0
);
@@ -33,17 +33,17 @@
// ### ADJOINT DEUTERON ###
// ######################################################################
G4AdjointDeuteron* G4AdjointDeuteron::theInstance = 0;
G4AdjointDeuteron* G4AdjointDeuteron::theInstance = nullptr;
G4AdjointDeuteron* G4AdjointDeuteron::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_deuteron";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4AdjointIons* anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==0)
auto anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==nullptr)
{
// create particle
//
@@ -60,7 +60,7 @@ G4AdjointDeuteron* G4AdjointDeuteron::Definition()
2, +1, 0,
0, 0, 0,
"adjoint_nucleus", 0, +2, 1000010020,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "static", 0,
0.0
);
@@ -44,17 +44,17 @@
// ######################################################################
// ### ADJOINT ELECTRON ###
// ######################################################################
G4AdjointElectron* G4AdjointElectron::theInstance = 0;
G4AdjointElectron* G4AdjointElectron::theInstance = nullptr;
G4AdjointElectron* G4AdjointElectron::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_e-";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
@@ -79,7 +79,7 @@ G4AdjointElectron* G4AdjointElectron::Definition()
1, 0, 0,
0, 0, 0,
"adjoint", 1, 0, 10000011,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "adj_lepton"
);
// Bohr Magnetron
@@ -44,17 +44,17 @@
// ######################################################################
// ### ADJOINT ELECTRON FOR FORCED INTERACTION ###
// ######################################################################
G4AdjointElectronFI* G4AdjointElectronFI::theInstance = 0;
G4AdjointElectronFI* G4AdjointElectronFI::theInstance = nullptr;
G4AdjointElectronFI* G4AdjointElectronFI::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_e-_FI";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
@@ -79,7 +79,7 @@ G4AdjointElectronFI* G4AdjointElectronFI::Definition()
1, 0, 0,
0, 0, 0,
"adjoint", 1, 0, 90000011,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "adj_lepton"
);
// Bohr Magnetron
@@ -40,18 +40,18 @@
// ######################################################################
// ### GAMMA ###
// ######################################################################
G4AdjointGamma* G4AdjointGamma::theInstance = 0;
G4AdjointGamma* G4AdjointGamma::theInstance = nullptr;
G4AdjointGamma* G4AdjointGamma::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_gamma";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -67,7 +67,7 @@ G4AdjointGamma* G4AdjointGamma::Definition()
2, -1, -1,
0, 0, 0,
"adjoint", 0, 0, 10000022,
true, 0.0, NULL,
true, 0.0, nullptr,
false, "adj_gamma", 10000022
);
}
@@ -31,16 +31,16 @@
// ######################################################################
// ### ADJOINT GenericIon ###
// ######################################################################
G4AdjointGenericIon* G4AdjointGenericIon::theInstance = 0;
G4AdjointGenericIon* G4AdjointGenericIon::theInstance = nullptr;
G4AdjointGenericIon* G4AdjointGenericIon::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_GenericIon";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4AdjointIons* anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==0)
auto anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==nullptr)
{
// create particle
//
@@ -61,7 +61,7 @@ G4AdjointGenericIon* G4AdjointGenericIon::Definition()
1, +1, 0,
1, +1, 0,
"adjoint_nucleus", 0, +1, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "adjoint_generic", 0,
0.0
);
+5 -5
View File
@@ -33,17 +33,17 @@
// ### ADJOINT He3 ###
// ######################################################################
G4AdjointHe3* G4AdjointHe3::theInstance = 0;
G4AdjointHe3* G4AdjointHe3::theInstance = nullptr;
G4AdjointHe3* G4AdjointHe3::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_He3";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4AdjointIons* anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==0)
auto anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==nullptr)
{
// create particle
//
@@ -60,7 +60,7 @@ G4AdjointHe3* G4AdjointHe3::Definition()
1, +1, 0,
0, 0, 0,
"adjoint_nucleus", 0, +3, 1000020030,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "static", 0,
0.0
);
@@ -62,13 +62,6 @@ G4AdjointIons::G4AdjointIons(
}
G4AdjointIons::~G4AdjointIons()
{
//G4cout << "G4AdjointIons::" << GetParticleName() << G4endl;
}
G4AdjointIons* G4AdjointIons::IonsDefinition()
{
return this;
@@ -44,17 +44,17 @@
// ######################################################################
// ### ADJOINT ELECTRON ###
// ######################################################################
G4AdjointPositron* G4AdjointPositron::theInstance = 0;
G4AdjointPositron* G4AdjointPositron::theInstance = nullptr;
G4AdjointPositron* G4AdjointPositron::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_e+";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
@@ -78,7 +78,7 @@ G4AdjointPositron* G4AdjointPositron::Definition()
1, 0, 0,
0, 0, 0,
"adjoint", -1, 0, -10000011,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "adj_lepton"
);
// Bohr Magnetron
@@ -34,16 +34,16 @@
// ######################################################################
// ### PROTON ###
// ######################################################################
G4AdjointProton* G4AdjointProton::theInstance = 0;
G4AdjointProton* G4AdjointProton::theInstance = nullptr;
G4AdjointProton* G4AdjointProton::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_proton";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -62,7 +62,7 @@ G4AdjointProton* G4AdjointProton::Definition()
1, +1, 0,
1, +1, 0,
"adjoint", 0, +1, 100002212,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "adjoint_ion", 0,
0.0
);
@@ -33,16 +33,16 @@
// ### ADJOINT TRITON ###
// ######################################################################
G4AdjointTriton* G4AdjointTriton::theInstance = 0;
G4AdjointTriton* G4AdjointTriton::theInstance = nullptr;
G4AdjointTriton* G4AdjointTriton::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "adj_triton";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4AdjointIons* anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==0)
auto anInstance = static_cast<G4AdjointIons*>(pTable->FindParticle(name));
if (anInstance ==nullptr)
{
// create particle
//
@@ -59,7 +59,7 @@ G4AdjointTriton* G4AdjointTriton::Definition()
1, +1, 0,
0, 0, 0,
"adjoint_nucleus", 0, +3, 1000010030,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "static", 0,
0.0
);
-20
View File
@@ -1,20 +0,0 @@
# ----------------------------------------------------------
# GNUmakefile for bosons library. Gabriele Cosmo, 18/9/96.
# ----------------------------------------------------------
name := G4bosons
ifndef G4INSTALL
G4INSTALL = ../../..
endif
include $(G4INSTALL)/config/architecture.gmk
CPPFLAGS += -DG4PARTICLES_ALLOC_EXPORT
CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/particles/management/include
include $(G4INSTALL)/config/common.gmk
@@ -38,11 +38,6 @@
class G4BosonConstructor
{
//This class is a utility class for constructBoson
public:
G4BosonConstructor();
~G4BosonConstructor();
public:
static void ConstructParticle();
};
@@ -55,7 +55,7 @@ class G4ChargedGeantino : public G4ParticleDefinition
G4ChargedGeantino(){}
public:
~G4ChargedGeantino(){}
~G4ChargedGeantino() override= default;
static G4ChargedGeantino* Definition();
static G4ChargedGeantino* ChargedGeantinoDefinition();
+1 -1
View File
@@ -55,7 +55,7 @@ class G4Gamma : public G4ParticleDefinition
G4Gamma(){}
public:
~G4Gamma(){}
~G4Gamma() override= default;
static G4Gamma* Definition();
static G4Gamma* GammaDefinition();
@@ -55,7 +55,7 @@ class G4Geantino : public G4ParticleDefinition
G4Geantino() {}
public:
~G4Geantino(){}
~G4Geantino() override= default;
static G4Geantino* Definition();
static G4Geantino* GeantinoDefinition();
@@ -55,7 +55,7 @@ class G4OpticalPhoton : public G4ParticleDefinition
G4OpticalPhoton () {}
public:
~G4OpticalPhoton (){}
~G4OpticalPhoton () override= default;
static G4OpticalPhoton* Definition();
static G4OpticalPhoton* OpticalPhotonDefinition();
@@ -41,7 +41,7 @@ private:
G4PhononLong() {;}
public:
virtual ~G4PhononLong() {;}
~G4PhononLong() override {;}
static G4PhononLong* Definition();
static G4PhononLong* PhononDefinition();
@@ -42,7 +42,7 @@ private:
G4PhononTransFast() {;}
public:
virtual ~G4PhononTransFast() {;}
~G4PhononTransFast() override {;}
static G4PhononTransFast* Definition();
static G4PhononTransFast* PhononDefinition();
@@ -41,7 +41,7 @@ private:
G4PhononTransSlow() {;}
public:
virtual ~G4PhononTransSlow () {;}
~G4PhononTransSlow () override {;}
static G4PhononTransSlow* Definition();
static G4PhononTransSlow* PhononDefinition();
@@ -55,7 +55,7 @@ class G4UnknownParticle : public G4ParticleDefinition
G4UnknownParticle(){}
public:
~G4UnknownParticle(){}
~G4UnknownParticle() override= default;
static G4UnknownParticle* Definition();
static G4UnknownParticle* UnknownParticleDefinition();
@@ -40,15 +40,6 @@
#include "G4Gamma.hh"
#include "G4OpticalPhoton.hh"
G4BosonConstructor::G4BosonConstructor()
{
}
G4BosonConstructor::~G4BosonConstructor()
{
}
void G4BosonConstructor::ConstructParticle()
{
// pseudo-particles
@@ -43,17 +43,17 @@
// ######################################################################
// ### ChargedGeantino ###
// ######################################################################
G4ChargedGeantino* G4ChargedGeantino::theInstance = 0;
G4ChargedGeantino* G4ChargedGeantino::theInstance = nullptr;
G4ChargedGeantino* G4ChargedGeantino::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "chargedgeantino";
// search in particle table
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -69,7 +69,7 @@ G4ChargedGeantino* G4ChargedGeantino::Definition()
0, 0, 0,
0, 0, 0,
"geantino", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "geantino", 0
);
}
+4 -4
View File
@@ -42,18 +42,18 @@
// ######################################################################
// ### GAMMA ###
// ######################################################################
G4Gamma* G4Gamma::theInstance = 0;
G4Gamma* G4Gamma::theInstance = nullptr;
G4Gamma* G4Gamma::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "gamma";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -69,7 +69,7 @@ G4Gamma* G4Gamma::Definition()
2, -1, -1,
0, 0, 0,
"gamma", 0, 0, 22,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "photon", 22
);
}
+4 -4
View File
@@ -43,17 +43,17 @@
// ######################################################################
// ### GEANTINO ###
// ######################################################################
G4Geantino* G4Geantino::theInstance = 0;
G4Geantino* G4Geantino::theInstance = nullptr;
G4Geantino* G4Geantino::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "geantino";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -69,7 +69,7 @@ G4Geantino* G4Geantino::Definition()
0, 0, 0,
0, 0, 0,
"geantino", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "geantino", 0
);
}
@@ -43,17 +43,17 @@
// ######################################################################
// ### OPTICAL PHOTON ###
// ######################################################################
G4OpticalPhoton* G4OpticalPhoton::theInstance = 0;
G4OpticalPhoton* G4OpticalPhoton::theInstance = nullptr;
G4OpticalPhoton* G4OpticalPhoton::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "opticalphoton";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -69,7 +69,7 @@ G4OpticalPhoton* G4OpticalPhoton::Definition()
2, -1, -1,
0, 0, 0,
"opticalphoton", 0, 0, -22,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "photon", 0
);
}
+4 -4
View File
@@ -32,19 +32,19 @@
#include "G4ParticleTable.hh"
#include "G4SystemOfUnits.hh"
G4PhononLong* G4PhononLong::theInstance = 0;
G4PhononLong* G4PhononLong::theInstance = nullptr;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
G4PhononLong* G4PhononLong::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "phononL";
// search in particle table
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -60,7 +60,7 @@ G4PhononLong* G4PhononLong::Definition()
0, 0, 0,
0, 0, 0,
"phonon", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "phononL", 0
);
}
@@ -32,17 +32,17 @@
#include "G4ParticleTable.hh"
#include "G4SystemOfUnits.hh"
G4PhononTransFast* G4PhononTransFast::theInstance = 0;
G4PhononTransFast* G4PhononTransFast::theInstance = nullptr;
G4PhononTransFast* G4PhononTransFast::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "phononTF";
// search in particle table
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -58,7 +58,7 @@ G4PhononTransFast* G4PhononTransFast::Definition()
0, 0, 0,
0, 0, 0,
"phonon", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "phononTF", 0
);
}
@@ -32,17 +32,17 @@
#include "G4ParticleTable.hh"
#include "G4SystemOfUnits.hh"
G4PhononTransSlow* G4PhononTransSlow::theInstance = 0;
G4PhononTransSlow* G4PhononTransSlow::theInstance = nullptr;
G4PhononTransSlow* G4PhononTransSlow::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "phononTS";
// search in particle table
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -58,7 +58,7 @@ G4PhononTransSlow* G4PhononTransSlow::Definition()
0, 0, 0,
0, 0, 0,
"phonon", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "phononTS", 0
);
}
@@ -42,17 +42,17 @@
// ######################################################################
// ### Unknown Particle ###
// ######################################################################
G4UnknownParticle* G4UnknownParticle::theInstance = 0;
G4UnknownParticle* G4UnknownParticle::theInstance = nullptr;
G4UnknownParticle* G4UnknownParticle::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "unknown";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -68,7 +68,7 @@ G4UnknownParticle* G4UnknownParticle::Definition()
0, 0, 0,
0, 0, 0,
"geantino", 0, 0, 0,
true, -1.0, NULL,
true, -1.0, nullptr,
false, "geantino", 0
);
}
-15
View File
@@ -1,15 +0,0 @@
# ---------------------------------------------------------------
# Makes libraries for each subdomain: barions, ions, mesons.
# GNUmakefile for particles libraries. Gabriele Cosmo, 18/9/96.
# ---------------------------------------------------------------
SUBDIRS = barions ions mesons
all:
@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE)); done
clean:
@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) clean); done
clean_libs:
@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) clean_libs); done
@@ -1,20 +0,0 @@
# --------------------------------------------------------------
# GNUmakefile for barions library. Gabriele Cosmo, 18/9/96.
# --------------------------------------------------------------
name := G4baryons
ifndef G4INSTALL
G4INSTALL = ../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
CPPFLAGS += -DG4PARTICLES_ALLOC_EXPORT
CPPFLAGS += -I$(G4BASE)/global/management/include \
-I$(G4BASE)/global/HEPRandom/include \
-I$(G4BASE)/global/HEPGeometry/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/particles/management/include
include $(G4INSTALL)/config/common.gmk
@@ -51,7 +51,7 @@ class G4AntiLambda : public G4ParticleDefinition
private:
static G4AntiLambda* theInstance;
G4AntiLambda(){}
~G4AntiLambda(){}
~G4AntiLambda() override= default;
public:
static G4AntiLambda* Definition();
@@ -53,7 +53,7 @@ class G4AntiLambdab : public G4ParticleDefinition
private:
static G4AntiLambdab* theInstance;
G4AntiLambdab(){}
~G4AntiLambdab(){}
~G4AntiLambdab() override= default;
public:
static G4AntiLambdab* Definition();
@@ -51,7 +51,7 @@ class G4AntiLambdacPlus : public G4ParticleDefinition
private:
static G4AntiLambdacPlus* theInstance;
G4AntiLambdacPlus(){}
~G4AntiLambdacPlus(){}
~G4AntiLambdacPlus() override= default;
public:
static G4AntiLambdacPlus* Definition();
@@ -51,7 +51,7 @@ class G4AntiNeutron : public G4ParticleDefinition
private:
static G4AntiNeutron* theInstance;
G4AntiNeutron(){}
~G4AntiNeutron(){}
~G4AntiNeutron() override= default;
public:
static G4AntiNeutron* Definition();
@@ -51,7 +51,7 @@ class G4AntiOmegaMinus : public G4ParticleDefinition
private:
static G4AntiOmegaMinus* theInstance;
G4AntiOmegaMinus(){}
~G4AntiOmegaMinus(){}
~G4AntiOmegaMinus() override= default;
public:
static G4AntiOmegaMinus* Definition();
@@ -51,7 +51,7 @@ class G4AntiOmegabMinus : public G4ParticleDefinition
private:
static G4AntiOmegabMinus* theInstance;
G4AntiOmegabMinus(){}
~G4AntiOmegabMinus(){}
~G4AntiOmegabMinus() override= default;
public:
static G4AntiOmegabMinus* Definition();
@@ -51,7 +51,7 @@ class G4AntiOmegacZero : public G4ParticleDefinition
private:
static G4AntiOmegacZero* theInstance;
G4AntiOmegacZero(){}
~G4AntiOmegacZero(){}
~G4AntiOmegacZero() override= default;
public:
static G4AntiOmegacZero* Definition();
@@ -51,7 +51,7 @@ class G4AntiProton : public G4ParticleDefinition
private:
static G4AntiProton* theInstance;
G4AntiProton(){}
~G4AntiProton(){}
~G4AntiProton() override= default;
public:
static G4AntiProton* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmaMinus : public G4ParticleDefinition
private:
static G4AntiSigmaMinus* theInstance;
G4AntiSigmaMinus(){}
~G4AntiSigmaMinus(){}
~G4AntiSigmaMinus() override= default;
public:
static G4AntiSigmaMinus* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmaPlus : public G4ParticleDefinition
private:
static G4AntiSigmaPlus* theInstance;
G4AntiSigmaPlus(){}
~G4AntiSigmaPlus(){}
~G4AntiSigmaPlus() override= default;
public:
static G4AntiSigmaPlus* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmaZero : public G4ParticleDefinition
private:
static G4AntiSigmaZero* theInstance;
G4AntiSigmaZero(){}
~G4AntiSigmaZero(){}
~G4AntiSigmaZero() override= default;
public:
static G4AntiSigmaZero* Definition();
@@ -52,7 +52,7 @@ class G4AntiSigmabMinus : public G4ParticleDefinition
private:
static G4AntiSigmabMinus* theInstance;
G4AntiSigmabMinus(){}
~G4AntiSigmabMinus(){}
~G4AntiSigmabMinus() override= default;
public:
static G4AntiSigmabMinus* Definition();
@@ -52,7 +52,7 @@ class G4AntiSigmabPlus : public G4ParticleDefinition
private:
static G4AntiSigmabPlus* theInstance;
G4AntiSigmabPlus(){}
~G4AntiSigmabPlus(){}
~G4AntiSigmabPlus() override= default;
public:
static G4AntiSigmabPlus* Definition();
@@ -52,7 +52,7 @@ class G4AntiSigmabZero : public G4ParticleDefinition
private:
static G4AntiSigmabZero* theInstance;
G4AntiSigmabZero(){}
~G4AntiSigmabZero(){}
~G4AntiSigmabZero() override= default;
public:
static G4AntiSigmabZero* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmacPlus : public G4ParticleDefinition
private:
static G4AntiSigmacPlus* theInstance;
G4AntiSigmacPlus(){}
~G4AntiSigmacPlus(){}
~G4AntiSigmacPlus() override= default;
public:
static G4AntiSigmacPlus* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmacPlusPlus : public G4ParticleDefinition
private:
static G4AntiSigmacPlusPlus* theInstance;
G4AntiSigmacPlusPlus(){}
~G4AntiSigmacPlusPlus(){}
~G4AntiSigmacPlusPlus() override= default;
public:
static G4AntiSigmacPlusPlus* Definition();
@@ -51,7 +51,7 @@ class G4AntiSigmacZero : public G4ParticleDefinition
private:
static G4AntiSigmacZero* theInstance;
G4AntiSigmacZero(){}
~G4AntiSigmacZero(){}
~G4AntiSigmacZero() override= default;
public:
static G4AntiSigmacZero* Definition();
@@ -51,7 +51,7 @@ class G4AntiXiMinus : public G4ParticleDefinition
private:
static G4AntiXiMinus* theInstance;
G4AntiXiMinus(){}
~G4AntiXiMinus(){}
~G4AntiXiMinus() override= default;
public:
static G4AntiXiMinus* Definition();
@@ -51,7 +51,7 @@ class G4AntiXiZero : public G4ParticleDefinition
private:
static G4AntiXiZero* theInstance;
G4AntiXiZero(){}
~G4AntiXiZero(){}
~G4AntiXiZero() override= default;
public:
static G4AntiXiZero* Definition();
@@ -52,7 +52,7 @@ class G4AntiXibMinus : public G4ParticleDefinition
private:
static G4AntiXibMinus* theInstance;
G4AntiXibMinus(){}
~G4AntiXibMinus(){}
~G4AntiXibMinus() override= default;
public:
static G4AntiXibMinus* Definition();
@@ -52,7 +52,7 @@ class G4AntiXibZero : public G4ParticleDefinition
private:
static G4AntiXibZero* theInstance;
G4AntiXibZero(){}
~G4AntiXibZero(){}
~G4AntiXibZero() override= default;
public:
static G4AntiXibZero* Definition();
@@ -51,7 +51,7 @@ class G4AntiXicPlus : public G4ParticleDefinition
private:
static G4AntiXicPlus* theInstance;
G4AntiXicPlus(){}
~G4AntiXicPlus(){}
~G4AntiXicPlus() override= default;
public:
static G4AntiXicPlus* Definition();
@@ -51,7 +51,7 @@ class G4AntiXicZero : public G4ParticleDefinition
private:
static G4AntiXicZero* theInstance;
G4AntiXicZero(){}
~G4AntiXicZero(){}
~G4AntiXicZero() override= default;
public:
static G4AntiXicZero* Definition();
@@ -38,11 +38,6 @@
class G4BaryonConstructor
{
//This class is a utility class for construction
public:
G4BaryonConstructor();
~G4BaryonConstructor();
public:
static void ConstructParticle();
@@ -51,7 +51,7 @@ class G4Lambda : public G4ParticleDefinition
private:
static G4Lambda* theInstance;
G4Lambda(){}
~G4Lambda(){}
~G4Lambda() override= default;
public:
static G4Lambda* Definition();
@@ -53,7 +53,7 @@ class G4Lambdab : public G4ParticleDefinition
private:
static G4Lambdab* theInstance;
G4Lambdab(){}
~G4Lambdab(){}
~G4Lambdab() override= default;
public:
static G4Lambdab* Definition();
@@ -51,7 +51,7 @@ class G4LambdacPlus : public G4ParticleDefinition
private:
static G4LambdacPlus* theInstance;
G4LambdacPlus(){}
~G4LambdacPlus(){}
~G4LambdacPlus() override= default;
public:
static G4LambdacPlus* Definition();
@@ -52,7 +52,7 @@ class G4Neutron : public G4Ions
private:
static G4Neutron* theInstance;
G4Neutron(){}
~G4Neutron(){}
~G4Neutron() override= default;
public:
static G4Neutron* Definition();
@@ -51,7 +51,7 @@ class G4OmegaMinus : public G4ParticleDefinition
private:
static G4OmegaMinus* theInstance;
G4OmegaMinus(){}
~G4OmegaMinus(){}
~G4OmegaMinus() override= default;
public:
static G4OmegaMinus* Definition();
@@ -51,7 +51,7 @@ class G4OmegabMinus : public G4ParticleDefinition
private:
static G4OmegabMinus* theInstance;
G4OmegabMinus(){}
~G4OmegabMinus(){}
~G4OmegabMinus() override= default;
public:
static G4OmegabMinus* Definition();
@@ -51,7 +51,7 @@ class G4OmegacZero : public G4ParticleDefinition
private:
static G4OmegacZero* theInstance;
G4OmegacZero(){}
~G4OmegacZero(){}
~G4OmegacZero() override= default;
public:
static G4OmegacZero* Definition();
@@ -52,7 +52,7 @@ class G4Proton : public G4Ions
private:
static G4Proton* theInstance;
G4Proton(){}
~G4Proton(){}
~G4Proton() override= default;
public:
static G4Proton* Definition();
@@ -51,7 +51,7 @@ class G4SigmaMinus : public G4ParticleDefinition
private:
static G4SigmaMinus* theInstance;
G4SigmaMinus(){}
~G4SigmaMinus(){}
~G4SigmaMinus() override= default;
public:
static G4SigmaMinus* Definition();
@@ -51,7 +51,7 @@ class G4SigmaPlus : public G4ParticleDefinition
private:
static G4SigmaPlus* theInstance;
G4SigmaPlus(){}
~G4SigmaPlus(){}
~G4SigmaPlus() override= default;
public:
static G4SigmaPlus* Definition();
@@ -51,7 +51,7 @@ class G4SigmaZero : public G4ParticleDefinition
private:
static G4SigmaZero* theInstance;
G4SigmaZero(){}
~G4SigmaZero(){}
~G4SigmaZero() override= default;
public:
static G4SigmaZero* Definition();
@@ -52,7 +52,7 @@ class G4SigmabMinus : public G4ParticleDefinition
private:
static G4SigmabMinus* theInstance;
G4SigmabMinus(){}
~G4SigmabMinus(){}
~G4SigmabMinus() override= default;
public:
static G4SigmabMinus* Definition();
@@ -52,7 +52,7 @@ class G4SigmabPlus : public G4ParticleDefinition
private:
static G4SigmabPlus* theInstance;
G4SigmabPlus(){}
~G4SigmabPlus(){}
~G4SigmabPlus() override= default;
public:
static G4SigmabPlus* Definition();
@@ -52,7 +52,7 @@ class G4SigmabZero : public G4ParticleDefinition
private:
static G4SigmabZero* theInstance;
G4SigmabZero(){}
~G4SigmabZero(){}
~G4SigmabZero() override= default;
public:
static G4SigmabZero* Definition();
@@ -51,7 +51,7 @@ class G4SigmacPlus : public G4ParticleDefinition
private:
static G4SigmacPlus* theInstance;
G4SigmacPlus(){}
~G4SigmacPlus(){}
~G4SigmacPlus() override= default;
public:
static G4SigmacPlus* Definition();
@@ -51,7 +51,7 @@ class G4SigmacPlusPlus : public G4ParticleDefinition
private:
static G4SigmacPlusPlus* theInstance;
G4SigmacPlusPlus(){}
~G4SigmacPlusPlus(){}
~G4SigmacPlusPlus() override= default;
public:
static G4SigmacPlusPlus* Definition();
@@ -51,7 +51,7 @@ class G4SigmacZero : public G4ParticleDefinition
private:
static G4SigmacZero* theInstance;
G4SigmacZero(){}
~G4SigmacZero(){}
~G4SigmacZero() override= default;
public:
static G4SigmacZero* Definition();
@@ -51,7 +51,7 @@ class G4XiMinus : public G4ParticleDefinition
private:
static G4XiMinus* theInstance;
G4XiMinus(){}
~G4XiMinus(){}
~G4XiMinus() override= default;
public:
static G4XiMinus* Definition();
@@ -51,7 +51,7 @@ class G4XiZero : public G4ParticleDefinition
private:
static G4XiZero* theInstance;
G4XiZero(){}
~G4XiZero(){}
~G4XiZero() override= default;
public:
static G4XiZero* Definition();
@@ -52,7 +52,7 @@ class G4XibMinus : public G4ParticleDefinition
private:
static G4XibMinus* theInstance;
G4XibMinus(){}
~G4XibMinus(){}
~G4XibMinus() override= default;
public:
static G4XibMinus* Definition();
@@ -52,7 +52,7 @@ class G4XibZero : public G4ParticleDefinition
private:
static G4XibZero* theInstance;
G4XibZero(){}
~G4XibZero(){}
~G4XibZero() override= default;
public:
static G4XibZero* Definition();
@@ -51,7 +51,7 @@ class G4XicPlus : public G4ParticleDefinition
private:
static G4XicPlus* theInstance;
G4XicPlus(){}
~G4XicPlus(){}
~G4XicPlus() override= default;
public:
static G4XicPlus* Definition();
@@ -51,7 +51,7 @@ class G4XicZero : public G4ParticleDefinition
private:
static G4XicZero* theInstance;
G4XicZero(){}
~G4XicZero(){}
~G4XicZero() override= default;
public:
static G4XicZero* Definition();
@@ -47,16 +47,16 @@
// ### AntiLambda ###
// ######################################################################
G4AntiLambda* G4AntiLambda::theInstance = 0;
G4AntiLambda* G4AntiLambda::theInstance = nullptr;
G4AntiLambda* G4AntiLambda::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_lambda";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -73,7 +73,7 @@ G4AntiLambda* G4AntiLambda::Definition()
1, +1, 0,
0, 0, 0,
"baryon", 0, -1, -3122,
false, 0.2631*ns, NULL,
false, 0.2631*ns, nullptr,
false, "lambda");
// Magnetic Moment
@@ -81,10 +81,10 @@ G4AntiLambda* G4AntiLambda::Definition()
anInstance->SetPDGMagneticMoment( 0.613 * mN);
//create Decay Table
G4DecayTable* table = new G4DecayTable();
auto table = new G4DecayTable();
// create decay channels
G4VDecayChannel** mode = new G4VDecayChannel*[2];
auto mode = new G4VDecayChannel*[2];
// anti_lambda -> anti_proton + pi+
mode[0] = new G4PhaseSpaceDecayChannel("anti_lambda",0.639,2,"anti_proton","pi+");
// anti_lambda -> anti_neutron + pi0
@@ -47,16 +47,16 @@
// ### AntiLambdab ###
// ######################################################################
G4AntiLambdab* G4AntiLambdab::theInstance = 0;
G4AntiLambdab* G4AntiLambdab::theInstance = nullptr;
G4AntiLambdab* G4AntiLambdab::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_lambda_b";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -73,7 +73,7 @@ G4AntiLambdab* G4AntiLambdab::Definition()
1, +1, 0,
0, 0, 0,
"baryon", 0, -1, -5122,
false, 1.470e-3*ns, NULL,
false, 1.470e-3*ns, nullptr,
false, "lambda_b");
}
theInstance = static_cast<G4AntiLambdab*>(anInstance);
@@ -46,16 +46,16 @@
// ### AntiLambdacPlus ###
// ######################################################################
G4AntiLambdacPlus* G4AntiLambdacPlus::theInstance = 0;
G4AntiLambdacPlus* G4AntiLambdacPlus::theInstance = nullptr;
G4AntiLambdacPlus* G4AntiLambdacPlus::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_lambda_c+";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -72,7 +72,7 @@ G4AntiLambdacPlus* G4AntiLambdacPlus::Definition()
1, +1, 0,
0, 0, 0,
"baryon", 0, -1, -4122,
false, 0.200e-3*ns, NULL,
false, 0.200e-3*ns, nullptr,
false, "lambda_c");
// decay mode is not defined here, with expectation of pre-assigned.
@@ -47,16 +47,16 @@
// ######################################################################
// ### ANTI NEUTRON ###
// ######################################################################
G4AntiNeutron* G4AntiNeutron::theInstance = 0;
G4AntiNeutron* G4AntiNeutron::theInstance = nullptr;
G4AntiNeutron* G4AntiNeutron::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_neutron";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -75,14 +75,14 @@ G4AntiNeutron* G4AntiNeutron::Definition()
1, +1, 0,
1, +1, 0,
"baryon", 0, -1, -2112,
false, 880.2*second, NULL,
false, 880.2*second, nullptr,
false, "nucleon", 2112
);
// Magnetic Moment
G4double mN = eplus*hbar_Planck/2./(proton_mass_c2 /c_squared);
anInstance->SetPDGMagneticMoment( 1.9130427 * mN);
//create Decay Table
G4DecayTable* table = new G4DecayTable();
auto table = new G4DecayTable();
// create a decay channel
G4VDecayChannel* mode = new G4NeutronBetaDecayChannel("anti_neutron",1.00);
table->Insert(mode);
@@ -47,16 +47,16 @@
// ### AntiOmegaMinus ###
// ######################################################################
G4AntiOmegaMinus* G4AntiOmegaMinus::theInstance = 0;
G4AntiOmegaMinus* G4AntiOmegaMinus::theInstance = nullptr;
G4AntiOmegaMinus* G4AntiOmegaMinus::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_omega-";
// search in particle table
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -73,7 +73,7 @@ G4AntiOmegaMinus* G4AntiOmegaMinus::Definition()
3, +1, 0,
0, 0, 0,
"baryon", 0, -1, -3334,
false, 0.0821*ns, NULL,
false, 0.0821*ns, nullptr,
false, "omega");
// Magnetic Moment
@@ -81,10 +81,10 @@ G4AntiOmegaMinus* G4AntiOmegaMinus::Definition()
anInstance->SetPDGMagneticMoment( -2.02 * mN);
//create Decay Table
G4DecayTable* table = new G4DecayTable();
auto table = new G4DecayTable();
// create decay channels
G4VDecayChannel** mode = new G4VDecayChannel*[3];
auto mode = new G4VDecayChannel*[3];
// anti_omega- -> anti_lambda + kaon+
mode[0] = new G4PhaseSpaceDecayChannel("anti_omega-",0.678,2,"anti_lambda","kaon+");
// anti_omega- -> anti_xi0 + pi+
@@ -46,16 +46,16 @@
// ### AntiOmegabMinus ###
// ######################################################################
G4AntiOmegabMinus* G4AntiOmegabMinus::theInstance = 0;
G4AntiOmegabMinus* G4AntiOmegabMinus::theInstance = nullptr;
G4AntiOmegabMinus* G4AntiOmegabMinus::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_omega_b-";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -72,7 +72,7 @@ G4AntiOmegabMinus* G4AntiOmegabMinus::Definition()
1, +1, 0,
0, 0, 0,
"baryon", 0, -1, -5332,
false, 1.640e-3*ns, NULL,
false, 1.640e-3*ns, nullptr,
false, "omega_b");
}
theInstance = static_cast<G4AntiOmegabMinus*>(anInstance);
@@ -46,16 +46,16 @@
// ### AntiOmegacZero ###
// ######################################################################
G4AntiOmegacZero* G4AntiOmegacZero::theInstance = 0;
G4AntiOmegacZero* G4AntiOmegacZero::theInstance = nullptr;
G4AntiOmegacZero* G4AntiOmegacZero::Definition()
{
if (theInstance !=0) return theInstance;
if (theInstance !=nullptr) return theInstance;
const G4String name = "anti_omega_c0";
// search in particle table]
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
G4ParticleDefinition* anInstance = pTable->FindParticle(name);
if (anInstance ==0)
if (anInstance ==nullptr)
{
// create particle
//
@@ -72,7 +72,7 @@ G4AntiOmegacZero* G4AntiOmegacZero::Definition()
1, +1, 0,
0, 0, 0,
"baryon", 0, -1, -4332,
false, 2.68e-4*ns, NULL,
false, 2.68e-4*ns, nullptr,
false, "omega_c");
//Decay Table is not defined here, wth expectation of pre-assigned

Some files were not shown because too many files have changed in this diff Show More