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

Import Geant4 10.5.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-04-17 10:39:02 +02:00
parent a7fdc52004
commit 28a70706e0
661 changed files with 55791 additions and 106984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/History
+11
View File
@@ -16,6 +16,17 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
11-03-19 M.Novak (materials-V10-04-11)
- G4NistMaterialBuilder - fixed atomic number value in simple material printout
13-02-19 V.Ivanchenko
- G4NistManager - added more detailed comments to public methods
- G4NistMaterialBuilder - fixed build of gas materials
(problem reports #2133, #2134)
31-01-19 I.Hrivnacova
- Merged GitHub PR #4: all Boolean operators now return G4bool.
19-10-18 V.Ivanchenko (materials-V10-04-10)
18-10-18 V.Ivanchenko (materials-V10-04-09)
- G4ICRU90StoppingData - fixed initialisation
source/materials/include/G4Element.hh
+2 -2
View File
@@ -222,8 +222,8 @@ private:
G4Element(G4Element&) = delete;
const G4Element & operator=(const G4Element&) = delete;
G4int operator==(const G4Element&) const = delete;
G4int operator!=(const G4Element&) const = delete;
G4bool operator==(const G4Element&) const = delete;
G4bool operator!=(const G4Element&) const = delete;
//
// Basic data members (which define an Element)
source/materials/include/G4IonisParamElm.hh
+2 -2
View File
@@ -89,8 +89,8 @@ private:
// operators
G4IonisParamElm& operator=(const G4IonisParamElm&) = delete;
G4int operator==(const G4IonisParamElm&) const = delete;
G4int operator!=(const G4IonisParamElm&) const = delete;
G4bool operator==(const G4IonisParamElm&) const = delete;
G4bool operator!=(const G4IonisParamElm&) const = delete;
G4IonisParamElm(G4IonisParamElm&) = delete;
//
// data members
source/materials/include/G4IonisParamMat.hh
+2 -2
View File
@@ -168,8 +168,8 @@ private:
// operators
G4IonisParamMat& operator=(const G4IonisParamMat&) = delete;
G4int operator==(const G4IonisParamMat&) const = delete;
G4int operator!=(const G4IonisParamMat&) const = delete;
G4bool operator==(const G4IonisParamMat&) const = delete;
G4bool operator!=(const G4IonisParamMat&) const = delete;
G4IonisParamMat(const G4IonisParamMat&) = delete;
//
source/materials/include/G4Isotope.hh
+2 -2
View File
@@ -120,8 +120,8 @@ class G4Isotope
public: // without description
G4int operator==(const G4Isotope&) const;
G4int operator!=(const G4Isotope&) const;
G4bool operator==(const G4Isotope&) const;
G4bool operator!=(const G4Isotope&) const;
G4Isotope(__void__&);
// Fake default constructor for usage restricted to direct object
source/materials/include/G4Material.hh
+3 -3
View File
@@ -113,7 +113,7 @@
enum G4State { kStateUndefined = 0, kStateSolid, kStateLiquid, kStateGas };
static const G4double NTP_Temperature = 293.15;
static const G4double NTP_Temperature = 293.15*CLHEP::kelvin;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -282,8 +282,8 @@ public: // with description
private:
// operators
G4int operator==(const G4Material&) const = delete;
G4int operator!=(const G4Material&) const = delete;
G4bool operator==(const G4Material&) const = delete;
G4bool operator!=(const G4Material&) const = delete;
G4Material(const G4Material&) = delete;
const G4Material& operator=(const G4Material&) = delete;
source/materials/include/G4NistManager.hh
+2
View File
@@ -197,6 +197,7 @@ public:
G4double pres = CLHEP::STP_Pressure);
// Construct a G4Material from scratch by atome count
// temperature and pressure should be consistent with the density
//
inline G4Material* ConstructNewMaterial(
const G4String& name,
@@ -209,6 +210,7 @@ public:
G4double pressure = CLHEP::STP_Pressure);
// Construct a G4Material from scratch by fraction mass
// temperature and pressure should be consistent with the density
//
inline G4Material* ConstructNewMaterial(
const G4String& name,
source/materials/include/G4NistMaterialBuilder.hh
+1 -2
View File
@@ -173,8 +173,7 @@ private:
G4double pot=0.0, G4int ncomp=1,
G4State=kStateSolid, G4bool stp = true);
void AddGas(const G4String& nameMat, G4double t=NTP_Temperature,
G4double p=CLHEP::STP_Pressure);
void AddGas(const G4String& nameMat, G4double T, G4double P);
void AddElementByWeightFraction(G4int Z, G4double);
void AddElementByAtomCount (G4int Z, G4int);
source/materials/include/G4OpticalSurface.hh
+2 -2
View File
@@ -136,8 +136,8 @@ public: // Without description
G4OpticalSurface(const G4OpticalSurface &right);
G4OpticalSurface & operator=(const G4OpticalSurface &right);
G4int operator==(const G4OpticalSurface &right) const;
G4int operator!=(const G4OpticalSurface &right) const;
G4bool operator==(const G4OpticalSurface &right) const;
G4bool operator!=(const G4OpticalSurface &right) const;
public: // With description
source/materials/include/G4SurfaceProperty.hh
+2 -2
View File
@@ -87,8 +87,8 @@ class G4SurfaceProperty
// G4SurfaceProperty(const G4SurfaceProperty &right);
// const G4SurfaceProperty & operator=(const G4SurfaceProperty &right);
// G4int operator==(const G4SurfaceProperty &right) const;
// G4int operator!=(const G4SurfaceProperty &right) const;
// G4bool operator==(const G4SurfaceProperty &right) const;
// G4bool operator!=(const G4SurfaceProperty &right) const;
public: // With description
source/materials/src/G4Isotope.cc
+2 -2
View File
@@ -121,14 +121,14 @@ G4Isotope & G4Isotope::operator=(const G4Isotope& right)
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4int G4Isotope::operator==(const G4Isotope &right) const
G4bool G4Isotope::operator==(const G4Isotope &right) const
{
return (this == (G4Isotope *) &right);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4int G4Isotope::operator!=(const G4Isotope &right) const
G4bool G4Isotope::operator!=(const G4Isotope &right) const
{
return (this != (G4Isotope *) &right);
}
source/materials/src/G4NistMaterialBuilder.cc
+14 -11
View File
@@ -194,8 +194,9 @@ G4Material* G4NistMaterialBuilder::BuildMaterial(G4int i)
}
}
}
}
// liquids
} else if( !STP[i] ) { t = 0.0; }
// } else if( !STP[i] ) { t = 0.0; }
mat = new G4Material(names[i],densities[i],nc,states[i],t,p);
@@ -277,10 +278,11 @@ G4Material* G4NistMaterialBuilder::ConstructNewMaterial(
// add parameters of material into internal vectors
// density in g/cm3, mean ionisation potential is not defined
G4bool stp = true;
if(state == kStateGas && (temp != NTP_Temperature || pres != STP_Pressure))
if(state == kStateGas &&
(temp != NTP_Temperature || pres != CLHEP::STP_Pressure))
{ stp = false; }
AddMaterial(name,dens*cm3/g,0,0.,els,state,stp);
AddMaterial(name,dens*CLHEP::cm3/CLHEP::g,0,0.,els,state,stp);
if(!stp) { AddGas(name,temp,pres); }
for (G4int i=0; i<els; ++i) {
@@ -327,9 +329,10 @@ G4Material* G4NistMaterialBuilder::ConstructNewMaterial(
// add parameters of material into internal vectors
// density in g/cm3, mean ionisation potential is not defined
G4bool stp = true;
if(state == kStateGas && (temp != NTP_Temperature || pres != STP_Pressure))
if(state == kStateGas &&
(temp != NTP_Temperature || pres != CLHEP::STP_Pressure))
{ stp = false; }
AddMaterial(name,dens*cm3/g,0,0.,els,state,stp);
AddMaterial(name,dens*CLHEP::cm3/CLHEP::g,0,0.,els,state,stp);
if(!stp) { AddGas(name,temp,pres); }
for (G4int i=0; i<els; ++i) {
@@ -423,10 +426,10 @@ G4Material* G4NistMaterialBuilder::ConstructNewIdealGasMaterial(
// add parameters of material into internal vectors
// density in g/cm3, mean ionisation potential is not defined
G4bool stp = true;
if(temp != NTP_Temperature && pres != STP_Pressure)
if(temp != NTP_Temperature || pres != CLHEP::STP_Pressure)
{ stp = false; }
G4double massPerMole = 0;
G4double massPerMole = 0.;
G4int Z = 0;
for (G4int i=0; i<els; ++i) {
@@ -603,11 +606,11 @@ void G4NistMaterialBuilder::ListBioChemicalMaterials() const
void G4NistMaterialBuilder::DumpElm(G4int i) const
{
G4cout << std::setw(2) << i+1 << " "
<< std::setw(6) << names[i]
G4cout << std::setw(2) << i << " "
<< std::setw(6) << names[i]
<< std::setw(14) << densities[i]*cm3/g
<< std::setw(11) << ionPotentials[i]/eV
<< G4endl;
<< std::setw(11) << ionPotentials[i]/eV
<< G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/materials/src/G4OpticalSurface.cc
+2 -2
View File
@@ -191,12 +191,12 @@ G4OpticalSurface::G4OpticalSurface(const G4OpticalSurface &right)
*(this->DichroicVector) = *(right.DichroicVector);
}
G4int G4OpticalSurface::operator==(const G4OpticalSurface &right) const
G4bool G4OpticalSurface::operator==(const G4OpticalSurface &right) const
{
return (this == (G4OpticalSurface *) &right);
}
G4int G4OpticalSurface::operator!=(const G4OpticalSurface &right) const
G4bool G4OpticalSurface::operator!=(const G4OpticalSurface &right) const
{
return (this != (G4OpticalSurface *) &right);
}