Import Geant4 3.1.0 source tree
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4Element.hh,v 1.5 1999/12/16 18:11:08 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// $Id: G4Element.hh,v 1.7 2001/03/30 14:43:15 maire Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
|
||||
// class description
|
||||
@@ -44,6 +44,7 @@
|
||||
// 09-07-98, Ionisation parameters removed from the class, M.Maire
|
||||
// 04-08-98, new method GetElement(elementName), M.Maire
|
||||
// 16-11-98, Subshell -> Shell, mma
|
||||
// 30-03-01, suppression of the warning message in GetElement
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
|
||||
|
||||
@@ -92,7 +93,7 @@ public: // with description
|
||||
G4double RelativeAbundance); //fraction of nb of
|
||||
//atomes per volume
|
||||
|
||||
~G4Element();
|
||||
virtual ~G4Element();
|
||||
|
||||
//
|
||||
// retrieval methods
|
||||
@@ -145,15 +146,15 @@ public: // with description
|
||||
friend G4std::ostream& operator<<(G4std::ostream&, G4ElementTable);
|
||||
|
||||
public: // without description
|
||||
|
||||
|
||||
G4int operator==(const G4Element&) const;
|
||||
G4int operator!=(const G4Element&) const;
|
||||
|
||||
|
||||
private:
|
||||
|
||||
G4Element(G4Element &right);
|
||||
const G4Element & operator=(const G4Element &right);
|
||||
|
||||
G4Element(G4Element&);
|
||||
const G4Element & operator=(const G4Element&);
|
||||
|
||||
private:
|
||||
|
||||
void InitializePointers();
|
||||
@@ -205,8 +206,7 @@ G4Element* G4Element::GetElement(G4String elementName)
|
||||
return theElementTable[J];
|
||||
}
|
||||
|
||||
G4cerr << " Warning from GetElement(name). The element: " << elementName
|
||||
<< " does not exist in the ElementTable. Return NULL pointer \n";
|
||||
// the element does not exist in the table
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user