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

Import Geant4 10.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/utils/include/G4EmCorrections.hh
+3 -3
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4EmCorrections.hh 96698 2016-05-02 07:19:24Z gcosmo $
// $Id: G4EmCorrections.hh 100363 2016-10-19 09:24:47Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -60,13 +60,13 @@
#include "G4ionEffectiveCharge.hh"
#include "G4Material.hh"
#include "G4ParticleDefinition.hh"
#include "G4Pow.hh"
class G4VEmModel;
class G4PhysicsVector;
class G4IonTable;
class G4MaterialCutsCouple;
class G4LPhysicsFreeVector;
class G4Pow;
class G4EmCorrections
{
@@ -197,7 +197,7 @@ private:
G4EmCorrections & operator=(const G4EmCorrections &right) = delete;
G4EmCorrections(const G4EmCorrections&) = delete;
G4Pow* g4pow;
G4Pow* g4calc;
static const G4double inveplus;
static const G4double ZD[11];
source/processes/electromagnetic/utils/include/G4EmParameters.hh
+22
View File
@@ -60,6 +60,7 @@
#include "G4ios.hh"
#include "G4MscStepLimitType.hh"
#include "G4NuclearFormfactorType.hh"
#include "G4EmSaturation.hh"
#include <vector>
class G4EmParametersMessenger;
@@ -138,6 +139,12 @@ public:
void SetIntegral(G4bool val);
G4bool Integral() const;
void SetBirksActive(G4bool val);
G4bool BirksActive() const;
void SetEmSaturation(G4EmSaturation*);
G4EmSaturation* GetEmSaturation();
// double parameters with values
void SetMinSubRange(G4double val);
G4double MinSubRange() const;
@@ -232,6 +239,10 @@ public:
const std::vector<G4String>& RegionsDNA() const;
const std::vector<G4String>& TypesDNA() const;
void AddMsc(const G4String& region, const G4String& type);
const std::vector<G4String>& RegionsMsc() const;
const std::vector<G4String>& TypesMsc() const;
void SetSubCutoff(G4bool val, const G4String& region = "");
void SetDeexActiveRegion(const G4String& region, G4bool fdeex,
@@ -258,8 +269,13 @@ public:
private:
G4EmParameters(G4EmParameters &) = delete;
G4EmParameters & operator=(const G4EmParameters &right) = delete;
G4EmParameters();
void Initialise();
G4bool IsLocked() const;
G4String CheckRegion(const G4String&) const;
@@ -272,6 +288,8 @@ private:
G4StateManager* fStateManager;
G4EmSaturation* emSaturation;
G4bool lossFluctuation;
G4bool buildCSDARange;
G4bool flagLPM;
@@ -290,6 +308,7 @@ private:
G4bool useAngGeneratorForIonisation;
G4bool useMottCorrection;
G4bool integral;
G4bool birks;
G4double minSubRange;
G4double minKinEnergy;
@@ -332,6 +351,9 @@ private:
std::vector<G4String> m_regnamesDNA;
std::vector<G4String> m_typesDNA;
std::vector<G4String> m_regnamesMsc;
std::vector<G4String> m_typesMsc;
std::vector<G4String> m_regnamesSubCut;
std::vector<G4bool> m_subCuts;
source/processes/electromagnetic/utils/include/G4EmParametersMessenger.hh
+3 -1
View File
@@ -98,7 +98,9 @@ private:
G4UIcmdWithABool* mulatCmd;
G4UIcmdWithABool* catCmd;
G4UIcmdWithABool* delCmd;
G4UIcmdWithABool* IntegCmd;
G4UIcmdWithABool* mottCmd;
G4UIcmdWithABool* birksCmd;
G4UIcmdWithADouble* minSubSecCmd;
G4UIcmdWithADoubleAndUnit* minEnCmd;
@@ -132,12 +134,12 @@ private:
G4UIcommand* paiCmd;
G4UIcmdWithAString* meCmd;
G4UIcommand* dnaCmd;
G4UIcommand* mscoCmd;
G4UIcommand* dumpCmd;
G4UIcommand* SubSecCmd;
G4UIcommand* StepFuncCmd;
G4UIcommand* StepFuncCmd1;
G4UIcmdWithABool* IntegCmd;
G4UIcommand* deexCmd;
G4UIcommand* bfCmd;
G4UIcommand* fiCmd;
source/processes/electromagnetic/utils/include/G4EmSaturation.hh
+15 -33
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4EmSaturation.hh 95657 2016-02-17 13:03:36Z gcosmo $
// $Id: G4EmSaturation.hh 100346 2016-10-18 15:30:36Z gcosmo $
//
//
#ifndef G4EmSaturation_h
@@ -64,7 +64,6 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
class G4LossTableManager;
class G4NistManager;
class G4MaterialCutsCouple;
class G4Material;
@@ -82,7 +81,10 @@ public:
const G4MaterialCutsCouple*,
G4double length,
G4double edepTotal,
G4double edepNIEL = 0.0);
G4double edepNIEL = 0.0) const;
// activate default model
void InitialiseG4Saturation();
// find and Birks coefficient
G4double FindG4BirksCoefficient(const G4Material*);
@@ -94,7 +96,7 @@ public:
void DumpG4BirksCoefficients();
// this method should not be overwitten
inline G4double VisibleEnergyDepositionAtAStep(const G4Step*);
inline G4double VisibleEnergyDepositionAtAStep(const G4Step*) const;
inline void SetVerbose(G4int);
@@ -104,37 +106,27 @@ private:
G4EmSaturation & operator=(const G4EmSaturation &right) = delete;
G4EmSaturation(const G4EmSaturation&) = delete;
inline G4double FindBirksCoefficient(const G4Material*);
void InitialiseBirksCoefficient(const G4Material*);
void InitialiseG4materials();
const G4ParticleDefinition* electron;
const G4ParticleDefinition* proton;
G4LossTableManager* manager;
G4NistManager* nist;
// cache
const G4Material* curMaterial;
G4double curBirks;
G4double curRatio;
G4double curChargeSq;
G4int verbose;
G4int nMaterials;
G4int nG4Birks;
G4int nWarnings;
static G4int nMaterials;
// list of materials used in run time
std::vector<const G4Material*> matPointers;
std::vector<G4String> matNames;
std::vector<G4double> massFactors;
std::vector<G4double> effCharges;
static std::vector<G4double> massFactors;
static std::vector<G4double> effCharges;
// list of G4 materials
std::vector<G4double> g4MatData;
std::vector<G4String> g4MatNames;
static std::vector<G4double> g4MatData;
static std::vector<G4String> g4MatNames;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -147,11 +139,10 @@ inline void G4EmSaturation::SetVerbose(G4int val)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
inline G4double G4EmSaturation::VisibleEnergyDepositionAtAStep(
const G4Step* step)
const G4Step* step) const
{
G4Track* track = step->GetTrack();
return VisibleEnergyDeposition(track->GetParticleDefinition(),
track->GetMaterialCutsCouple(),
return VisibleEnergyDeposition(step->GetTrack()->GetParticleDefinition(),
step->GetTrack()->GetMaterialCutsCouple(),
step->GetStepLength(),
step->GetTotalEnergyDeposit(),
step->GetNonIonizingEnergyDeposit());
@@ -159,14 +150,5 @@ inline G4double G4EmSaturation::VisibleEnergyDepositionAtAStep(
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
inline
G4double G4EmSaturation::FindBirksCoefficient(const G4Material* mat)
{
if(mat != curMaterial) { InitialiseBirksCoefficient(mat); }
return curBirks;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
#endif
source/processes/electromagnetic/utils/include/G4LossTableManager.hh
+1 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4LossTableManager.hh 96115 2016-03-16 18:53:00Z gcosmo $
// $Id: G4LossTableManager.hh 99151 2016-09-07 08:03:17Z gcosmo $
//
//
// -------------------------------------------------------------------
@@ -295,7 +295,6 @@ private:
G4bool isMaster;
G4LossTableBuilder* tableBuilder;
G4EmCorrections* emCorrections;
G4EmSaturation* emSaturation;
G4EmConfigurator* emConfigurator;
G4ElectronIonPair* emElectronIonPair;
G4VAtomDeexcitation* atomDeexcitation;
source/processes/electromagnetic/utils/include/G4VAtomDeexcitation.hh
+4 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4VAtomDeexcitation.hh 96698 2016-05-02 07:19:24Z gcosmo $
// $Id: G4VAtomDeexcitation.hh 98985 2016-08-29 07:01:17Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -84,7 +84,7 @@ public:
G4bool valDeexcitation,
G4bool valAuger,
G4bool valPIXE);
// Activation of deexcitation
inline void SetFluo(G4bool);
inline G4bool IsFluoActive() const;
@@ -261,14 +261,13 @@ inline G4int G4VAtomDeexcitation::GetVerboseLevel() const
inline G4bool
G4VAtomDeexcitation::CheckDeexcitationActiveRegion(G4int coupleIndex)
{
return (isActive || activeDeexcitationMedia[coupleIndex]);
return (activeDeexcitationMedia[coupleIndex]);
}
inline G4bool
G4VAtomDeexcitation::CheckAugerActiveRegion(G4int coupleIndex)
{
return (flagAuger || activeAugerMedia[coupleIndex]);
return (activeAugerMedia[coupleIndex]);
}
inline void
source/processes/electromagnetic/utils/include/G4ionEffectiveCharge.hh
+2 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ionEffectiveCharge.hh 96626 2016-04-27 08:36:27Z gcosmo $
// $Id: G4ionEffectiveCharge.hh 100363 2016-10-19 09:24:47Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -84,7 +84,7 @@ private:
G4ionEffectiveCharge(const G4ionEffectiveCharge&) = delete;
static const G4double inveplus;
G4Pow* g4pow;
G4Pow* g4calc;
const G4ParticleDefinition* lastPart;
const G4Material* lastMat;