Import Geant4 11.1.0.beta source tree
This commit is contained in:
@@ -294,7 +294,6 @@ public:
|
||||
G4double cutEnergy = 0.0,
|
||||
G4double maxEnergy = DBL_MAX);
|
||||
|
||||
|
||||
// to select atom cross section per volume is recomputed for each element
|
||||
const G4Element* SelectRandomAtom(const G4Material*,
|
||||
const G4ParticleDefinition*,
|
||||
@@ -303,10 +302,12 @@ public:
|
||||
G4double maxEnergy = DBL_MAX);
|
||||
|
||||
// to select atom if cross section is proportional number of electrons
|
||||
G4int SelectRandomAtomNumber(const G4Material*);
|
||||
const G4Element* GetCurrentElement(const G4Material* mat = nullptr) const;
|
||||
G4int SelectRandomAtomNumber(const G4Material*) const;
|
||||
|
||||
// select isotope in order to have precise mass of the nucleus
|
||||
G4int SelectIsotopeNumber(const G4Element*);
|
||||
const G4Isotope* GetCurrentIsotope(const G4Element* elm = nullptr) const;
|
||||
G4int SelectIsotopeNumber(const G4Element*) const;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Get/Set methods
|
||||
@@ -388,10 +389,6 @@ public:
|
||||
|
||||
inline void SetCurrentCouple(const G4MaterialCutsCouple*);
|
||||
|
||||
inline const G4Element* GetCurrentElement() const;
|
||||
|
||||
inline const G4Isotope* GetCurrentIsotope() const;
|
||||
|
||||
inline G4bool IsLocked() const;
|
||||
|
||||
inline void SetLocked(G4bool);
|
||||
@@ -415,7 +412,6 @@ private:
|
||||
G4VEmModel* fTripletModel = nullptr;
|
||||
const G4MaterialCutsCouple* fCurrentCouple = nullptr;
|
||||
const G4Element* fCurrentElement = nullptr;
|
||||
const G4Isotope* fCurrentIsotope = nullptr;
|
||||
std::vector<G4EmElementSelector*>* elmSelectors = nullptr;
|
||||
G4LossTableManager* fEmManager;
|
||||
|
||||
@@ -497,21 +493,6 @@ inline const G4MaterialCutsCouple* G4VEmModel::CurrentCouple() const
|
||||
inline void G4VEmModel::SetCurrentElement(const G4Element* elm)
|
||||
{
|
||||
fCurrentElement = elm;
|
||||
fCurrentIsotope = nullptr;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline const G4Element* G4VEmModel::GetCurrentElement() const
|
||||
{
|
||||
return fCurrentElement;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline const G4Isotope* G4VEmModel::GetCurrentIsotope() const
|
||||
{
|
||||
return fCurrentIsotope;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
@@ -569,7 +550,7 @@ G4VEmModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition* part,
|
||||
G4double cutEnergy,
|
||||
G4double maxEnergy)
|
||||
{
|
||||
SetCurrentElement(elm);
|
||||
fCurrentElement = elm;
|
||||
return ComputeCrossSectionPerAtom(part,kinEnergy,elm->GetZ(),elm->GetN(),
|
||||
cutEnergy,maxEnergy);
|
||||
}
|
||||
@@ -587,7 +568,6 @@ G4VEmModel::SelectRandomAtom(const G4MaterialCutsCouple* couple,
|
||||
fCurrentElement = (nSelectors > 0) ?
|
||||
((*elmSelectors)[couple->GetIndex()])->SelectRandomAtom(kinEnergy) :
|
||||
SelectRandomAtom(pBaseMaterial,part,kinEnergy,cutEnergy,maxEnergy);
|
||||
fCurrentIsotope = nullptr;
|
||||
return fCurrentElement;
|
||||
}
|
||||
|
||||
@@ -605,7 +585,6 @@ G4VEmModel::SelectTargetAtom(const G4MaterialCutsCouple* couple,
|
||||
fCurrentElement = (nSelectors > 0)
|
||||
? ((*elmSelectors)[couple->GetIndex()])->SelectRandomAtom(kinEnergy,logKinE)
|
||||
: SelectRandomAtom(pBaseMaterial,part,kinEnergy,cutEnergy,maxEnergy);
|
||||
fCurrentIsotope = nullptr;
|
||||
return fCurrentElement;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user