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

Import Geant4 11.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2024-12-06 11:11:40 +01:00
parent e58e650b32
commit 32390e802b
1984 changed files with 98713 additions and 83996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/include/G4Element.hh
+8 -6
View File
@@ -140,7 +140,7 @@ class G4Element
G4int GetNbOfShellElectrons(G4int index) const;
// number of isotopes constituing this element:
inline size_t GetNumberOfIsotopes() const { return fNumberOfIsotopes; }
inline std::size_t GetNumberOfIsotopes() const { return fNumberOfIsotopes; }
// vector of pointers to isotopes constituing this element:
inline G4IsotopeVector* GetIsotopeVector() const { return theIsotopeVector; }
@@ -151,12 +151,12 @@ class G4Element
inline const G4Isotope* GetIsotope(G4int iso) const { return (*theIsotopeVector)[iso]; }
// the (static) Table of Elements:
static G4ElementTable* GetElementTable();
static const G4ElementTable* GetElementTable();
static size_t GetNumberOfElements();
static std::size_t GetNumberOfElements();
// the index of this element in the Table:
inline size_t GetIndex() const { return fIndexInTable; }
inline std::size_t GetIndex() const { return fIndexInTable; }
// return pointer to an element, given its name:
static G4Element* GetElement(const G4String& name, G4bool warning = true);
@@ -188,6 +188,9 @@ class G4Element
void ComputeLradTsaiFactor();
void AddNaturalIsotopes();
// Mutable access to the element table.
static G4ElementTable& GetElementTableRef();
// Basic data members (which define an Element)
G4String fName; // name
@@ -207,8 +210,7 @@ class G4Element
// for each constituent
// Set up the static Table of Elements
static G4ElementTable theElementTable;
size_t fIndexInTable;
std::size_t fIndexInTable;
G4bool fNaturalAbundance;
// Derived data members (computed from the basic data members)
source/materials/include/G4IonisParamMat.hh
+7
View File
@@ -124,6 +124,11 @@ class G4IonisParamMat
inline void SetMeanEnergyPerIonPair(G4double value) { fMeanEnergyPerIon = value; };
inline G4double GetMeanEnergyPerIonPair() const { return fMeanEnergyPerIon; };
// parameter for sampling of positron annihilation at rest
inline void SetOrtoPositroniumFraction(G4double value) { fOrtoPositroniumFraction = value; };
inline G4double GetOrtoPositroniumFraction() const { return fOrtoPositroniumFraction; };
// operators
G4bool operator==(const G4IonisParamMat&) const = delete;
G4bool operator!=(const G4IonisParamMat&) const = delete;
@@ -186,6 +191,8 @@ class G4IonisParamMat
// average energy per ion pair
G4double fMeanEnergyPerIon;
G4double twoln10;
// parameter for sampling of positron annihilation at rest
G4double fOrtoPositroniumFraction{0.035};
// static data created only once
static G4DensityEffectData* fDensityData;
source/materials/include/G4Isotope.hh
+4 -4
View File
@@ -92,9 +92,9 @@ class G4Isotope
static const G4IsotopeTable* GetIsotopeTable();
static size_t GetNumberOfIsotopes();
static std::size_t GetNumberOfIsotopes();
size_t GetIndex() const { return fIndexInTable; }
std::size_t GetIndex() const { return fIndexInTable; }
friend std::ostream& operator<<(std::ostream&, const G4Isotope*);
@@ -114,9 +114,9 @@ class G4Isotope
G4double fA; // atomic mass of a mole
G4int fm; // isomer level
static G4IsotopeTable theIsotopeTable;
static G4IsotopeTable& GetIsotopeTableRef();
size_t fIndexInTable; // index in the Isotope table
std::size_t fIndexInTable; // index in the Isotope table
};
#endif
source/materials/include/G4Material.hh
-2
View File
@@ -284,8 +284,6 @@ class G4Material
G4bool IsLocked();
static G4MaterialTable theMaterialTable; // the material table
const G4Material* fBaseMaterial; // Pointer to the base material
G4MaterialPropertiesTable* fMaterialPropertiesTable;
source/materials/include/G4NistElementBuilder.hh
+2 -3
View File
@@ -125,7 +125,6 @@ class G4NistElementBuilder
G4Element* BuildElement(G4int Z);
private:
G4String elmSymbol[maxNumElements];
G4double atomicMass[maxNumElements]; // amu
G4double bindingEnergy[maxNumElements];
G4int nIsotopes[maxNumElements];
@@ -141,7 +140,7 @@ class G4NistElementBuilder
G4int index;
G4int verbose;
std::vector<G4String> elmNames;
std::vector<G4String> elmSymbol;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -218,7 +217,7 @@ inline G4int G4NistElementBuilder::GetNumberOfNistIsotopes(G4int Z) const
inline const std::vector<G4String>& G4NistElementBuilder::GetElementNames() const
{
return elmNames;
return elmSymbol;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/materials/include/G4NistManager.hh
+15 -14
View File
@@ -59,6 +59,8 @@
#include "G4ICRU90StoppingData.hh"
#include "G4Material.hh"
#include "G4Element.hh"
#include "G4Isotope.hh"
#include "G4NistElementBuilder.hh"
#include "G4NistMaterialBuilder.hh"
#include "G4Pow.hh"
@@ -78,7 +80,7 @@ class G4NistManager
// Get G4Element by index
//
inline G4Element* GetElement(size_t index) const;
inline G4Element* GetElement(std::size_t index) const;
// Find or build G4Element by atomic number
//
@@ -91,7 +93,7 @@ class G4NistManager
// Get number of elements
//
inline size_t GetNumberOfElements() const;
inline std::size_t GetNumberOfElements() const;
// Get atomic number by element symbol
//
@@ -159,7 +161,7 @@ class G4NistManager
// Get G4Material by index
//
inline G4Material* GetMaterial(size_t index) const;
inline G4Material* GetMaterial(std::size_t index) const;
// Find or build a G4Material by name, from the Geant4 dataBase
//
@@ -215,7 +217,7 @@ class G4NistManager
// Get number of G4Materials
//
inline size_t GetNumberOfMaterials() const;
inline std::size_t GetNumberOfMaterials() const;
inline G4int GetVerbose() const;
@@ -257,8 +259,6 @@ class G4NistManager
private:
G4NistManager();
static G4NistManager* instance;
std::vector<G4Element*> elements;
std::vector<G4Material*> materials;
@@ -267,24 +267,26 @@ class G4NistManager
G4NistMaterialBuilder* matBuilder;
G4NistMessenger* messenger;
G4Pow* g4pow;
const G4MaterialTable* theMaterialTable;
const G4ElementTable* theElementTable;
const G4IsotopeTable* theIsotopeTable;
G4double POWERA27[101];
G4double LOGAZ[101];
size_t nElements;
size_t nMaterials;
std::size_t nElements;
std::size_t nMaterials;
G4int verbose;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline size_t G4NistManager::GetNumberOfMaterials() const { return nMaterials; }
inline std::size_t G4NistManager::GetNumberOfMaterials() const { return nMaterials; }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline G4Element* G4NistManager::GetElement(size_t index) const
inline G4Element* G4NistManager::GetElement(std::size_t index) const
{
const G4ElementTable* theElementTable = G4Element::GetElementTable();
return (index < theElementTable->size()) ? (*theElementTable)[index] : nullptr;
}
@@ -308,7 +310,7 @@ inline G4Element* G4NistManager::FindOrBuildElement(const G4String& symb, G4bool
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline size_t G4NistManager::GetNumberOfElements() const { return nElements; }
inline std::size_t G4NistManager::GetNumberOfElements() const { return nElements; }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -397,9 +399,8 @@ inline void G4NistManager::PrintElement(G4int Z) const { elmBuilder->PrintElemen
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
inline G4Material* G4NistManager::GetMaterial(size_t index) const
inline G4Material* G4NistManager::GetMaterial(std::size_t index) const
{
const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
return (index < theMaterialTable->size()) ? (*theMaterialTable)[index] : nullptr;
}
source/materials/include/G4NistMessenger.hh
+4 -1
View File
@@ -66,6 +66,7 @@ class G4NistManager;
class G4UIdirectory;
class G4UIcmdWithAnInteger;
class G4UIcmdWithAString;
class G4UIcommand;
class G4NistMessenger : public G4UImessenger
{
@@ -73,7 +74,7 @@ class G4NistMessenger : public G4UImessenger
explicit G4NistMessenger(G4NistManager*);
~G4NistMessenger() override;
void SetNewValue(G4UIcommand*, G4String) final;
void SetNewValue(G4UIcommand*, G4String) override;
private:
G4NistManager* manager;
@@ -92,6 +93,8 @@ class G4NistMessenger : public G4UImessenger
G4UIcmdWithAString* g4DensCmd;
G4UIcmdWithAString* densCmd;
G4UIcmdWithAString* adensCmd;
G4UIcommand* fPosiCmd;
};
#endif