Import Geant4 10.5.1 source tree
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
//
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user