Import Geant4 11.1.0 source tree
This commit is contained in:
@@ -264,6 +264,8 @@ public:
|
||||
|
||||
void SetVerbose(G4int val);
|
||||
|
||||
inline void SetApplySmoothing(G4int val);
|
||||
|
||||
// hide copy and assign
|
||||
G4EmCalculator & operator=(const G4EmCalculator &right) = delete;
|
||||
G4EmCalculator(const G4EmCalculator&) = delete;
|
||||
@@ -282,8 +284,6 @@ private:
|
||||
const G4String& processName,
|
||||
G4double kinEnergy);
|
||||
|
||||
G4VEnergyLossProcess* FindEnergyLossProcess(const G4ParticleDefinition*);
|
||||
|
||||
G4VEnergyLossProcess* FindEnLossProcess(const G4ParticleDefinition*,
|
||||
const G4String& processName);
|
||||
|
||||
@@ -334,6 +334,7 @@ private:
|
||||
|
||||
G4bool isIon = false;
|
||||
G4bool isApplicable = false;
|
||||
G4bool applySmoothing = true;
|
||||
|
||||
std::vector<const G4Material*> localMaterials;
|
||||
std::vector<const G4MaterialCutsCouple*> localCouples;
|
||||
@@ -554,4 +555,11 @@ G4double G4EmCalculator::ComputeMeanFreePath(G4double kinEnergy,
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline void G4EmCalculator::SetApplySmoothing(G4int val)
|
||||
{
|
||||
applySmoothing = val;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
// G4EmFluoDirectory.hh
|
||||
//
|
||||
// Class Description:
|
||||
// This is an enumerator to define directory for fluorescence data
|
||||
//
|
||||
// Creation date: 19.10.2022
|
||||
// Modifications:
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
|
||||
#ifndef G4EmFluoDirectory_h
|
||||
#define G4EmFluoDirectory_h 1
|
||||
|
||||
enum G4EmFluoDirectory
|
||||
{
|
||||
fluoDefault = 0,
|
||||
fluoBearden,
|
||||
fluoANSTO,
|
||||
fluoXDB_EADL
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -50,6 +50,7 @@
|
||||
|
||||
#include "globals.hh"
|
||||
#include "G4DNAModelSubType.hh"
|
||||
#include "G4EmFluoDirectory.hh"
|
||||
#include <vector>
|
||||
|
||||
class G4EmLowEParametersMessenger;
|
||||
@@ -69,11 +70,12 @@ public:
|
||||
void SetFluo(G4bool val);
|
||||
G4bool Fluo() const;
|
||||
|
||||
void SetBeardenFluoDir(G4bool val);
|
||||
G4bool BeardenFluoDir() const;
|
||||
G4EmFluoDirectory FluoDirectory() const;
|
||||
|
||||
void SetFluoDirectory(G4EmFluoDirectory val);
|
||||
void SetBeardenFluoDir(G4bool val);
|
||||
void SetANSTOFluoDir(G4bool val);
|
||||
G4bool ANSTOFluoDir() const;
|
||||
void SetXDB_EADLFluoDir(G4bool val);
|
||||
|
||||
void SetAuger(G4bool val);
|
||||
G4bool Auger() const;
|
||||
@@ -134,8 +136,6 @@ private:
|
||||
G4EmLowEParametersMessenger* theMessenger;
|
||||
|
||||
G4bool fluo;
|
||||
G4bool beardenFluoDir;
|
||||
G4bool fANSTOFluoDir;
|
||||
G4bool auger;
|
||||
G4bool pixe;
|
||||
G4bool deexIgnoreCut;
|
||||
@@ -144,7 +144,9 @@ private:
|
||||
G4bool dnaStationary;
|
||||
G4bool dnaMsc;
|
||||
|
||||
G4DNAModelSubType dnaElectronSolvation;
|
||||
G4DNAModelSubType dnaElectronSolvation;
|
||||
|
||||
G4EmFluoDirectory fFluoDirectory;
|
||||
|
||||
G4String namePIXE;
|
||||
G4String nameElectronPIXE;
|
||||
|
||||
@@ -93,6 +93,7 @@ private:
|
||||
G4UIcmdWithAString* pixeeXsCmd;
|
||||
G4UIcmdWithAString* livCmd;
|
||||
G4UIcmdWithAString* dnaSolCmd;
|
||||
G4UIcmdWithAString* direFluoCmd;
|
||||
|
||||
G4UIcmdWithAString* meCmd;
|
||||
G4UIcommand* dnaCmd;
|
||||
|
||||
@@ -168,17 +168,17 @@ public:
|
||||
|
||||
// Get model pointer from the model list for a given material cuts couple
|
||||
// no check on material cuts couple index
|
||||
G4VEmModel* GetRegionModel(G4int idx, size_t index_couple);
|
||||
G4VEmModel* GetRegionModel(G4int idx, std::size_t index_couple);
|
||||
|
||||
// total number of models for material cut couples
|
||||
// no check on material cuts couple index
|
||||
G4int NumberOfRegionModels(size_t index_couple) const;
|
||||
G4int NumberOfRegionModels(std::size_t index_couple) const;
|
||||
|
||||
// Automatic documentation
|
||||
void DumpModelList(std::ostream& out, G4int verb);
|
||||
|
||||
// Select model for given material cuts couple index
|
||||
inline G4VEmModel* SelectModel(G4double energy, size_t index);
|
||||
inline G4VEmModel* SelectModel(G4double energy, std::size_t index);
|
||||
|
||||
// Access to cuts
|
||||
inline const G4DataVector* Cuts() const;
|
||||
@@ -224,7 +224,7 @@ private:
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline
|
||||
G4VEmModel* G4EmModelManager::SelectModel(G4double kinEnergy, size_t index)
|
||||
G4VEmModel* G4EmModelManager::SelectModel(G4double kinEnergy, std::size_t index)
|
||||
{
|
||||
if(severalModels) {
|
||||
if(nRegions > 1) {
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
#include "G4MscStepLimitType.hh"
|
||||
#include "G4NuclearFormfactorType.hh"
|
||||
#include "G4DNAModelSubType.hh"
|
||||
#include "G4EmFluoDirectory.hh"
|
||||
#include "G4EmSaturation.hh"
|
||||
#include "G4ThreeVector.hh"
|
||||
#include <vector>
|
||||
@@ -124,11 +125,15 @@ public:
|
||||
void SetFluo(G4bool val);
|
||||
G4bool Fluo() const;
|
||||
|
||||
void SetBeardenFluoDir(G4bool val);
|
||||
G4bool BeardenFluoDir() const;
|
||||
G4EmFluoDirectory FluoDirectory() const;
|
||||
|
||||
void SetFluoDirectory(G4EmFluoDirectory);
|
||||
void SetBeardenFluoDir(G4bool val);
|
||||
void SetANSTOFluoDir(G4bool val);
|
||||
G4bool ANSTOFluoDir() const;
|
||||
void SetXDB_EADLFluoDir(G4bool val);
|
||||
|
||||
G4bool BeardenFluoDir();
|
||||
G4bool ANSTOFluoDir();
|
||||
|
||||
void SetAuger(G4bool val);
|
||||
void SetAugerCascade(G4bool val) { SetAuger(val); };
|
||||
@@ -197,6 +202,9 @@ public:
|
||||
G4bool RetrieveMuDataFromFile() const;
|
||||
void SetRetrieveMuDataFromFile(G4bool v);
|
||||
|
||||
G4bool PhotoeffectBelowKShell() const;
|
||||
void SetPhotoeffectBelowKShell(G4bool v);
|
||||
|
||||
// 5d
|
||||
void SetOnIsolated(G4bool val);
|
||||
G4bool OnIsolated() const;
|
||||
@@ -412,6 +420,7 @@ private:
|
||||
G4bool fSamplingTable;
|
||||
G4bool fPolarisation;
|
||||
G4bool fMuDataFromFile;
|
||||
G4bool fPEKShell;
|
||||
G4bool onIsolated; // 5d model conversion on free ions
|
||||
G4bool fDNA;
|
||||
G4bool fIsPrinted;
|
||||
|
||||
@@ -103,6 +103,7 @@ private:
|
||||
G4UIcmdWithABool* sampleTCmd;
|
||||
G4UIcmdWithABool* icru90Cmd;
|
||||
G4UIcmdWithABool* mudatCmd;
|
||||
G4UIcmdWithABool* peKCmd;
|
||||
|
||||
G4UIcmdWithADoubleAndUnit* minEnCmd;
|
||||
G4UIcmdWithADoubleAndUnit* maxEnCmd;
|
||||
|
||||
@@ -68,7 +68,9 @@ enum G4EmProcessSubType
|
||||
fSynchrotronRadiation = 23,
|
||||
fTransitionRadiation = 24,
|
||||
|
||||
fSurfaceReflection = 25
|
||||
fSurfaceReflection = 25,
|
||||
fDarkBremsstrahlung = 40,
|
||||
fMuonPairProdByCharged = 49
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -208,7 +208,7 @@ protected:
|
||||
G4PhysicsVector* LambdaPhysicsVector(const G4MaterialCutsCouple*,
|
||||
G4double cut);
|
||||
|
||||
inline size_t CurrentMaterialCutsCoupleIndex() const;
|
||||
inline std::size_t CurrentMaterialCutsCoupleIndex() const;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Specific methods to set, access, modify models
|
||||
@@ -221,7 +221,7 @@ public:
|
||||
// Select model by energy and couple index
|
||||
// Not for run time processing
|
||||
inline G4VEmModel* SelectModelForMaterial(G4double kinEnergy,
|
||||
size_t& idxCouple) const;
|
||||
std::size_t& idxCouple) const;
|
||||
|
||||
// Add EM model coupled with fluctuation model for region, smaller value
|
||||
// of order defines which pair of models will be selected for a given
|
||||
@@ -235,13 +235,13 @@ public:
|
||||
void SetEmModel(G4VEmModel*, G4int index=0);
|
||||
|
||||
// Access to models
|
||||
inline size_t NumberOfModels() const;
|
||||
inline std::size_t NumberOfModels() const;
|
||||
|
||||
// Return a model from the local list
|
||||
inline G4VEmModel* EmModel(size_t index=0) const;
|
||||
inline G4VEmModel* EmModel(std::size_t index=0) const;
|
||||
|
||||
// Access to models from G4EmModelManager list
|
||||
inline G4VEmModel* GetModelByIndex(size_t idx = 0, G4bool ver = false) const;
|
||||
inline G4VEmModel* GetModelByIndex(std::size_t idx = 0, G4bool ver = false) const;
|
||||
|
||||
// Assign a fluctuation model to a process
|
||||
inline void SetFluctModel(G4VEmFluctuationModel*);
|
||||
@@ -477,7 +477,7 @@ protected:
|
||||
G4double preStepLogScaledEnergy = LOG_EKIN_MIN;
|
||||
G4double mfpKinEnergy = 0.0;
|
||||
|
||||
size_t currentCoupleIndex = 0;
|
||||
std::size_t currentCoupleIndex = 0;
|
||||
|
||||
private:
|
||||
|
||||
@@ -490,16 +490,16 @@ private:
|
||||
G4int biasID = _DeltaEBelowCut;
|
||||
G4int mainSecondaries = 1;
|
||||
|
||||
size_t basedCoupleIndex = 0;
|
||||
size_t coupleIdxRange = 0;
|
||||
size_t idxDEDX = 0;
|
||||
size_t idxDEDXunRestricted = 0;
|
||||
size_t idxIonisation = 0;
|
||||
size_t idxRange = 0;
|
||||
size_t idxCSDA = 0;
|
||||
size_t idxSecRange = 0;
|
||||
size_t idxInverseRange = 0;
|
||||
size_t idxLambda = 0;
|
||||
std::size_t basedCoupleIndex = 0;
|
||||
std::size_t coupleIdxRange = 0;
|
||||
std::size_t idxDEDX = 0;
|
||||
std::size_t idxDEDXunRestricted = 0;
|
||||
std::size_t idxIonisation = 0;
|
||||
std::size_t idxRange = 0;
|
||||
std::size_t idxCSDA = 0;
|
||||
std::size_t idxSecRange = 0;
|
||||
std::size_t idxInverseRange = 0;
|
||||
std::size_t idxLambda = 0;
|
||||
|
||||
G4GPILSelection aGPILSelection;
|
||||
G4CrossSectionType fXSType = fEmOnePeak;
|
||||
@@ -527,7 +527,7 @@ private:
|
||||
|
||||
// ======== Run time inline methods ================
|
||||
|
||||
inline size_t G4VEnergyLossProcess::CurrentMaterialCutsCoupleIndex() const
|
||||
inline std::size_t G4VEnergyLossProcess::CurrentMaterialCutsCoupleIndex() const
|
||||
{
|
||||
return currentCoupleIndex;
|
||||
}
|
||||
@@ -543,7 +543,7 @@ inline void G4VEnergyLossProcess::SelectModel(G4double kinEnergy)
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4VEmModel* G4VEnergyLossProcess::SelectModelForMaterial(
|
||||
G4double kinEnergy, size_t& idx) const
|
||||
G4double kinEnergy, std::size_t& idx) const
|
||||
{
|
||||
return modelManager->SelectModel(kinEnergy, idx);
|
||||
}
|
||||
@@ -986,14 +986,14 @@ inline std::vector<G4TwoPeaksXS*>* G4VEnergyLossProcess::TwoPeaksXS() const
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline size_t G4VEnergyLossProcess::NumberOfModels() const
|
||||
inline std::size_t G4VEnergyLossProcess::NumberOfModels() const
|
||||
{
|
||||
return numberOfModels;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4VEmModel* G4VEnergyLossProcess::EmModel(size_t index) const
|
||||
inline G4VEmModel* G4VEnergyLossProcess::EmModel(std::size_t index) const
|
||||
{
|
||||
return (index < emModels->size()) ? (*emModels)[index] : nullptr;
|
||||
}
|
||||
@@ -1001,9 +1001,9 @@ inline G4VEmModel* G4VEnergyLossProcess::EmModel(size_t index) const
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4VEmModel*
|
||||
G4VEnergyLossProcess::GetModelByIndex(size_t idx, G4bool ver) const
|
||||
G4VEnergyLossProcess::GetModelByIndex(std::size_t idx, G4bool ver) const
|
||||
{
|
||||
return modelManager->GetModel(idx, ver);
|
||||
return modelManager->GetModel((G4int)idx, ver);
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
@@ -135,6 +135,9 @@ protected:
|
||||
// convert true length to geometry length
|
||||
inline G4double ConvertTrueToGeom(G4double& tLength, G4double& gLength);
|
||||
|
||||
// should be set before initialisation
|
||||
inline void SetUseSplineForMSC(G4bool val);
|
||||
|
||||
public:
|
||||
|
||||
// compute safety
|
||||
@@ -202,12 +205,15 @@ protected:
|
||||
G4double geomMin;
|
||||
G4double geomMax;
|
||||
|
||||
G4bool samplez = false;
|
||||
G4bool latDisplasment = true;
|
||||
|
||||
G4ThreeVector fDisplacement;
|
||||
G4ThreeVector fDisplacement;
|
||||
G4MscStepLimitType steppingAlgorithm;
|
||||
|
||||
G4bool samplez = false;
|
||||
G4bool latDisplasment = true;
|
||||
|
||||
private:
|
||||
|
||||
G4bool useSpline = true;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -345,4 +351,11 @@ G4VMscModel::GetTransportMeanFreePath(const G4ParticleDefinition* part,
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
inline void G4VMscModel::SetUseSplineForMSC(G4bool val)
|
||||
{
|
||||
useSpline = val;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
#endif
|
||||
|
||||
@@ -158,9 +158,6 @@ public:
|
||||
// Along step actions
|
||||
G4VParticleChange* AlongStepDoIt(const G4Track&, const G4Step&) override;
|
||||
|
||||
// Post step actions
|
||||
G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&) override;
|
||||
|
||||
// This method does not used for tracking, it is intended only for tests
|
||||
G4double ContinuousStepLimit(const G4Track& track,
|
||||
G4double previousStepSize,
|
||||
|
||||
Reference in New Issue
Block a user