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

Import Geant4 11.1.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/lowenergy/src/G4ANSTOecpssrKxsModel.cc
+1 -1
View File
@@ -31,7 +31,7 @@
// ----------------
// Computation of K, L & M shell ECPSSR ionisation cross sections for protons and alphas
// Based on the work of
// - S. Bakr et al. (2021) NIM B, 507:11–19.
// - S. Bakr et al. (2021) NIM B, 507:11-19.
// - S. Bakr et al (2018), NIMB B, 436: 285-291.
// ---------------------------------------------------------------------------------------
source/processes/electromagnetic/lowenergy/src/G4ANSTOecpssrLixsModel.cc
+1 -1
View File
@@ -31,7 +31,7 @@
// ----------------
// Computation of K, L & M shell ECPSSR ionisation cross sections for protons and alphas
// Based on the work of
// - S. Bakr et al. (2021) NIM B, 507:11–19.
// - S. Bakr et al. (2021) NIM B, 507:11-19.
// - S. Bakr et al (2018), NIMB B, 436: 285-291.
// ---------------------------------------------------------------------------------------
source/processes/electromagnetic/lowenergy/src/G4ANSTOecpssrMixsModel.cc
+1 -1
View File
@@ -31,7 +31,7 @@
// ----------------
// Computation of K, L & M shell ECPSSR ionisation cross sections for protons and alphas
// Based on the work of
// - S. Bakr et al. (2021) NIM B, 507:11–19.
// - S. Bakr et al. (2021) NIM B, 507:11-19.
// - S. Bakr et al (2018), NIMB B, 436: 285-291.
// ---------------------------------------------------------------------------------------
source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc
+2 -2
View File
@@ -74,7 +74,7 @@ std::vector<G4DynamicParticle*>* G4AtomicDeexcitation::GenerateParticles(G4int Z
std::vector<G4DynamicParticle*>* vectorOfParticles;
vectorOfParticles = new std::vector<G4DynamicParticle*>;
G4DynamicParticle* aParticle;
G4DynamicParticle* aParticle = nullptr;
G4int provShellId = 0;
G4int counter = 0;
@@ -120,7 +120,7 @@ std::vector<G4DynamicParticle*>* G4AtomicDeexcitation::GenerateParticles(G4int Z
}
}
counter++;
if (aParticle != 0) {vectorOfParticles->push_back(aParticle);}
if (aParticle != nullptr) {vectorOfParticles->push_back(aParticle);}
else {provShellId = -2;}
}
source/processes/electromagnetic/lowenergy/src/G4AugerData.cc
+1 -1
View File
@@ -242,7 +242,7 @@ std::vector<G4AugerTransition> G4AugerData::LoadData(G4int Z)
}
G4String name(ost.str());
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep = "G4AugerData::LoadData";
source/processes/electromagnetic/lowenergy/src/G4BoldyshevTripletModel.cc
+2 -2
View File
@@ -112,7 +112,7 @@ void G4BoldyshevTripletModel::Initialise(const G4ParticleDefinition*,
if(IsMaster())
{
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -164,7 +164,7 @@ void G4BoldyshevTripletModel::ReadData(size_t Z, const char* path)
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4BoldyshevTripletModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4CrossSectionDataSet.cc
+1 -1
View File
@@ -465,7 +465,7 @@ G4bool G4CrossSectionDataSet::SaveData(const G4String & argFileName) const
G4String G4CrossSectionDataSet::FullFileName(const G4String& argFileName) const
{
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4CrossSectionDataSet::FullFileName",
source/processes/electromagnetic/lowenergy/src/G4DopplerProfile.cc
+2 -2
View File
@@ -121,7 +121,7 @@ void G4DopplerProfile::LoadBiggsP(const G4String& fileName)
ost << fileName << ".dat";
G4String name(ost.str());
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4DopplerProfile::LoadBiggsP",
@@ -164,7 +164,7 @@ void G4DopplerProfile::LoadProfile(const G4String& fileName,G4int Z)
ost << fileName << "-" << Z << ".dat";
G4String name(ost.str());
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep("G4LEDATA environment variable not set");
source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc
+1 -1
View File
@@ -480,7 +480,7 @@ size_t G4EMDataSet::FindLowerBound(G4double x, G4DataVector* values) const
G4String G4EMDataSet::FullFileName(const G4String& name) const
{
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4Exception("G4EMDataSet::FullFileName",
"em0006",FatalException,"G4LEDATA environment variable not set");
source/processes/electromagnetic/lowenergy/src/G4FluoData.cc
+1 -1
View File
@@ -214,7 +214,7 @@ void G4FluoData::LoadData(G4int Z)
G4String name(ost.str());
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep("G4FluoData::LoadData()");
source/processes/electromagnetic/lowenergy/src/G4JAEAElasticScatteringModel.cc
+2 -2
View File
@@ -112,7 +112,7 @@ void G4JAEAElasticScatteringModel::Initialise(const G4ParticleDefinition* partic
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
@@ -165,7 +165,7 @@ void G4JAEAElasticScatteringModel::ReadData(size_t Z, const char* path)
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4JAEAElasticScatteringModel::ReadData()","em0006",
source/processes/electromagnetic/lowenergy/src/G4JAEAPolarizedElasticScatteringModel.cc
+2 -2
View File
@@ -106,7 +106,7 @@ void G4JAEAPolarizedElasticScatteringModel::Initialise(const G4ParticleDefinitio
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
@@ -158,7 +158,7 @@ void G4JAEAPolarizedElasticScatteringModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4JAEAPolarizedElasticScatteringModel::ReadData()","em0006",
source/processes/electromagnetic/lowenergy/src/G4LivermoreBremsstrahlungModel.cc
+2 -2
View File
@@ -113,7 +113,7 @@ void G4LivermoreBremsstrahlungModel::Initialise(const G4ParticleDefinition* p,
if(IsMaster()) {
// check environment variable
// Build the complete string identifying the file with the data set
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
const G4ElementTable* theElmTable = G4Element::GetElementTable();
size_t numOfElm = G4Element::GetNumberOfElements();
@@ -146,7 +146,7 @@ void G4LivermoreBremsstrahlungModel::ReadData(G4int Z, const char* path)
const char* datadir = path;
if(!datadir) {
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir) {
G4Exception("G4LivermoreBremsstrahlungModel::ReadData()","em0006",
FatalException,"Environment variable G4LEDATA not defined");
source/processes/electromagnetic/lowenergy/src/G4LivermoreComptonModel.cc
+2 -2
View File
@@ -121,7 +121,7 @@ void G4LivermoreComptonModel::Initialise(const G4ParticleDefinition* particle,
// Initialise element selector
if(IsMaster()) {
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
const G4ElementTable* elemTable = G4Element::GetElementTable();
size_t numElems = (*elemTable).size();
@@ -188,7 +188,7 @@ void G4LivermoreComptonModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(datadir == nullptr)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(datadir == nullptr)
{
G4Exception("G4LivermoreComptonModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversion5DModel.cc
+10 -4
View File
@@ -107,7 +107,7 @@ G4LivermoreGammaConversion5DModel::Initialise( const G4ParticleDefinition* parti
// Initialise element selector
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
G4int numOfCouples = theCoupleTable->GetTableSize();
@@ -141,7 +141,7 @@ void G4LivermoreGammaConversion5DModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LivermoreGammaConversion5DModel::ReadData()",
@@ -150,9 +150,15 @@ void G4LivermoreGammaConversion5DModel::ReadData(size_t Z, const char* path)
return;
}
}
data[Z] = new G4PhysicsFreeVector();
std::ostringstream ost;
ost << datadir << "/epics2017/pair/pp-cs-" << Z <<".dat";
if(G4EmParameters::Instance()->LivermoreDataDir() == "livermore"){
data[Z] = new G4PhysicsFreeVector(true);
ost << datadir << "/livermore/pair/pp-cs-" << Z <<".dat";
}else{
data[Z] = new G4PhysicsFreeVector();
ost << datadir << "/epics2017/pair/pp-cs-" << Z <<".dat";
}
std::ifstream fin(ost.str().c_str());
if( !fin.is_open())
source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversionModel.cc
+5 -3
View File
@@ -111,7 +111,7 @@ void G4LivermoreGammaConversionModel::Initialise(
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
const G4ElementTable* elemTable = G4Element::GetElementTable();
size_t numElems = (*elemTable).size();
for(size_t ie = 0; ie < numElems; ++ie)
@@ -143,7 +143,7 @@ void G4LivermoreGammaConversionModel::ReadData(size_t Z, const char* path)
if(datadir == nullptr)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(datadir == nullptr)
{
G4Exception("G4LivermoreGammaConversionModel::ReadData()",
@@ -152,11 +152,13 @@ void G4LivermoreGammaConversionModel::ReadData(size_t Z, const char* path)
return;
}
}
data[Z] = new G4PhysicsFreeVector();
std::ostringstream ost;
if(G4EmParameters::Instance()->LivermoreDataDir() == "livermore"){
data[Z] = new G4PhysicsFreeVector(true);
ost << datadir << "/livermore/pair/pp-cs-" << Z <<".dat";
}else{
data[Z] = new G4PhysicsFreeVector();
ost << datadir << "/epics2017/pair/pp-cs-" << Z <<".dat";
}
source/processes/electromagnetic/lowenergy/src/G4LivermoreNuclearGammaConversionModel.cc
+2 -2
View File
@@ -102,7 +102,7 @@ void G4LivermoreNuclearGammaConversionModel::Initialise(
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -165,7 +165,7 @@ void G4LivermoreNuclearGammaConversionModel::ReadData(size_t Z, const char* path
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LivermoreNuclearGammaConversionModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4LivermorePhotoElectricModel.cc
+8 -3
View File
@@ -498,7 +498,7 @@ const G4String& G4LivermorePhotoElectricModel::FindDirectoryPath()
// check environment variable
// build the complete string identifying the file with the data set
if(fDataDirectory.empty()) {
const char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (path) {
std::ostringstream ost;
if(G4EmParameters::Instance()->LivermoreDataDir() =="livermore"){
@@ -529,9 +529,14 @@ void G4LivermorePhotoElectricModel::ReadData(G4int Z)
if(fCrossSection[Z]!= nullptr) { return; }
// no spline for photoeffect total x-section above K-shell
// spline for photoeffect total x-section above K-shell when using EPDL97
// but below the parameterized ones
fCrossSection[Z] = new G4PhysicsFreeVector();
if(G4EmParameters::Instance()->LivermoreDataDir() =="livermore"){
fCrossSection[Z] = new G4PhysicsFreeVector(true);
}else{
fCrossSection[Z] = new G4PhysicsFreeVector();
}
std::ostringstream ost;
ost << FindDirectoryPath() << "pe-cs-" << Z <<".dat";
std::ifstream fin(ost.str().c_str());
source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedComptonModel.cc
+2 -2
View File
@@ -134,7 +134,7 @@ void G4LivermorePolarizedComptonModel::Initialise(const G4ParticleDefinition* pa
// Initialise element selector
if(IsMaster()) {
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -217,7 +217,7 @@ void G4LivermorePolarizedComptonModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LivermorePolarizedComptonModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedGammaConversionModel.cc
+2 -2
View File
@@ -106,7 +106,7 @@ void G4LivermorePolarizedGammaConversionModel::Initialise(const G4ParticleDefini
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -166,7 +166,7 @@ void G4LivermorePolarizedGammaConversionModel::ReadData(size_t Z, const char* pa
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LivermorePolarizedGammaConversionModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedRayleighModel.cc
+2 -2
View File
@@ -115,7 +115,7 @@ void G4LivermorePolarizedRayleighModel::Initialise(const G4ParticleDefinition* p
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
auto elmTable = G4Element::GetElementTable();
for (auto const & elm : *elmTable) {
G4int Z = std::min(elm->GetZasInt(), maxZ);
@@ -152,7 +152,7 @@ void G4LivermorePolarizedRayleighModel::ReadData(size_t Z, const char* path)
if(nullptr == datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(nullptr == datadir)
{
G4Exception("G4LivermoreRayleighModelModel::ReadData()","em0006",
source/processes/electromagnetic/lowenergy/src/G4LivermoreRayleighModel.cc
+2 -2
View File
@@ -100,7 +100,7 @@ void G4LivermoreRayleighModel::Initialise(const G4ParticleDefinition* particle,
InitialiseElementSelectors(particle, cuts);
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
const G4ElementTable* elemTable = G4Element::GetElementTable();
size_t numElems = (*elemTable).size();
for(size_t ie = 0; ie < numElems; ++ie)
@@ -142,7 +142,7 @@ void G4LivermoreRayleighModel::ReadData(size_t Z, const char* path)
if(datadir == nullptr)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(datadir == nullptr)
{
G4Exception("G4LivermoreRayleighModelModel::ReadData()","em0006",
source/processes/electromagnetic/lowenergy/src/G4LowEPComptonModel.cc
+2 -2
View File
@@ -142,7 +142,7 @@ void G4LowEPComptonModel::Initialise(const G4ParticleDefinition* particle,
if(IsMaster()) {
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -215,7 +215,7 @@ void G4LowEPComptonModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LowEPComptonModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4LowEPPolarizedComptonModel.cc
+2 -2
View File
@@ -129,7 +129,7 @@ void G4LowEPPolarizedComptonModel::Initialise(const G4ParticleDefinition* partic
// Initialise element selector
if(IsMaster()) {
// Access to elements
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
G4ProductionCutsTable* theCoupleTable =
G4ProductionCutsTable::GetProductionCutsTable();
@@ -202,7 +202,7 @@ void G4LowEPPolarizedComptonModel::ReadData(size_t Z, const char* path)
const char* datadir = path;
if(!datadir)
{
datadir = std::getenv("G4LEDATA");
datadir = G4FindDataDir("G4LEDATA");
if(!datadir)
{
G4Exception("G4LowEPPolarizedComptonModel::ReadData()",
source/processes/electromagnetic/lowenergy/src/G4MicroElecCrossSectionDataSet.cc
+1 -1
View File
@@ -430,7 +430,7 @@ G4bool G4MicroElecCrossSectionDataSet::SaveData(const G4String & argFileName) co
G4String G4MicroElecCrossSectionDataSet::FullFileName(const G4String& argFileName) const
{
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4MicroElecCrossSectionDataSet::FullFileName","em0006",
source/processes/electromagnetic/lowenergy/src/G4MicroElecCrossSectionDataSet_new.cc
+1 -2
View File
@@ -462,8 +462,7 @@ G4bool G4MicroElecCrossSectionDataSet_new::SaveData(const G4String & argFileName
G4String G4MicroElecCrossSectionDataSet_new::FullFileName(const G4String& argFileName) const
{
char *path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4MicroElecCrossSectionDataSet_new::Initialise","em0006",FatalException,"G4LEDATA environment variable not set.");
source/processes/electromagnetic/lowenergy/src/G4MicroElecElasticModel.cc
+2 -2
View File
@@ -132,8 +132,8 @@ void G4MicroElecElasticModel::Initialise(const G4ParticleDefinition* /*particle*
tableE->LoadData(fileElectron);
tableData[electron] = tableE;
// For final state
char *path = std::getenv("G4LEDATA");
// For final state
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
source/processes/electromagnetic/lowenergy/src/G4MicroElecElasticModel_new.cc
+1 -1
View File
@@ -215,7 +215,7 @@ void G4MicroElecElasticModel_new::Initialise(const G4ParticleDefinition* /*parti
tableTCS[matName] = tableData; //Storage of TCS
// For final state
char *path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4MicroElecElasticModel_new::Initialise","em0006",FatalException,"G4LEDATA environment variable not set.");
source/processes/electromagnetic/lowenergy/src/G4MicroElecInelasticModel.cc
+3 -3
View File
@@ -134,9 +134,9 @@ void G4MicroElecInelasticModel::Initialise(const G4ParticleDefinition* particle,
G4String proton = protonDef->GetParticleName();;
G4double scaleFactor = 1e-18 * cm *cm;
char *path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
// *** ELECTRON
tableFile[electron] = fileElectron;
lowEnergyLimit[electron] = 16.7 * eV;
source/processes/electromagnetic/lowenergy/src/G4MicroElecInelasticModel_new.cc
+1 -1
View File
@@ -243,7 +243,7 @@ void G4MicroElecInelasticModel_new::Initialise(const G4ParticleDefinition* parti
if (verboseLevel > 3)
G4cout << "Calling G4MicroElecInelasticModel_new::Initialise()" << G4endl;
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4MicroElecElasticModel_new::Initialise","em0006",FatalException,"G4LEDATA environment variable not set.");
source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc
+1 -1
View File
@@ -121,7 +121,7 @@ void G4PenelopeBremsstrahlungAngular::ClearTables()
void G4PenelopeBremsstrahlungAngular::ReadDataFile()
{
//Read information from DataBase file
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep =
source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungFS.cc
+1 -1
View File
@@ -365,7 +365,7 @@ void G4PenelopeBremsstrahlungFS::BuildScaledXSTable(const G4Material* material,
void G4PenelopeBremsstrahlungFS::ReadDataFile(G4int Z)
{
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep = "G4PenelopeBremsstrahlungFS - G4LEDATA environment variable not set!";
source/processes/electromagnetic/lowenergy/src/G4PenelopeGammaConversionModel.cc
+2 -2
View File
@@ -523,8 +523,8 @@ void G4PenelopeGammaConversionModel::ReadDataFile(const G4int Z)
G4cout << "Going to read Gamma Conversion data files for Z=" << Z << G4endl;
}
char* path = std::getenv("G4LEDATA");
if (!path)
const char* path = G4FindDataDir("G4LEDATA");
if(!path)
{
G4String excep =
"G4PenelopeGammaConversionModel - G4LEDATA environment variable not set!";
source/processes/electromagnetic/lowenergy/src/G4PenelopeOscillatorManager.cc
+2 -2
View File
@@ -1034,8 +1034,8 @@ void G4PenelopeOscillatorManager::ReadElementData()
G4cout << "G4PenelopeOscillatorManager::ReadElementData()" << G4endl;
G4cout << "Going to read Element Data" << G4endl;
}
char* path = std::getenv("G4LEDATA");
if (!path)
const char* path = G4FindDataDir("G4LEDATA");
if(!path)
{
G4String excep = "G4PenelopeOscillatorManager - G4LEDATA environment variable not set!";
G4Exception("G4PenelopeOscillatorManager::ReadElementData()",
source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectricModel.cc
+2 -2
View File
@@ -517,8 +517,8 @@ void G4PenelopePhotoElectricModel::ReadDataFile(G4int Z)
G4cout << "Going to read PhotoElectric data files for Z=" << Z << G4endl;
}
char* path = std::getenv("G4LEDATA");
if (!path)
const char* path = G4FindDataDir("G4LEDATA");
if(!path)
{
G4String excep = "G4PenelopePhotoElectricModel - G4LEDATA environment variable not set!";
G4Exception("G4PenelopePhotoElectricModel::ReadDataFile()",
source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModel.cc
+2 -2
View File
@@ -550,8 +550,8 @@ void G4PenelopeRayleighModel::ReadDataFile(const G4int Z)
G4cout << "G4PenelopeRayleighModel::ReadDataFile()" << G4endl;
G4cout << "Going to read Rayleigh data files for Z=" << Z << G4endl;
}
char* path = std::getenv("G4LEDATA");
if (!path)
const char* path = G4FindDataDir("G4LEDATA");
if(!path)
{
G4String excep = "G4LEDATA environment variable not set!";
G4Exception("G4PenelopeRayleighModel::ReadDataFile()",
source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModelMI.cc
+3 -3
View File
@@ -630,7 +630,7 @@ void G4PenelopeRayleighModelMI::BuildFormFactorTable(const G4Material* material)
G4cout << " -- MedMat comp[" << j+1 << "]: " << comp[j] << G4endl;
}
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4String excep = "G4LEDATA environment variable not set!";
G4Exception("G4PenelopeRayleighModelMI::BuildFormFactorTable()",
@@ -872,7 +872,7 @@ void G4PenelopeRayleighModelMI::ReadDataFile(const G4int Z)
G4cout << "Going to read Rayleigh data files for Z=" << Z << G4endl;
}
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4String excep = "G4LEDATA environment variable not set!";
G4Exception("G4PenelopeRayleighModelMI::ReadDataFile()",
@@ -1000,7 +1000,7 @@ void G4PenelopeRayleighModelMI::ReadMolInterferenceData(const G4String& matname,
}
G4bool isLocalFile = (FFfilename != "NULL");
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4String excep = "G4LEDATA environment variable not set!";
G4Exception("G4PenelopeRayleighModelMI::ReadMolInterferenceData()",
source/processes/electromagnetic/lowenergy/src/G4PhotoElectricAngularGeneratorPolarized.cc
+1 -1
View File
@@ -90,7 +90,7 @@ G4PhotoElectricAngularGeneratorPolarized::G4PhotoElectricAngularGeneratorPolariz
if(level == 0) filename = nameChar0;
if(level == 1) filename = nameChar1;
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep = "G4EMDataSet - G4LEDATA environment variable not set";
source/processes/electromagnetic/lowenergy/src/G4ShellData.cc
+1 -1
View File
@@ -233,7 +233,7 @@ void G4ShellData::LoadData(const G4String& fileName)
// G4cout << fileName << G4endl;
G4String name(ost.str());
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4String excep("G4ShellData::LoadData()");
source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc
+1 -1
View File
@@ -409,7 +409,7 @@ void G4ShellEMDataSet::CleanUpComponents()
G4String G4ShellEMDataSet::FullFileName(const G4String& fileName) const
{
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc
+2 -2
View File
@@ -190,7 +190,7 @@ void G4VCrossSectionHandler::LoadData(const G4String& fileName)
G4int Z = G4int(activeZ[i]);
// Build the complete string identifying the file with the data set
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4VCrossSectionHandler::LoadData",
@@ -265,7 +265,7 @@ void G4VCrossSectionHandler::LoadNonLogData(const G4String& fileName)
G4int Z = G4int(activeZ[i]);
// Build the complete string identifying the file with the data set
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4VCrossSectionHandler::LoadNonLogData",
source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc
+1 -1
View File
@@ -171,7 +171,7 @@ void G4eIonisationParameters::LoadData()
}
}
char* path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path)
{
G4Exception("G4BremsstrahlungParameters::LoadData",
source/processes/electromagnetic/lowenergy/src/G4ecpssrBaseKxsModel.cc
+1 -3
View File
@@ -56,9 +56,7 @@ G4ecpssrBaseKxsModel::G4ecpssrBaseKxsModel()
tableC3 = new G4CrossSectionDataSet(new G4SemiLogInterpolation, 1.,1.);
// Storing FK data needed for medium velocities region
char *path = 0;
path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4Exception("G4ecpssrBaseKxsModel::G4ecpssrBaseKxsModel()", "em0006", FatalException,"G4LEDATA environment variable not set" );
source/processes/electromagnetic/lowenergy/src/G4ecpssrBaseLixsModel.cc
+2 -2
View File
@@ -43,8 +43,8 @@ G4ecpssrBaseLixsModel::G4ecpssrBaseLixsModel()
verboseLevel=0;
// Storing FLi data needed for 0.2 to 3.0 velocities region
char *path = std::getenv("G4LEDATA");
const char* path = G4FindDataDir("G4LEDATA");
if (!path) {
G4Exception("G4ecpssrLCrossSection::G4ecpssrBaseLixsModel()","em0006", FatalException ,"G4LEDATA environment variable not set");
return;