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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/cross_sections/src/G4CrossSectionDataSetRegistry.cc
+9 -9
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4CrossSectionDataSetRegistry.cc 93904 2015-11-03 10:16:36Z gcosmo $
// $Id: G4CrossSectionDataSetRegistry.cc 96096 2016-03-14 21:50:15Z gcosmo $
//
// -------------------------------------------------------------------
//
@@ -98,15 +98,15 @@ void G4CrossSectionDataSetRegistry::Clean()
size_t n = xSections.size();
for (size_t i=0; i<n; ++i) {
if(xSections[i]) {
const char* xxx = (xSections[i]->GetName()).c_str();
G4int len = (xSections[i]->GetName()).length();
len = std::min(len, 9);
const G4String xname = G4String(xxx, len);
//std::cout << "G4CrossSectionDataSetRegistry::Clean " << xname
// << " " << xSections[i] << " " << this << std::endl;
if( (xname != "NeutronHP") && (xname != "ParticleH") ) {
//const char* xxx = (xSections[i]->GetName()).c_str();
//G4int len = (xSections[i]->GetName()).length();
//len = std::min(len, 9);
//const G4String xname = G4String(xxx, len);
////std::cout << "G4CrossSectionDataSetRegistry::Clean " << xname
//// << " " << xSections[i] << " " << this << std::endl;
//if( (xname != "NeutronHP") && (xname != "ParticleH") ) {
delete xSections[i];
}
//}
//std::cout << " done" << " " << this << std::endl;
}
}
source/processes/hadronic/cross_sections/src/G4CrossSectionPairGG.cc
+6 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4CrossSectionPairGG.cc 93682 2015-10-28 10:09:49Z gcosmo $
// $Id: G4CrossSectionPairGG.cc 94961 2016-01-08 16:31:48Z gcosmo $
// $ GEANT4 tag $Name: not supported by cvs2svn $
//
// Class G4CrossSectionPairGG
@@ -98,7 +98,7 @@ G4double G4CrossSectionPairGG::GetElementCrossSection(
std::vector<ParticleXScale>::iterator iter = scale_factors.begin();
const G4ParticleDefinition * pDef = aParticle->GetDefinition();
while (iter != scale_factors.end() && (*iter).first != pDef)
while (iter != scale_factors.end() && (*iter).first != pDef) /* Loop checking, 08.01.2016, W. Pokorski */
{
++iter;
}
@@ -137,9 +137,10 @@ void G4CrossSectionPairGG::BuildPhysicsTable(const G4ParticleDefinition& pDef) {
const G4ParticleDefinition * myDef = &pDef;
std::vector<ParticleXScale>::iterator iter;
iter = scale_factors.begin();
while (iter != scale_factors.end() && (*iter).first != myDef) {
++iter;
}
while (iter != scale_factors.end() && (*iter).first != myDef) /* Loop checking, 08.01.2016, W. Pokorski */
{
++iter;
}
// new particle, initialise
source/processes/hadronic/cross_sections/src/G4ElectroNuclearCrossSection.cc
+4 -4
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4ElectroNuclearCrossSection.cc 94079 2015-11-05 15:03:02Z gcosmo $
// $Id: G4ElectroNuclearCrossSection.cc 94961 2016-01-08 16:31:48Z gcosmo $
//
// G4 Physics class: G4ElectroNuclearCrossSection for gamma+A cross sections
// Created: M.V. Kossov, CERN/ITEP(Moscow), 10-OCT-01
@@ -2195,7 +2195,7 @@ lastE(0), lastSig(0), lastG(0), lastL(0), mNeut(G4NucleiProperties::GetNuclearMa
G4ElectroNuclearCrossSection::~G4ElectroNuclearCrossSection()
{
std::vector<cacheEl_t*>::iterator it = cache.begin();
while ( it != cache.end() )
while ( it != cache.end() ) /* Loop checking, 08.01.2016, W. Pokorski */
{
if ( *it ) {
delete[] (*it)->J1; (*it)->J1 = 0;
@@ -2452,7 +2452,7 @@ G4double G4ElectroNuclearCrossSection::GetEquivalentPhotonEnergy()
if (ris < Y[lastL]) { // Search the table
G4int j = lastUsedCacheEl->F;
G4double Yj = Y[j]; // It must be 0 (sometimes just very small)
while (ris > Yj && j < lastL) { // Associative search
while (ris > Yj && j < lastL) { // Associative search /* Loop checking, 08.01.2016, W. Pokorski */
j++;
Yj = Y[j]; // Yj is first value above ris
}
@@ -2530,7 +2530,7 @@ G4double G4ElectroNuclearCrossSection::GetEquivalentPhotonQ2(G4double nu)
G4int maxTry=3;
G4int cntTry=0;
G4double Q2=Qi2;
while(cond&&cntTry<maxTry) // The loop to avoid x>1.
while(cond&&cntTry<maxTry) // The loop to avoid x>1. /* Loop checking, 08.01.2016, W. Pokorski */
{
G4double R=G4UniformRand(); // Random number (0,1)
Q2=Qi2*(ePy+1./(G4Exp(R*LyQa2-(1.-R)*Uy)-Fy));
source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
+5 -5
View File
@@ -1337,7 +1337,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
// G4int je1 = je2 -1;
// je1 = je1 - 1; // For array indexing
// je2 = je2 - 1; // For array indexing
G4int je1 = 0;
G4int je2 = NELAB - 1;
do {
@@ -1346,7 +1346,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
je2 = midBin;
else
je1 = midBin;
} while (je2 - je1 > 1);
} while (je2 - je1 > 1); /* Loop checking, 08.01.2016, W. Pokorski */
G4double delab = elab[je2] - elab[je1];
@@ -1369,7 +1369,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
ja2 = midBin;
else
ja1 = midBin;
} while (ja2 - ja1 > 1);
} while (ja2 - ja1 > 1); /* Loop checking, 08.01.2016, W. Pokorski */
G4double dnlwat = cnlwat[ja2] - cnlwat[ja1];
@@ -1419,7 +1419,7 @@ G4HadronCrossSections::CalcScatteringCrossSections(
je2 = midBin;
else
je1 = midBin;
} while (je2 - je1 > 1);
} while (je2 - je1 > 1); /* Loop checking, 08.01.2016, W. Pokorski */
G4int ipart1 = ipart - 1; // For array indexing
@@ -1593,7 +1593,7 @@ G4HadronCrossSections::GetFissionCrossSection(const G4DynamicParticle* aParticle
ie2 = midBin;
else
ie1 = midBin;
} while (ie2 - ie1 > 1);
} while (ie2 - ie1 > 1); /* Loop checking, 08.01.2016, W. Pokorski */
G4int i = ie2;
if (ek < ekfiss[0]) i = 0;
source/processes/hadronic/cross_sections/src/G4PiData.cc
+3 -3
View File
@@ -65,7 +65,7 @@ G4double G4PiData::ReactionXSection(G4double kineticEnergy)
{
G4double result = 0;
G4PiData::iterator it=begin();
while(it!=end()&&kineticEnergy>(*it).first) {it++;}
while(it!=end()&&kineticEnergy>(*it).first) {it++;} /* Loop checking, 08.01.2016, W. Pokorski */
if(it==end())
{
throw G4HadronicException(__FILE__, __LINE__,
@@ -87,7 +87,7 @@ G4double G4PiData::ElasticXSection(G4double kineticEnergy)
{
G4double result = 0;
G4PiData::iterator it=begin();
while(it!=end()&&kineticEnergy>(*it).first) {it++;}
while(it!=end()&&kineticEnergy>(*it).first) {it++;} /* Loop checking, 08.01.2016, W. Pokorski */
if(it==end())
{
throw G4HadronicException(__FILE__, __LINE__,
@@ -109,7 +109,7 @@ G4double G4PiData::TotalXSection(G4double kineticEnergy)
{
G4double result = 0;
G4PiData::iterator it=begin();
while(it!=end()&&kineticEnergy>(*it).first) {it++;}
while(it!=end()&&kineticEnergy>(*it).first) {it++;} /* Loop checking, 08.01.2016, W. Pokorski */
if(it==end())
{
throw G4HadronicException(__FILE__, __LINE__,
source/processes/hadronic/cross_sections/src/G4PiNuclearCrossSection.cc
+1 -1
View File
@@ -487,7 +487,7 @@ G4PiNuclearCrossSection::GetElementCrossSection(const G4DynamicParticle* particl
// debug.push_back(Z);
size_t it = 0;
while(it < theZ.size() && Z > theZ[it]) it++;
while(it < theZ.size() && Z > theZ[it]) it++; /* Loop checking, 08.01.2016, W. Pokorski */
// debug.push_back(theZ[it]);
// debug.push_back(kineticEnergy);