Changeset 921 for trunk/source/materials


Ignore:
Timestamp:
Feb 16, 2009, 10:14:30 AM (17 years ago)
Author:
garnier
Message:

en test de gl2ps. Problemes de libraries

Location:
trunk/source/materials
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/materials/History

    r850 r921  
    1 $Id: History,v 1.127 2008/08/13 16:06:42 vnivanch Exp $
     1$Id: History,v 1.131 2008/11/14 15:14:41 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     2014-11-08 G.Cosmo (materials-V09-01-19)
     21- Added SetName() method to G4Element, G4Isotope, G4Material for use
     22  in detector persistency. Use "const G4String&" for accessors, instead
     23  of implicit copy...
     24
     2502-11-08 V.Ivanchenko (materials-V09-01-18)
     26- G4IronStoppingICRU73, G4MaterialStoppingICRU73,
     27  G4SimpleMaterialStoppingICRU73: fixed inline methods.
     28
     2924-10-08 V.Ivanchenko (materials-V09-01-17)
     30- G4IronStoppingICRU73, G4MaterialStoppingICRU73,
     31  G4SimpleMaterialStoppingICRU73: renamed ICRU'73 data classes and inlined
     32  accessors.
     33
     3420-10-08 V.Ivanchenko (materials-V09-01-16)
     35- G4IronStopping, G4MaterialStopping, G4SimpleMaterialStopping: added
     36  ICRU'73 data on stopping powers 25 keV/n - 10 MeV/n
     37
    203813-08-08 V.Ivanchenko (materials-V09-01-15)
    21 G4Material - use array size defined in material constructor, extend it if
    22              a component is a compound material
     39- G4Material: use array size defined in material constructor, extend it if
     40  a component is a compound material
    2341
    244207-08-08 V.Ivanchenko (materials-V09-01-14)
    25 - G4NistElementBuilder - use best known parameterisation for total
    26                          binding energy of atoms, use standard masses
    27                          for lightest stable isotopes
    28 -G4NistManager and G4NistElementBuilder - added method
    29                                           GetTotalElectronBindingEnergy
    30 -G4Isotope - use AtomicMass instead of NuclearMass
    31 -G4Element - use G4int(fZeff) everywhere in the class
     43- G4NistElementBuilder: use best known parameterisation for total
     44  binding energy of atoms, use standard masses for lightest stable isotopes
     45- G4NistManager and G4NistElementBuilder: added method
     46  GetTotalElectronBindingEnergy().
     47- G4Isotope: use AtomicMass instead of NuclearMass.
     48- G4Element: use G4int(fZeff) everywhere in the class.
    3249
    335023-07-08 V.Ivanchenko (materials-V09-01-13)
    34 - G4NistManager - bug introduced in tag (-11) is fixed
     51- G4NistManager: fixed bug introduced in tag (-11).
    3552
    365321-07-08 P.Gumplinger (materials-V09-01-12)
    37 - G4SurfaceProperty and G4OpticalSurface, make them truly Polymorphic
     54- G4SurfaceProperty and G4OpticalSurface, make them truly polymorphic.
    3855
    395617-07-08 V.Ivanchenko (materials-V09-01-11)
    40 - G4NistManager - added inline methods to speed up EM computations
     57- G4NistManager: added inline methods to speed up EM computations.
    4158
    425916-07-08 P.Gumplinger (materials-V09-01-10)

  • trunk/source/materials/include/G4Element.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4Element.hh,v 1.22 2006/10/17 15:15:46 vnivanch Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Element.hh,v 1.23 2008/11/14 15:14:24 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030
    … …  
    118118  // retrieval methods
    119119  //
    120   G4String GetName()   const {return fName;};
    121   G4String GetSymbol() const {return fSymbol;};
    122   G4double GetZ()      const {return fZeff;};     //atomic number
    123   G4double GetN()      const {return fNeff;};     //number of nucleons
    124   G4double GetA()      const {return fAeff;};     //mass of a mole
     120  const G4String& GetName()   const {return fName;}
     121  const G4String& GetSymbol() const {return fSymbol;}
     122  G4double GetZ()      const {return fZeff;}     //atomic number
     123  G4double GetN()      const {return fNeff;}     //number of nucleons
     124  G4double GetA()      const {return fAeff;}     //mass of a mole
    125125  G4bool   GetNaturalAbandancesFlag();
    126126
    … …  
    129129  //the number of atomic shells in this element:
    130130  //
    131   G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;};
     131  G4int GetNbOfAtomicShells() const {return fNbOfAtomicShells;}
    132132 
    133133  //the binding energy of the shell:
    … …  
    137137  //number of isotopes constituing this element:
    138138  //
    139   size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;};
     139  size_t GetNumberOfIsotopes() const {return fNumberOfIsotopes;}
    140140   
    141141  //vector of pointers to isotopes constituing this element:
    142142  //
    143   G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;};
     143  G4IsotopeVector* GetIsotopeVector() const {return theIsotopeVector;}
    144144   
    145145  //vector of relative abundance of each isotope:
    146146  //
    147147  G4double* GetRelativeAbundanceVector() const
    148                    {return fRelativeAbundanceVector;};
     148                   {return fRelativeAbundanceVector;}
    149149   
    150150  const G4Isotope* GetIsotope(G4int iso) const
    151                    {return (*theIsotopeVector)[iso];};
     151                   {return (*theIsotopeVector)[iso];}
    152152
    153153  //the (static) Table of Elements:
    … …  
    161161  //the index of this element in the Table:
    162162  //
    163   size_t GetIndex() const {return fIndexInTable;};
     163  size_t GetIndex() const {return fIndexInTable;}
    164164   
    165165  //return pointer to an element, given its name:
    … …  
    170170  //count number of materials which use this element
    171171  //
    172   G4int GetCountUse() const {return fCountUse;};
    173   void  increaseCountUse()  {fCountUse++;};
    174   void  decreaseCountUse()  {fCountUse--;};
     172  G4int GetCountUse() const {return fCountUse;}
     173  void  increaseCountUse()  {fCountUse++;}
     174  void  decreaseCountUse()  {fCountUse--;}
    175175 
    176176  //count elements with same Z
    177177  //
    178   G4int GetIndexZ() const {return fIndexZ;};
     178  G4int GetIndexZ() const {return fIndexZ;}
    179179       
    180180  //Coulomb correction factor:
    181181  //
    182   G4double GetfCoulomb() const {return fCoulomb;};
     182  G4double GetfCoulomb() const {return fCoulomb;}
    183183   
    184184  //Tsai formula for the radiation length:
    185185  //
    186   G4double GetfRadTsai() const {return fRadTsai;};
     186  G4double GetfRadTsai() const {return fRadTsai;}
    187187   
    188188  //pointer to ionisation parameters:
    189189  //
    190   G4IonisParamElm* GetIonisation() const {return fIonisation;};
     190  G4IonisParamElm* GetIonisation() const {return fIonisation;}
    191191   
    192192  // printing methods
    … …  
    205205    // persistency for clients requiring preallocation of memory for
    206206    // persistifiable objects.
     207
     208  void SetName(const G4String& name)  {fName=name;}
    207209
    208210private:

  • trunk/source/materials/include/G4Isotope.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4Isotope.hh,v 1.20 2008/08/11 11:53:11 vnivanch Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Isotope.hh,v 1.21 2008/11/14 15:14:24 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    7474
    7575    // Make an isotope
     76    //
    7677    G4Isotope(const G4String& name,             //its name
    7778                    G4int     z,                //atomic number
    … …  
    8283
    8384    // Retrieval methods
    84     G4String GetName()  const {return fName;};   
    85     G4int    GetZ()     const {return fZ;};
    86     G4int    GetN()     const {return fN;};
    87     G4double GetA()     const {return fA;};
     85    //
     86    const G4String& GetName()  const {return fName;}
     87    G4int    GetZ()     const {return fZ;}
     88    G4int    GetN()     const {return fN;}
     89    G4double GetA()     const {return fA;}
    8890   
    89     G4int GetCountUse() const {return fCountUse;};
    90     void  increaseCountUse()  {fCountUse++;};
    91     void  decreaseCountUse()  {fCountUse--;};
     91    G4int GetCountUse() const {return fCountUse;}
    9292   
    9393    static 
    … …  
    100100    size_t GetNumberOfIsotopes();
    101101   
    102     size_t GetIndex() const {return fIndexInTable;};   
     102    size_t GetIndex() const {return fIndexInTable;}
    103103   
    104104    friend
    … …  
    121121      // persistifiable objects.
    122122   
     123    void SetName(const G4String& name) {fName=name;}
     124    void increaseCountUse()  {fCountUse++;}
     125    void decreaseCountUse()  {fCountUse--;}
     126
    123127 private:
    124128     
    125129    G4Isotope(G4Isotope&);
    126130    G4Isotope& operator=(const G4Isotope&);
    127      
     131
    128132 private:
    129133

  • trunk/source/materials/include/G4Material.hh

    r850 r921  
    2525//
    2626//
    27 // $Id: G4Material.hh,v 1.26 2008/08/13 16:06:42 vnivanch Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4Material.hh,v 1.27 2008/11/14 15:14:24 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-cand-01 $
    2929//
    3030
    … …  
    103103class G4Material
    104104{
    105 public:  // with description
     105 public:  // with description
    106106
    107107  //
    … …  
    145145  virtual ~G4Material();
    146146 
    147   void SetChemicalFormula(const G4String& chF) {fChemicalFormula=chF;};
    148                          
     147  void SetChemicalFormula (const G4String& chF) {fChemicalFormula=chF;}
     148
    149149  //
    150150  // retrieval methods
    151151  //
    152   G4String GetName()            const {return fName;};
    153   G4String GetChemicalFormula() const {return fChemicalFormula;};
    154   G4double GetDensity()         const {return fDensity;};
    155 
    156   G4State  GetState()       const {return fState;};
    157   G4double GetTemperature() const {return fTemp;};
    158   G4double GetPressure()    const {return fPressure;};
     152  const G4String& GetName()            const {return fName;}
     153  const G4String& GetChemicalFormula() const {return fChemicalFormula;}
     154  G4double GetDensity()     const {return fDensity;}
     155  G4State  GetState()       const {return fState;}
     156  G4double GetTemperature() const {return fTemp;}
     157  G4double GetPressure()    const {return fPressure;}
    159158   
    160159  //number of elements constituing this material:   
    161   size_t GetNumberOfElements()         const {return fNumberOfElements;};
     160  size_t GetNumberOfElements()         const {return fNumberOfElements;}
    162161   
    163162  //vector of pointers to elements constituing this material:         
    164163  const
    165   G4ElementVector* GetElementVector()  const {return theElementVector;};
     164  G4ElementVector* GetElementVector()  const {return theElementVector;}
    166165 
    167166  //vector of fractional mass of each element:
    168   const  G4double* GetFractionVector() const {return fMassFractionVector;};
     167  const  G4double* GetFractionVector() const {return fMassFractionVector;}
    169168   
    170169  //vector of atom count of each element:
    171   const  G4int*    GetAtomsVector()    const {return fAtomsVector;};
     170  const  G4int*    GetAtomsVector()    const {return fAtomsVector;}
    172171
    173172  //return a pointer to an element, given its index in the material:
    174173  const
    175   G4Element* GetElement(G4int iel) const {return (*theElementVector)[iel];};
     174  G4Element* GetElement(G4int iel) const {return (*theElementVector)[iel];}
    176175 
    177176  //vector of nb of atoms per volume of each element in this material:
    178177  const
    179   G4double* GetVecNbOfAtomsPerVolume() const {return VecNbOfAtomsPerVolume;};
     178  G4double* GetVecNbOfAtomsPerVolume() const {return VecNbOfAtomsPerVolume;}
    180179  //total number of atoms per volume:
    181   G4double  GetTotNbOfAtomsPerVolume() const {return TotNbOfAtomsPerVolume;};
     180  G4double  GetTotNbOfAtomsPerVolume() const {return TotNbOfAtomsPerVolume;}
    182181  //total number of electrons per volume:
    183   G4double  GetTotNbOfElectPerVolume() const {return TotNbOfElectPerVolume;};
     182  G4double  GetTotNbOfElectPerVolume() const {return TotNbOfElectPerVolume;}
    184183
    185184  //obsolete names (5-10-98) see the 2 functions above
    186185  const
    187   G4double* GetAtomicNumDensityVector() const {return VecNbOfAtomsPerVolume;};
    188   G4double  GetElectronDensity()        const {return TotNbOfElectPerVolume;};
     186  G4double* GetAtomicNumDensityVector() const {return VecNbOfAtomsPerVolume;}
     187  G4double  GetElectronDensity()        const {return TotNbOfElectPerVolume;}
    189188   
    190189  // Radiation length:     
    191   G4double         GetRadlen()          const {return fRadlen;};
     190  G4double         GetRadlen()          const {return fRadlen;}
    192191   
    193192  // Nuclear interaction length:     
    194   G4double GetNuclearInterLength()      const {return fNuclInterLen;};
     193  G4double GetNuclearInterLength()      const {return fNuclInterLen;}
    195194       
    196195  // ionisation parameters:
    197   G4IonisParamMat* GetIonisation()      const {return fIonisation;};
     196  G4IonisParamMat* GetIonisation()      const {return fIonisation;}
    198197 
    199198  // Sandia table:
    200   G4SandiaTable*   GetSandiaTable()     const {return fSandiaTable;};
     199  G4SandiaTable*   GetSandiaTable()     const {return fSandiaTable;}
    201200 
    202201  //meaningful only for single material:
    … …  
    206205  //the MaterialPropertiesTable (if any) attached to this material:
    207206  void SetMaterialPropertiesTable(G4MaterialPropertiesTable* anMPT)
    208                                      {fMaterialPropertiesTable = anMPT;};
     207                                     {fMaterialPropertiesTable = anMPT;}
    209208                                       
    210209  G4MaterialPropertiesTable* GetMaterialPropertiesTable() const
    211                                      {return fMaterialPropertiesTable;};
     210                                     {return fMaterialPropertiesTable;}
    212211
    213212  //the (static) Table of Materials:
    … …  
    220219 
    221220  //the index of this material in the Table:   
    222   size_t GetIndex() const {return fIndexInTable;};
     221  size_t GetIndex() const {return fIndexInTable;}
    223222   
    224223  //return  pointer to a material, given its name:   
    … …  
    232231  friend std::ostream& operator<<(std::ostream&, G4MaterialTable);
    233232   
    234 public:  // without description
     233 public:  // without description
    235234       
    236235  G4int operator==(const G4Material&) const;
    … …  
    241240    // persistifiable objects.
    242241
    243 private:
     242  void SetName (const G4String& name) {fName=name;}
     243
     244 private:
    244245
    245246  G4Material(const G4Material&);
Note: See TracChangeset for help on using the changeset viewer.