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/materials/src/G4AtomicShells.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AtomicShells.cc,v 1.3 2001/07/11 10:01:27 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4Element.cc
+15 -19
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Element.cc,v 1.15 2002/02/26 17:34:34 maire Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Element.cc,v 1.17 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -48,7 +48,7 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4Element.hh"
#include "g4std/iomanip"
#include <iomanip>
G4ElementTable G4Element::theElementTable;
@@ -352,38 +352,34 @@ G4int G4Element::operator!=(const G4Element& right) const
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
std::ostream& operator<<(std::ostream& flux, G4Element* element)
{
#ifdef G4USE_STD_NAMESPACE
G4std::ios::fmtflags mode = flux.flags();
flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#else
long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#endif
long prec = flux.precision(3);
std::ios::fmtflags mode = flux.flags();
flux.setf(std::ios::fixed,std::ios::floatfield);
G4long prec = flux.precision(3);
flux
<< " Element: " << G4std::setw(8) << element->fName << G4std::setw(3)
<< " Element: " << std::setw(8) << element->fName << std::setw(3)
<< element->fSymbol
<< " Z = " << G4std::setw(4) << G4std::setprecision(1) << element->fZeff
<< " N = " << G4std::setw(5) << G4std::setprecision(1) << element->fNeff
<< " A = " << G4std::setw(6) << G4std::setprecision(2)
<< " Z = " << std::setw(4) << std::setprecision(1) << element->fZeff
<< " N = " << std::setw(5) << std::setprecision(1) << element->fNeff
<< " A = " << std::setw(6) << std::setprecision(2)
<< (element->fAeff)/(g/mole) << " g/mole";
for (size_t i=0; i<element->fNumberOfIsotopes; i++)
flux
<< "\n ---> " << (*(element->theIsotopeVector))[i]
<< " abundance: " << G4std::setw(6) << G4std::setprecision(2)
<< " abundance: " << std::setw(6) << std::setprecision(2)
<< (element->fRelativeAbundanceVector[i])/perCent << " %";
flux.precision(prec);
flux.setf(mode,G4std::ios::floatfield);
flux.setf(mode,std::ios::floatfield);
return flux;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Element& element)
std::ostream& operator<<(std::ostream& flux, G4Element& element)
{
flux << &element;
return flux;
@@ -391,7 +387,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4ElementTable ElementTable)
std::ostream& operator<<(std::ostream& flux, G4ElementTable ElementTable)
{
//Dump info for all known elements
flux << "\n***** Table : Nb of elements = " << ElementTable.size()
source/materials/src/G4IonisParamElm.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamElm.cc,v 1.8 2002/10/17 09:00:29 vnivanch Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4IonisParamMat.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamMat.cc,v 1.10 2002/10/29 16:17:05 vnivanch Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4Isotope.cc
+15 -19
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Isotope.cc,v 1.12 2002/02/26 17:34:34 maire Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Isotope.cc,v 1.15 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -37,7 +37,7 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "G4Isotope.hh"
#include "g4std/iomanip"
#include <iomanip>
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -92,7 +92,7 @@ G4Isotope & G4Isotope::operator=(const G4Isotope& right)
{
fName = right.fName;
fZ = right.fZ;
fN = right.fZ;
fN = right.fN;
fA = right.fA;
}
return *this;
@@ -114,31 +114,27 @@ G4int G4Isotope::operator!=(const G4Isotope &right) const
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope* isotope)
std::ostream& operator<<(std::ostream& flux, G4Isotope* isotope)
{
#ifdef G4USE_STD_NAMESPACE
G4std::ios::fmtflags mode = flux.flags();
flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#else
long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#endif
long prec = flux.precision(3);
std::ios::fmtflags mode = flux.flags();
flux.setf(std::ios::fixed,std::ios::floatfield);
G4long prec = flux.precision(3);
flux
<< " Isotope: " << G4std::setw(5) << isotope->fName
<< " Z = " << G4std::setw(2) << isotope->fZ
<< " N = " << G4std::setw(3) << isotope->fN
<< " A = " << G4std::setw(6) << G4std::setprecision(2)
<< " Isotope: " << std::setw(5) << isotope->fName
<< " Z = " << std::setw(2) << isotope->fZ
<< " N = " << std::setw(3) << isotope->fN
<< " A = " << std::setw(6) << std::setprecision(2)
<< (isotope->fA)/(g/mole) << " g/mole";
flux.precision(prec);
flux.setf(mode,G4std::ios::floatfield);
flux.setf(mode,std::ios::floatfield);
return flux;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope& isotope)
std::ostream& operator<<(std::ostream& flux, G4Isotope& isotope)
{
flux << &isotope;
return flux;
@@ -146,7 +142,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope* isotope)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4IsotopeTable IsotopeTable)
std::ostream& operator<<(std::ostream& flux, G4IsotopeTable IsotopeTable)
{
//Dump info for all known isotopes
flux
source/materials/src/G4MPVEntry.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MPVEntry.cc,v 1.6 2001/07/11 10:01:28 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4Material.cc
+17 -21
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Material.cc,v 1.22 2002/08/06 15:14:29 maire Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4Material.cc,v 1.24 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//
@@ -62,7 +62,7 @@
#include "G4Material.hh"
#include "G4UnitsTable.hh"
#include "g4std/iomanip"
#include <iomanip>
G4MaterialTable G4Material::theMaterialTable;
@@ -518,47 +518,43 @@ G4int G4Material::operator!=(const G4Material& right) const
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
std::ostream& operator<<(std::ostream& flux, G4Material* material)
{
#ifdef G4USE_STD_NAMESPACE
G4std::ios::fmtflags mode = flux.flags();
flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#else
long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
#endif
long prec = flux.precision(3);
std::ios::fmtflags mode = flux.flags();
flux.setf(std::ios::fixed,std::ios::floatfield);
G4long prec = flux.precision(3);
flux
<< " Material: " << G4std::setw(8) << material->fName
<< " Material: " << std::setw(8) << material->fName
<< " " << material->fChemicalFormula << " "
<< " density: " << G4std::setw(6) << G4std::setprecision(3)
<< " density: " << std::setw(6) << std::setprecision(3)
<< G4BestUnit(material->fDensity,"Volumic Mass")
<< " temperature: " << G4std::setw(6) << G4std::setprecision(2)
<< " temperature: " << std::setw(6) << std::setprecision(2)
<< (material->fTemp)/kelvin << " K"
<< " pressure: " << G4std::setw(6) << G4std::setprecision(2)
<< " pressure: " << std::setw(6) << std::setprecision(2)
<< (material->fPressure)/atmosphere << " atm"
<< " RadLength: " << G4std::setw(7) << G4std::setprecision(3)
<< " RadLength: " << std::setw(7) << std::setprecision(3)
<< G4BestUnit(material->fRadlen,"Length");
for (size_t i=0; i<material->fNumberOfElements; i++)
flux
<< "\n ---> " << (*(material->theElementVector))[i]
<< " fractionMass: " << G4std::setw(6)<< G4std::setprecision(2)
<< " fractionMass: " << std::setw(6)<< std::setprecision(2)
<< (material->fMassFractionVector[i])/perCent << " %"
<< " Abundance " << G4std::setw(6)<< G4std::setprecision(2)
<< " Abundance " << std::setw(6)<< std::setprecision(2)
<< 100*(material->VecNbOfAtomsPerVolume[i])/
(material->TotNbOfAtomsPerVolume)
<< " %";
flux.precision(prec);
flux.setf(mode,G4std::ios::floatfield);
flux.setf(mode,std::ios::floatfield);
return flux;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4Material& material)
std::ostream& operator<<(std::ostream& flux, G4Material& material)
{
flux << &material;
return flux;
@@ -566,7 +562,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4std::ostream& operator<<(G4std::ostream& flux, G4MaterialTable MaterialTable)
std::ostream& operator<<(std::ostream& flux, G4MaterialTable MaterialTable)
{
//Dump info for all known materials
flux << "\n***** Table : Nb of materials = " << MaterialTable.size()
source/materials/src/G4MaterialPropertiesTable.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialPropertiesTable.cc,v 1.13 2002/11/07 02:30:29 gum Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4MaterialPropertyVector.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4MaterialPropertyVector.cc,v 1.13 2002/01/22 15:23:58 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4MaterialPropertyVector.cc,v 1.14 2003/06/16 16:56:25 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
////////////////////////////////////////////////////////////////////////
@@ -144,7 +144,7 @@ void G4MaterialPropertyVector::AddElement(G4double aPhotonMomentum,
newElement = new G4MPVEntry(aPhotonMomentum, aPropertyValue);
MPV.push_back(newElement);
G4std::sort(MPV.begin(), MPV.end(), MPVEntry_less());
std::sort(MPV.begin(), MPV.end(), MPVEntry_less());
NumEntries++;
}
@@ -155,7 +155,7 @@ void G4MaterialPropertyVector::RemoveElement(G4double aPhotonMomentum)
newElement = new G4MPVEntry(aPhotonMomentum, DBL_MAX);
G4std::vector<G4MPVEntry*>::iterator i;
std::vector<G4MPVEntry*>::iterator i;
for (i = MPV.begin(); i != MPV.end(); i++)
if (**i == *newElement) {success = *i; break;}
// success = MPV.remove(newElement);
@@ -214,7 +214,7 @@ G4MaterialPropertyVector::GetProperty(G4double aPhotonMomentum) const
temp = 0;
//temp = MPV.find(target);
G4std::vector<G4MPVEntry*>::const_iterator i;
std::vector<G4MPVEntry*>::const_iterator i;
for (i = MPV.begin(); i != MPV.end(); i++)
if (**i == *target) {temp = *i; break;}
if (temp != 0) {
source/materials/src/G4OpticalSurface.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpticalSurface.cc,v 1.7 2001/10/17 07:59:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4SandiaTable.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4SandiaTable.cc,v 1.14 2001/10/17 07:59:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4SandiaTable.cc,v 1.16 2003/06/16 16:56:26 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
//
@@ -46,7 +46,7 @@ G4double G4SandiaTable::fSandiaCofPerAtom[4];
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
G4SandiaTable::G4SandiaTable(G4int matIndex)
G4SandiaTable::G4SandiaTable(G4int)
{
fMatSandiaMatrix = 0 ;
fPhotoAbsorptionCof = 0 ;
@@ -114,7 +114,7 @@ void G4SandiaTable::ComputeMatSandiaMatrix()
{
IonizationPot = GetIonizationPot(Z[elm]);
for (G4int row=fCumulInterval[Z[elm]-1];row<fCumulInterval[Z[elm]];row++)
tmp1[interval1++] = G4std::max(fSandiaTable[row][0]*keV,IonizationPot);
tmp1[interval1++] = std::max(fSandiaTable[row][0]*keV,IonizationPot);
}
//