Ignore:
Timestamp:
Jun 18, 2010, 11:42:07 AM (15 years ago)
Author:
garnier
Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:
trunk/source/materials/include
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r1196 r1315  
    2525//
    2626//
    27 // $Id: G4AtomicShells.hh,v 1.7 2006/10/17 15:15:46 vnivanch Exp $
    28 // GEANT4 tag $Name: materials-V09-02-18 $
     27// $Id: G4AtomicShells.hh,v 1.8 2010/04/30 13:09:22 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929
    3030// class description
    … …  
    4747// 16-11-98, GetBindingEnergy(Z,ShellNb), M.Maire
    4848// 11-02-05, GetNumberOfElectrons(Z,ShellNb), V.Ivanchenko
     49// 30-04-10, added fIndexOfShells, V.Ivanchenko
    4950
    5051//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
    … …  
    7172
    7273static const G4int    fNumberOfShells[101];
     74static const G4int    fIndexOfShells[101];
    7375static const G4int    fNumberOfElectrons[1540];
    7476static const G4double fBindingEnergies[1540];

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

    r1228 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DensityEffectData.hh,v 1.7 2009/12/01 08:24:21 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-03 $
     26// $Id: G4DensityEffectData.hh,v 1.10 2010/05/15 15:37:33 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929//---------------------------------------------------------------------------
    … …  
    5151
    5252#include "globals.hh"
     53#include "G4Material.hh"
    5354#include <vector>
    5455
    … …  
    6869
    6970  // return index by Z, -1 if material is not in the table
    70   G4int GetIndex(const G4int Z);
     71  G4int GetElementIndex(G4int Z, G4State mState);
    7172
    7273  // return index by material name, -1 if material is not in the table
    … …  
    102103  G4double data[NDENSDATA][NDENSARRAY];
    103104  std::vector<G4String> names;
     105
     106  // indexes defined only for pure materials
    104107  G4int indexZ[NDENSELEM];
     108  G4State state[NDENSELEM];
    105109
    106110  G4int index;

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

    r1196 r1315  
    2525//
    2626//
    27 // $Id: G4Element.hh,v 1.27 2009/09/19 14:13:03 vnivanch Exp $
    28 // GEANT4 tag $Name: materials-V09-02-18 $
     27// $Id: G4Element.hh,v 1.28 2010/04/30 13:19:26 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030
    … …  
    8181#include "G4ios.hh"
    8282#include "G4Isotope.hh"
    83 #include "G4AtomicShells.hh"
    8483#include "G4IonisParamElm.hh"
    8584#include "G4IsotopeVector.hh"

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

    r1196 r1315  
    2525//
    2626//
    27 // $Id: G4IonisParamMat.hh,v 1.17 2009/11/18 17:42:23 gcosmo Exp $
    28 // GEANT4 tag $Name: materials-V09-02-18 $
     27// $Id: G4IonisParamMat.hh,v 1.18 2010/05/10 10:44:39 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030
    … …  
    104104  G4double  GetFermiEnergy()            const {return fFermiEnergy;};
    105105  G4double  GetLFactor()                const {return fLfactor;};
     106  G4double  GetInvA23()                 const {return fInvA23;};
    106107   
    107108  // parameters for Birks attenuation:
    … …  
    177178  G4double fFermiEnergy;
    178179  G4double fLfactor;
     180  G4double fInvA23;
    179181   
    180182  // parameter for Birks attenuation

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

    r1196 r1315  
    2525//
    2626//
    27 // $Id: G4Material.hh,v 1.27 2008/11/14 15:14:24 gcosmo Exp $
    28 // GEANT4 tag $Name: materials-V09-02-18 $
     27// $Id: G4Material.hh,v 1.28 2010/05/14 14:34:50 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030
    … …  
    9797#include "G4MaterialTable.hh"
    9898
    99 enum G4State { kStateUndefined, kStateSolid, kStateLiquid, kStateGas };
     99enum G4State { kStateUndefined = 0, kStateSolid, kStateLiquid, kStateGas };
    100100
    101101//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

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

    r1196 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4NistManager.hh,v 1.23 2008/08/07 10:15:16 vnivanch Exp $
    27 // GEANT4 tag $Name: materials-V09-02-18 $
     26// $Id: G4NistManager.hh,v 1.24 2010/04/29 11:11:56 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//
    … …  
    4646// 28.07.07 V.Ivanchneko make simple methods inline
    4747// 28.10.07 V.Ivanchneko add state, T, P to maetrial build
     48// 29.04.10 V.Ivanchneko add GetMeanIonisationEnergy method
    4849//
    4950// Class Description:
    … …  
    149150  //
    150151  inline const std::vector<G4String>& GetNistElementNames() const;
     152
     153  // Access mean ionisation energy for atoms (Z <= 98)
     154  //
     155  inline G4double GetMeanIonisationEnergy(G4int Z) const;
    151156
    152157  // Get G4Material by index
    … …  
    272277  G4Element* elm = 0;
    273278  const G4ElementTable* theElementTable = G4Element::GetElementTable();
    274   if(index < theElementTable->size()) elm = (*theElementTable)[index];
     279  if(index < theElementTable->size()) { elm = (*theElementTable)[index]; }
    275280  return elm;
    276281}
    … …  
    368373{
    369374  return elmBuilder->GetElementNames();
     375}
     376
     377//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
     378
     379inline G4double G4NistManager::GetMeanIonisationEnergy(G4int Z) const
     380{
     381  return matBuilder->GetMeanIonisationEnergy(Z-1);
    370382}
    371383

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

    r1196 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4NistMaterialBuilder.hh,v 1.13 2008/04/28 08:51:29 vnivanch Exp $
    27 // GEANT4 tag $Name: materials-V09-02-18 $
     26// $Id: G4NistMaterialBuilder.hh,v 1.16 2010/04/29 11:11:56 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828
    2929#ifndef G4NistMaterialBuilder_h
    … …  
    4545// 27.07.07 V.Ivanchneko add matIndex vector to control built materials
    4646// 28.07.07 V.Ivanchneko add BuildMaterial method using Nist index
     47// 29.04.10 V.Ivanchneko add GetMeanIonisationEnergy method using Nist index
    4748//
    4849//----------------------------------------------------------------------------
    … …  
    125126  void ListNistCompoundMaterials();
    126127  void ListHepMaterials();
     128  void ListSpaceMaterials();
    127129
    128130  // access to the list of names of Geant4 predefined materials
    129131  //
    130132  const std::vector<G4String>& GetMaterialNames() const;
     133
     134  // access to the NIST mean ionisation potentials
     135  //
     136  inline G4double GetMeanIonisationEnergy(G4int index) const;
    131137
    132138private:
    … …  
    136142  void NistCompoundMaterials();
    137143  void HepAndNuclearMaterials();
     144  void SpaceMaterials();
    138145
    139146  // add parameters of material from NIST DB to internal vectors
    … …  
    173180  G4int                  nElementary;
    174181  G4int                  nNIST;
     182  G4int                  nHEP;
    175183
    176184  std::vector<G4String>  names;
    … …  
    200208}
    201209
     210inline G4double
     211G4NistMaterialBuilder::GetMeanIonisationEnergy(G4int index) const
     212{
     213  G4double res = 10*index;
     214  if(index >= 0 && index < nMaterials) { res = ionPotentials[index]; }
     215  return res;
     216}
     217
    202218#endif

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

    r1196 r1315  
    2525//
    2626//
    27 // $Id: G4OpticalSurface.hh,v 1.15 2009/11/20 00:57:34 gum Exp $
    28 // GEANT4 tag $Name: geant4-09-03-cand-01 $
     27// $Id: G4OpticalSurface.hh,v 1.17 2010/04/22 21:19:14 gum Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929//
    3030//
    … …  
    150150public: // With description
    151151
    152         virtual void Overwrite() {G4cout << "G4OpticalSurface" << G4endl;};
    153 
    154         void         SetType(const G4SurfaceType& type);
    155 
    156         G4OpticalSurfaceFinish GetFinish() const {return theFinish;};
     152        void SetType(const G4SurfaceType& type);
     153
     154        inline G4OpticalSurfaceFinish GetFinish() const { return theFinish; }
    157155        // Returns the optical surface finish.
    158         void         SetFinish(const G4OpticalSurfaceFinish );
     156        void SetFinish(const G4OpticalSurfaceFinish );
    159157        // Sets the optical surface finish.
    160158
    161         G4OpticalSurfaceModel GetModel() const {return theModel;};
     159        inline G4OpticalSurfaceModel GetModel() const { return theModel; }
    162160        // Returns the optical surface model used.
    163         void          SetModel(const G4OpticalSurfaceModel model)
    164                                                    {theModel = model;};
     161        inline void SetModel(const G4OpticalSurfaceModel model)
     162                                                      { theModel = model; }
    165163        // Sets the optical surface model to be followed.
    166164
    167         G4double GetSigmaAlpha() const {return sigma_alpha;};
     165        inline G4double GetSigmaAlpha() const { return sigma_alpha; }
    168166        // Returns an unified model surface parameter.
    169         void     SetSigmaAlpha(const G4double s_a)
    170                                         {sigma_alpha = s_a;};
     167        inline void SetSigmaAlpha(const G4double s_a) { sigma_alpha = s_a; }
    171168        // Sets an unified model surface parameter.
    172169
    173         G4double GetPolish() const {return polish;};
     170        G4double GetPolish() const { return polish; }
    174171        // Returns the optical surface polish type.
    175         void     SetPolish(const G4double plsh) {polish=plsh;};
     172        inline void SetPolish(const G4double plsh) { polish=plsh; }
    176173        // Sets the optical surface polish type.
    177174
    178         G4MaterialPropertiesTable* GetMaterialPropertiesTable() const
    179                                        { return theMaterialPropertiesTable;};
     175        inline G4MaterialPropertiesTable* GetMaterialPropertiesTable() const
     176                                       { return theMaterialPropertiesTable; }
    180177        // Retrieves the pointer of the G4MaterialPropertiesTable
    181178        // attached to optical surface.
    182179
    183         void SetMaterialPropertiesTable(G4MaterialPropertiesTable *anMPT)
    184                                     { theMaterialPropertiesTable = anMPT;};
     180        inline void SetMaterialPropertiesTable(G4MaterialPropertiesTable *anMPT)
     181                                       { theMaterialPropertiesTable = anMPT; }
    185182        // Attaches a G4MaterialPropertiesTable to the optical surface.
    186183
    … …  
    191188        // Method to read the Look-Up-Table into array AngularDistribution
    192189
    193         G4double GetAngularDistributionValue(G4int, G4int, G4int);
     190        inline G4double GetAngularDistributionValue(G4int, G4int, G4int);
    194191
    195192        inline G4int GetThetaIndexMax(void) const { return thetaIndexMax; }
    … …  
    227224                                                        G4int phiIndex)
    228225{
    229   return *(AngularDistribution+angleIncident+
    230                                thetaIndex*incidentIndexMax+
    231                                phiIndex*thetaIndexMax*incidentIndexMax);
     226  return AngularDistribution[angleIncident+
     227                             thetaIndex*incidentIndexMax+
     228                             phiIndex*thetaIndexMax*incidentIndexMax];
    232229}
    233230
Note: See TracChangeset for help on using the changeset viewer.