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

Import Geant4 8.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 14:36:02 +02:00
parent d93e1e39a9
commit 8a51e0bc40
5471 changed files with 99628 additions and 55248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/lowenergy/src/G4AugerData.cc
+8 -8
View File
@@ -40,7 +40,7 @@
#include "G4Element.hh"
#include "G4ElementVector.hh"
#include <fstream>
#include <strstream>
#include <sstream>
G4AugerData::G4AugerData()
{
@@ -232,15 +232,14 @@ std::vector<G4AugerTransition> G4AugerData::LoadData(G4int Z)
{
// Build the complete string identifying the file with the data set
char nameChar[100] = {""};
std::ostrstream ost(nameChar, 100, std::ios::out);
std::ostringstream ost;
if(Z != 0){
ost << "au-tr-pr-"<< Z << ".dat";
}
else{
ost << "au-tr-pr-"<<".dat";
}
G4String name(nameChar);
G4String name(ost.str());
char* path = getenv("G4LEDATA");
if (!path)
@@ -400,8 +399,8 @@ std::vector<G4AugerTransition> G4AugerData::LoadData(G4int Z)
}
else {
std::vector<G4int>::iterator vectorIndex = (initIds->end())-1;
if((G4int)a != *vectorIndex){
// std::vector<G4int>::iterator vectorIndex = (initIds->end())-1;
if((G4int)a != initIds->back()){
if((initIds->size()) == 1) {
@@ -409,9 +408,9 @@ std::vector<G4AugerTransition> G4AugerData::LoadData(G4int Z)
}
else {
initIds->push_back((G4int)a);
G4int augerShellId = 0;
augerShellId = *vectorIndex;
augerShellId = initIds->back();
(*newIdMap)[augerShellId] = *newIds;
(*newEnergyMap)[augerShellId] = *transEnergies;
@@ -422,6 +421,7 @@ std::vector<G4AugerTransition> G4AugerData::LoadData(G4int Z)
newIds = new std::vector<G4int>;
transEnergies = new G4DataVector;
transProbabilities = new G4DataVector;
initIds->push_back((G4int)a);
}
}
}