Changeset 921 for trunk/source/materials/include/G4Element.hh

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/source/materials/include/G4Element.hh (modified) (7 diffs)

trunk/source/materials/include/G4Element.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Element.hh,v 1.22 2006/10/17 15:15:46 vnivanch Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4Element.hh,v 1.23 2008/11/14 15:14:24 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 
@@ -118 +118 @@
   // retrieval methods
   //
-  G4String GetName()   const {return fName;};
-  G4String GetSymbol() const {return fSymbol;};
-  G4double GetZ()      const {return fZeff;};     //atomic number
-  G4double GetN()      const {return fNeff;};     //number of nucleons
-  G4double GetA()      const {return fAeff;};     //mass of a mole
+  const G4String& GetName()   const {return fName;}
+  const G4String& GetSymbol() const {return fSymbol;}
+  G4double GetZ()      const {return fZeff;}     //atomic number
+  G4double GetN()      const {return fNeff;}     //number of nucleons
+  G4double GetA()      const {return fAeff;}     //mass of a mole
   G4bool   GetNaturalAbandancesFlag();
 
@@ -129 +129 @@
   //the number of atomic shells in this element:
   //
-  G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;};
+  G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;}
   
   //the binding energy of the shell:
@@ -137 +137 @@
   //number of isotopes constituing this element:
   //
-  size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;};
+  size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;}
    
   //vector of pointers to isotopes constituing this element:
   //
-  G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;};
+  G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;}
     
   //vector of relative abundance of each isotope:
   //
   G4double* GetRelativeAbundanceVector() const 
-                   {return fRelativeAbundanceVector;};
+                   {return fRelativeAbundanceVector;}
     
   const G4Isotope* GetIsotope(G4int iso) const 
-                   {return (*theIsotopeVector)[iso];};
+                   {return (*theIsotopeVector)[iso];}
 
   //the (static) Table of Elements:
@@ -161 +161 @@
   //the index of this element in the Table:
   //
-  size_t GetIndex() const {return fIndexInTable;};
+  size_t GetIndex() const {return fIndexInTable;}
     
   //return pointer to an element, given its name:
@@ -170 +170 @@
   //count number of materials which use this element
   //
-  G4int GetCountUse() const {return fCountUse;};
-  void  increaseCountUse()  {fCountUse++;};
-  void  decreaseCountUse()  {fCountUse--;};
+  G4int GetCountUse() const {return fCountUse;}
+  void  increaseCountUse()  {fCountUse++;}
+  void  decreaseCountUse()  {fCountUse--;}
   
   //count elements with same Z
   //
-  G4int GetIndexZ() const {return fIndexZ;};
+  G4int GetIndexZ() const {return fIndexZ;}
         
   //Coulomb correction factor:
   //
-  G4double GetfCoulomb() const {return fCoulomb;};
+  G4double GetfCoulomb() const {return fCoulomb;}
    
   //Tsai formula for the radiation length:
   //
-  G4double GetfRadTsai() const {return fRadTsai;};
+  G4double GetfRadTsai() const {return fRadTsai;}
     
   //pointer to ionisation parameters:
   //
-  G4IonisParamElm* GetIonisation() const {return fIonisation;};
+  G4IonisParamElm* GetIonisation() const {return fIonisation;}
     
   // printing methods
@@ -205 +205 @@
     // persistency for clients requiring preallocation of memory for
     // persistifiable objects.
+
+  void SetName(const G4String& name)  {fName=name;}
 
 private: