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

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc
+1 -1
View File
@@ -364,7 +364,7 @@ G4DecayProducts *G4NuclearDecayChannel::DecayIt (G4double theParentMass)
G4AtomicDeexcitation* atomDeex = new G4AtomicDeexcitation();
//no Auger electron generation
atomDeex->ActivateAugerElectronProduction(0);
G4std::vector<G4DynamicParticle*>* armProducts = atomDeex->GenerateParticles(aZ,eShell);
std::vector<G4DynamicParticle*>* armProducts = atomDeex->GenerateParticles(aZ,eShell);
// pop up the daughter before insertion
dynamicDaughter = products->PopProducts();
source/processes/hadronic/models/radiative_decay/src/G4NucleusLimits.cc
+1 -1
View File
@@ -118,7 +118,7 @@ G4NucleusLimits::~G4NucleusLimits ()
{;}
////////////////////////////////////////////////////////////////////////////////
//
G4std::ostream &operator << (G4std::ostream &s, const G4NucleusLimits &q)
std::ostream &operator << (std::ostream &s, const G4NucleusLimits &q)
//
//
// Definition of the insertion operator << to provide the nucleus limits to
source/processes/hadronic/models/radiative_decay/src/G4RIsotopeTable.cc
+10 -10
View File
@@ -65,9 +65,9 @@
*/
#include "G4ios.hh"
#include "globals.hh"
#include "g4std/iomanip"
#include "g4std/fstream"
#include "g4std/strstream"
#include <iomanip>
#include <fstream>
#include <strstream>
const G4double G4RIsotopeTable::levelTolerance = 2.0*keV;
@@ -93,7 +93,7 @@ G4int G4RIsotopeTable::GetVerboseLevel() const
}
///////////////////////////////////////////////////////////////////////////////
//
G4bool G4RIsotopeTable::FindIsotope(G4IsotopeProperty* property)
G4bool G4RIsotopeTable::FindIsotope(G4IsotopeProperty* )
{
// do nothing, it is here just for the compiler
// it is required by the base class
@@ -157,9 +157,9 @@ G4String G4RIsotopeTable::GetIsotopeName(G4int Z, G4int A, G4double E)
{
G4String name;
char val[50];
G4std::ostrstream os(val,50);
os.setf(G4std::ios::fixed);
os <<"A"<< A << "Z" << Z <<'[' << G4std::setprecision(1) << E/keV << ']' << '\0';
std::ostrstream os(val,50);
os.setf(std::ios::fixed);
os <<"A"<< A << "Z" << Z <<'[' << std::setprecision(1) << E/keV << ']' << '\0';
name = val;
#ifdef G4VERBOSE
if (GetVerboseLevel()>0) {
@@ -177,10 +177,10 @@ G4double G4RIsotopeTable::GetMeanLifeTime (G4int Z, G4int A, G4double& aE)
// G4double levelTolerance = 1.0 * keV ;
G4String dirName = getenv("G4RADIOACTIVEDATA");
char val[100];
G4std::ostrstream os(val,100);
std::ostrstream os(val,100);
os <<dirName <<"/z" <<Z <<".a" <<A <<'\0';
G4String file(val);
G4std::ifstream DecaySchemeFile(file);
std::ifstream DecaySchemeFile(file);
if (!DecaySchemeFile )
{
@@ -209,7 +209,7 @@ G4double G4RIsotopeTable::GetMeanLifeTime (G4int Z, G4int A, G4double& aE)
if (inputChars[0] != '#' && inputLine.length() != 0)
{
G4std::istrstream tmpstream(inputLine);
std::istrstream tmpstream(inputLine);
// tmpstream = inputLine;
tmpstream >>recordType >>a >>b;
if (recordType == "P")
source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc
+30 -30
View File
@@ -98,10 +98,10 @@
#include "G4NuclearLevelManager.hh"
#include "G4NuclearLevelStore.hh"
#include "g4std/vector"
#include "g4std/strstream"
#include "g4std/algorithm"
#include "g4std/fstream"
#include <vector>
#include <strstream>
#include <algorithm>
#include <fstream>
const G4double G4RadioactiveDecay::levelTolerance =2.0*keV;
@@ -219,7 +219,7 @@ G4bool G4RadioactiveDecay::IsLoaded(const G4ParticleDefinition &
// Check whether the radioactive decay data on the ion have already been
// loaded.
//
return G4std::binary_search(LoadedNuclei.begin(),
return std::binary_search(LoadedNuclei.begin(),
LoadedNuclei.end(),
aParticle.GetParticleName());
}
@@ -238,7 +238,7 @@ void G4RadioactiveDecay::SelectAVolume(const G4String aVolume)
volume=(*theLogicalVolumes)[i];
if (volume->GetName() == aVolume) {
ValidVolumes.push_back(aVolume);
G4std::sort(ValidVolumes.begin(), ValidVolumes.end());
std::sort(ValidVolumes.begin(), ValidVolumes.end());
// sort need for performing binary_search
#ifdef G4VERBOSE
if (GetVerboseLevel()>0)
@@ -263,11 +263,11 @@ void G4RadioactiveDecay::DeselectAVolume(const G4String aVolume)
for (size_t i = 0; i < theLogicalVolumes->size(); i++){
volume=(*theLogicalVolumes)[i];
if (volume->GetName() == aVolume) {
G4std::vector<G4String>::iterator location;
location = G4std::find(ValidVolumes.begin(),ValidVolumes.end(),aVolume);
std::vector<G4String>::iterator location;
location = std::find(ValidVolumes.begin(),ValidVolumes.end(),aVolume);
if (location != ValidVolumes.end()) {
ValidVolumes.erase(location);
G4std::sort(ValidVolumes.begin(), ValidVolumes.end());
std::sort(ValidVolumes.begin(), ValidVolumes.end());
}else{
G4cerr << " DeselectVolume:" << aVolume << " is not in the list"<< G4endl;
}
@@ -304,7 +304,7 @@ void G4RadioactiveDecay::SelectAllVolumes()
G4cout << " RDM Applies to Volume " << volume->GetName() << G4endl;
#endif
}
G4std::sort(ValidVolumes.begin(), ValidVolumes.end());
std::sort(ValidVolumes.begin(), ValidVolumes.end());
// sort needed in order to allow binary_search
}
////////////////////////////////////////////////////////////////////////////////
@@ -622,17 +622,17 @@ G4DecayTable *G4RadioactiveDecay::LoadDecayTable (G4ParticleDefinition
G4String dirName = getenv("G4RADIOACTIVEDATA");
LoadedNuclei.push_back(theParentNucleus.GetParticleName());
G4std::sort( LoadedNuclei.begin(), LoadedNuclei.end() );
std::sort( LoadedNuclei.begin(), LoadedNuclei.end() );
// sort needed to allow binary_search
char val[100];
G4std::ostrstream os(val,100);
std::ostrstream os(val,100);
os <<dirName <<"/z" <<Z <<".a" <<A <<'\0';
G4String file(val);
G4std::ifstream DecaySchemeFile(file);
std::ifstream DecaySchemeFile(file);
if (!DecaySchemeFile)
//
@@ -684,7 +684,7 @@ G4DecayTable *G4RadioactiveDecay::LoadDecayTable (G4ParticleDefinition
inputLine = inputLine.strip(1);
if (inputChars[0] != '#' && inputLine.length() != 0)
{
G4std::istrstream tmpStream(inputLine);
std::istrstream tmpStream(inputLine);
if (inputChars[0] == 'P')
//
//
@@ -731,7 +731,7 @@ G4DecayTable *G4RadioactiveDecay::LoadDecayTable (G4ParticleDefinition
//
{
G4ITDecayChannel *anITChannel = new G4ITDecayChannel
(GetVerboseLevel(), &theParentNucleus, b);
(GetVerboseLevel(), (const G4Ions*) &theParentNucleus, b);
theDecayTable->Insert(anITChannel);
break;
}
@@ -900,7 +900,7 @@ G4DecayTable *G4RadioactiveDecay::LoadDecayTable (G4ParticleDefinition
// Decay mode is isomeric transition.
//
G4ITDecayChannel *anITChannel = new G4ITDecayChannel
(GetVerboseLevel(), &theParentNucleus, 1);
(GetVerboseLevel(), (const G4Ions*) &theParentNucleus, 1);
theDecayTable->Insert(anITChannel);
}
//
@@ -940,8 +940,8 @@ G4DecayTable *G4RadioactiveDecay::LoadDecayTable (G4ParticleDefinition
//
//
void G4RadioactiveDecay::SetDecayRate(G4int theZ, G4int theA, G4double theE,
G4int theG, G4std::vector<G4double> theRates,
G4std::vector<G4double> theTaos)
G4int theG, std::vector<G4double> theRates,
std::vector<G4double> theTaos)
{
//fill the decay rate vector
theDecayRate.SetZ(theZ);
@@ -969,8 +969,8 @@ void G4RadioactiveDecay::AddDecayRateTable(const G4ParticleDefinition &theParent
theDecayRateVector.clear();
G4int nGeneration = 0;
G4std::vector<G4double> rates;
G4std::vector<G4double> taos;
std::vector<G4double> rates;
std::vector<G4double> taos;
// start rate is -1.
rates.push_back(-1.);
@@ -1010,8 +1010,8 @@ void G4RadioactiveDecay::AddDecayRateTable(const G4ParticleDefinition &theParent
G4int AD = 0;
G4int ZD = 0;
G4double EP = 0.;
G4std::vector<G4double> TP;
G4std::vector<G4double> RP;
std::vector<G4double> TP;
std::vector<G4double> RP;
G4ParticleDefinition *theDaughterNucleus;
G4double daughterExcitation;
G4ParticleDefinition *aParentNucleus;
@@ -1102,7 +1102,7 @@ void G4RadioactiveDecay::AddDecayRateTable(const G4ParticleDefinition &theParent
//
theITChannel = new G4ITDecayChannel
(0, aParentNucleus, brs[0]);
(0, (const G4Ions*) aParentNucleus, brs[0]);
theDecayTable->Insert(theITChannel);
break;
@@ -1232,7 +1232,7 @@ void G4RadioactiveDecay::AddDecayRateTable(const G4ParticleDefinition &theParent
//
void G4RadioactiveDecay::SetSourceTimeProfile(G4String filename)
{
G4std::ifstream infile ( filename, G4std::ios::in );
std::ifstream infile ( filename, std::ios::in );
if ( !infile ) G4Exception ( "Unable to open source data file" );
float bin, flux;
@@ -1259,7 +1259,7 @@ void G4RadioactiveDecay::SetSourceTimeProfile(G4String filename)
//
void G4RadioactiveDecay::SetDecayBias(G4String filename)
{
G4std::ifstream infile ( filename, G4std::ios::in);
std::ifstream infile ( filename, std::ios::in);
if ( !infile ) G4Exception ( "Unable to open bias data file" );
float bin, flux;
@@ -1297,7 +1297,7 @@ G4VParticleChange* G4RadioactiveDecay::DecayIt(const G4Track& theTrack, const G4
// First check whether RDM applies to the current logical volume
//
if(!G4std::binary_search(ValidVolumes.begin(),
if(!std::binary_search(ValidVolumes.begin(),
ValidVolumes.end(),
theTrack.GetVolume()->GetLogicalVolume()->GetName()))
{
@@ -1488,8 +1488,8 @@ G4VParticleChange* G4RadioactiveDecay::DecayIt(const G4Track& theTrack, const G4
G4int PZ;
G4int PA;
G4double PE;
G4std::vector<G4double> PT;
G4std::vector<G4double> PR;
std::vector<G4double> PT;
std::vector<G4double> PR;
G4double taotime;
G4double decayRate;
@@ -1501,8 +1501,8 @@ G4VParticleChange* G4RadioactiveDecay::DecayIt(const G4Track& theTrack, const G4
G4int ndecaych;
G4DynamicParticle* asecondaryparticle;
// G4DecayProducts* products = NULL;
G4std::vector<G4DynamicParticle*> secondaryparticles;
G4std::vector<G4double> pw;
std::vector<G4DynamicParticle*> secondaryparticles;
std::vector<G4double> pw;
pw.clear();
//now apply the nucleus splitting
//
source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayMode.cc
+1 -1
View File
@@ -23,7 +23,7 @@
#include "G4RadioactiveDecayMode.hh"
G4std::istream &operator >> (G4std::istream &s, G4RadioactiveDecayMode &q)
std::istream &operator >> (std::istream &s, G4RadioactiveDecayMode &q)
{
G4String a;
s >> a;
source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecaymessenger.cc
+4 -4
View File
@@ -24,7 +24,7 @@
//
#include "G4RadioactiveDecaymessenger.hh"
#include "g4std/iostream"
#include <iostream>
////////////////////////////////////////////////////////////////////////////////
//
G4RadioactiveDecaymessenger::G4RadioactiveDecaymessenger
@@ -179,13 +179,13 @@ void G4RadioactiveDecaymessenger::SetNewValue (G4UIcommand *command, G4String ne
else if (command==analoguemcCmd) {
G4int vl;
const char* t = newValues;
G4std::istrstream is((char*)t);
std::istrstream is((char*)t);
is >> vl;
theRadioactiveDecayContainer->SetAnalogueMonteCarlo(vl!=0);}
else if (command==fbetaCmd) {
G4int vl;
const char* t = newValues;
G4std::istrstream is((char*)t);
std::istrstream is((char*)t);
is >> vl;
theRadioactiveDecayContainer->SetFBeta(vl!=0);}
else if (command==avolumeCmd) {theRadioactiveDecayContainer->
@@ -199,7 +199,7 @@ void G4RadioactiveDecaymessenger::SetNewValue (G4UIcommand *command, G4String ne
else if (command==brbiasCmd) {
G4int vl;
const char* t = newValues;
G4std::istrstream is((char*)t);
std::istrstream is((char*)t);
is >> vl;
theRadioactiveDecayContainer->SetBRBias(vl!=0);}
else if (command==sourcetimeprofileCmd) {theRadioactiveDecayContainer->
source/processes/hadronic/models/radiative_decay/src/G4UIcmdWithNucleusLimits.cc
+3 -3
View File
@@ -22,7 +22,7 @@
//
//
#include "G4UIcmdWithNucleusLimits.hh"
#include "g4std/strstream"
#include <strstream>
////////////////////////////////////////////////////////////////////////////////
//
G4UIcmdWithNucleusLimits::G4UIcmdWithNucleusLimits
@@ -55,7 +55,7 @@ G4NucleusLimits G4UIcmdWithNucleusLimits::
G4int zMin;
G4int zMax;
const char* t = paramString;
G4std::istrstream is((char*)t);
std::istrstream is((char*)t);
is >> aMin >> aMax >> zMin >> zMax;
return G4NucleusLimits(aMin,aMax,zMin,zMax);
}
@@ -65,7 +65,7 @@ G4String G4UIcmdWithNucleusLimits::ConvertToString
(G4NucleusLimits defLimits)
{
char st[100];
G4std::ostrstream os(st,100);
std::ostrstream os(st,100);
os << defLimits.GetAMin() << " " << defLimits.GetAMax()
<< defLimits.GetZMin() << " " << defLimits.GetZMax()<< '\0';
G4String vl = st;