Changeset 1315 for trunk/source/materials
- Timestamp:
- Jun 18, 2010, 11:42:07 AM (14 years ago)
- Location:
- trunk/source/materials
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/materials/History
r1228 r1315 1 $Id: History,v 1.1 68 2009/12/03 11:09:47vnivanch Exp $1 $Id: History,v 1.182 2010/05/20 13:08:22 vnivanch Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 20-05-10 V.Ivanchenko (materials-V09-03-07) 21 - G4NistMaterialBuilder - added G4_LUCITE 22 23 15-05-10 V.Ivanchenko (materials-V09-03-06) 24 - G4DensityEffectData - fixed method GetIndex(Z, state) for Hydrogen 25 and solid states, rename it to GetElementIndex 26 - G4IonisParamMat - fixed typo in the method GetInvA23, use GetElementIndex 27 28 10-05-10 V.Ivanchenko (materials-V09-03-05) 29 - G4IonisParamMat - added member and method GetInvA23 30 31 30-04-10 V.Ivanchenko (materials-V09-03-04) 32 - G4AtomicShells - improved performance by adding an array of indexes 33 - G4Element - moved include of G4AtomicShells header to the source file 34 35 29-04-10 V.Ivanchenko (materials-V09-03-03) 36 - G4NistMaterialBuilder, G4NistManager - added method GetMeanIonisationEnergy 37 - G4IonisParamElm - use mean excitation energy from NIST DB; this modification 38 addressing a problem reported by Wolfgang Lukas for 39 mean energy deposition in compound materials 40 41 23-04-10 V.Ivanchenko (materials-V09-03-02) 42 - G4NistMaterialBuilder - added 6 new materials : G4_BRASS, G4_BRONZE, 43 G4_STAINLESS-STEEL, G4_KEVLAR, G4_DACRON, G4_NEOPRENE 44 - G4IonisParamMat, G4DensityEffectData - added a possibility to access 45 density effect data in the case when pure material is not 46 defined via NIST; atom number and state of such materials 47 are checked. 48 49 22-04-10 P.Gumplinger (materials-V09-03-01) - thanks to Ivana Hrivnacova 50 - G4MaterialPropertyVector.cc: 21% speed up of code by removing new/delete 51 of temporary helper object and modifying GetAdjacentBins to allow for a 52 value to match a bin exactly, thus avoiding a whole extra loop. 53 G4OpticalSurface.hh: change the return of GetAngularDistributionValue 54 no longer dereferencing a pointer but return the value at the 55 array index. 56 57 07-01-10 G.Cosmo (materials-V09-03-00) 58 - G4OpticalSurface - removed left-over debug test function OverWrite() from 59 header. 60 20 61 03-12-09 V.Ivanchenko (materials-V09-02-24) 21 - G4N IstMessenger - fixed minor memory leak at destruction62 - G4NistMessenger - fixed minor memory leak at destruction 22 63 23 64 01-12-09 G.Cosmo (materials-V09-02-23) -
trunk/source/materials/include/G4AtomicShells.hh
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4AtomicShells.hh,v 1. 7 2006/10/17 15:15:46vnivanch 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 $ 29 29 30 30 // class description … … 47 47 // 16-11-98, GetBindingEnergy(Z,ShellNb), M.Maire 48 48 // 11-02-05, GetNumberOfElectrons(Z,ShellNb), V.Ivanchenko 49 // 30-04-10, added fIndexOfShells, V.Ivanchenko 49 50 50 51 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... … … 71 72 72 73 static const G4int fNumberOfShells[101]; 74 static const G4int fIndexOfShells[101]; 73 75 static const G4int fNumberOfElectrons[1540]; 74 76 static const G4double fBindingEnergies[1540]; -
trunk/source/materials/include/G4DensityEffectData.hh
r1228 r1315 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4DensityEffectData.hh,v 1. 7 2009/12/01 08:24:21 gcosmoExp $27 // GEANT4 tag $Name: geant4-09-0 3$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 $ 28 28 29 29 //--------------------------------------------------------------------------- … … 51 51 52 52 #include "globals.hh" 53 #include "G4Material.hh" 53 54 #include <vector> 54 55 … … 68 69 69 70 // return index by Z, -1 if material is not in the table 70 G4int Get Index(const G4int Z);71 G4int GetElementIndex(G4int Z, G4State mState); 71 72 72 73 // return index by material name, -1 if material is not in the table … … 102 103 G4double data[NDENSDATA][NDENSARRAY]; 103 104 std::vector<G4String> names; 105 106 // indexes defined only for pure materials 104 107 G4int indexZ[NDENSELEM]; 108 G4State state[NDENSELEM]; 105 109 106 110 G4int index; -
trunk/source/materials/include/G4Element.hh
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4Element.hh,v 1.2 7 2009/09/19 14:13:03vnivanch 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 $ 29 29 // 30 30 … … 81 81 #include "G4ios.hh" 82 82 #include "G4Isotope.hh" 83 #include "G4AtomicShells.hh"84 83 #include "G4IonisParamElm.hh" 85 84 #include "G4IsotopeVector.hh" -
trunk/source/materials/include/G4IonisParamMat.hh
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4IonisParamMat.hh,v 1.1 7 2009/11/18 17:42:23 gcosmoExp $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 $ 29 29 // 30 30 … … 104 104 G4double GetFermiEnergy() const {return fFermiEnergy;}; 105 105 G4double GetLFactor() const {return fLfactor;}; 106 G4double GetInvA23() const {return fInvA23;}; 106 107 107 108 // parameters for Birks attenuation: … … 177 178 G4double fFermiEnergy; 178 179 G4double fLfactor; 180 G4double fInvA23; 179 181 180 182 // parameter for Birks attenuation -
trunk/source/materials/include/G4Material.hh
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4Material.hh,v 1.2 7 2008/11/14 15:14:24 gcosmoExp $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 $ 29 29 // 30 30 … … 97 97 #include "G4MaterialTable.hh" 98 98 99 enum G4State { kStateUndefined , kStateSolid, kStateLiquid, kStateGas };99 enum G4State { kStateUndefined = 0, kStateSolid, kStateLiquid, kStateGas }; 100 100 101 101 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... -
trunk/source/materials/include/G4NistManager.hh
r1196 r1315 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4NistManager.hh,v 1.2 3 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 $ 28 28 // 29 29 // … … 46 46 // 28.07.07 V.Ivanchneko make simple methods inline 47 47 // 28.10.07 V.Ivanchneko add state, T, P to maetrial build 48 // 29.04.10 V.Ivanchneko add GetMeanIonisationEnergy method 48 49 // 49 50 // Class Description: … … 149 150 // 150 151 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; 151 156 152 157 // Get G4Material by index … … 272 277 G4Element* elm = 0; 273 278 const G4ElementTable* theElementTable = G4Element::GetElementTable(); 274 if(index < theElementTable->size()) elm = (*theElementTable)[index];279 if(index < theElementTable->size()) { elm = (*theElementTable)[index]; } 275 280 return elm; 276 281 } … … 368 373 { 369 374 return elmBuilder->GetElementNames(); 375 } 376 377 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 378 379 inline G4double G4NistManager::GetMeanIonisationEnergy(G4int Z) const 380 { 381 return matBuilder->GetMeanIonisationEnergy(Z-1); 370 382 } 371 383 -
trunk/source/materials/include/G4NistMaterialBuilder.hh
r1196 r1315 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4NistMaterialBuilder.hh,v 1.1 3 2008/04/28 08:51:29vnivanch 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 $ 28 28 29 29 #ifndef G4NistMaterialBuilder_h … … 45 45 // 27.07.07 V.Ivanchneko add matIndex vector to control built materials 46 46 // 28.07.07 V.Ivanchneko add BuildMaterial method using Nist index 47 // 29.04.10 V.Ivanchneko add GetMeanIonisationEnergy method using Nist index 47 48 // 48 49 //---------------------------------------------------------------------------- … … 125 126 void ListNistCompoundMaterials(); 126 127 void ListHepMaterials(); 128 void ListSpaceMaterials(); 127 129 128 130 // access to the list of names of Geant4 predefined materials 129 131 // 130 132 const std::vector<G4String>& GetMaterialNames() const; 133 134 // access to the NIST mean ionisation potentials 135 // 136 inline G4double GetMeanIonisationEnergy(G4int index) const; 131 137 132 138 private: … … 136 142 void NistCompoundMaterials(); 137 143 void HepAndNuclearMaterials(); 144 void SpaceMaterials(); 138 145 139 146 // add parameters of material from NIST DB to internal vectors … … 173 180 G4int nElementary; 174 181 G4int nNIST; 182 G4int nHEP; 175 183 176 184 std::vector<G4String> names; … … 200 208 } 201 209 210 inline G4double 211 G4NistMaterialBuilder::GetMeanIonisationEnergy(G4int index) const 212 { 213 G4double res = 10*index; 214 if(index >= 0 && index < nMaterials) { res = ionPotentials[index]; } 215 return res; 216 } 217 202 218 #endif -
trunk/source/materials/include/G4OpticalSurface.hh
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4OpticalSurface.hh,v 1.1 5 2009/11/20 00:57:34 gum Exp $28 // GEANT4 tag $Name: geant4-09-0 3-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 $ 29 29 // 30 30 // … … 150 150 public: // With description 151 151 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; } 157 155 // Returns the optical surface finish. 158 void 156 void SetFinish(const G4OpticalSurfaceFinish ); 159 157 // Sets the optical surface finish. 160 158 161 G4OpticalSurfaceModel GetModel() const {return theModel;};159 inline G4OpticalSurfaceModel GetModel() const { return theModel; } 162 160 // Returns the optical surface model used. 163 voidSetModel(const G4OpticalSurfaceModel model)164 {theModel = model;}; 161 inline void SetModel(const G4OpticalSurfaceModel model) 162 { theModel = model; } 165 163 // Sets the optical surface model to be followed. 166 164 167 G4double GetSigmaAlpha() const {return sigma_alpha;};165 inline G4double GetSigmaAlpha() const { return sigma_alpha; } 168 166 // 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; } 171 168 // Sets an unified model surface parameter. 172 169 173 G4double GetPolish() const { return polish;};170 G4double GetPolish() const { return polish; } 174 171 // Returns the optical surface polish type. 175 void SetPolish(const G4double plsh) {polish=plsh;};172 inline void SetPolish(const G4double plsh) { polish=plsh; } 176 173 // Sets the optical surface polish type. 177 174 178 G4MaterialPropertiesTable* GetMaterialPropertiesTable() const179 { return theMaterialPropertiesTable; };175 inline G4MaterialPropertiesTable* GetMaterialPropertiesTable() const 176 { return theMaterialPropertiesTable; } 180 177 // Retrieves the pointer of the G4MaterialPropertiesTable 181 178 // attached to optical surface. 182 179 183 void SetMaterialPropertiesTable(G4MaterialPropertiesTable *anMPT)184 { theMaterialPropertiesTable = anMPT;};180 inline void SetMaterialPropertiesTable(G4MaterialPropertiesTable *anMPT) 181 { theMaterialPropertiesTable = anMPT; } 185 182 // Attaches a G4MaterialPropertiesTable to the optical surface. 186 183 … … 191 188 // Method to read the Look-Up-Table into array AngularDistribution 192 189 193 G4double GetAngularDistributionValue(G4int, G4int, G4int);190 inline G4double GetAngularDistributionValue(G4int, G4int, G4int); 194 191 195 192 inline G4int GetThetaIndexMax(void) const { return thetaIndexMax; } … … 227 224 G4int phiIndex) 228 225 { 229 return *(AngularDistribution+angleIncident+230 231 phiIndex*thetaIndexMax*incidentIndexMax);226 return AngularDistribution[angleIncident+ 227 thetaIndex*incidentIndexMax+ 228 phiIndex*thetaIndexMax*incidentIndexMax]; 232 229 } 233 230 -
trunk/source/materials/src/G4AtomicShells.cc
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4AtomicShells.cc,v 1. 7 2006/10/17 15:15:46vnivanch Exp $28 // GEANT4 tag $Name: materials-V09-02-18$27 // $Id: G4AtomicShells.cc,v 1.8 2010/04/30 13:09:22 vnivanch Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... … … 34 34 // 19-07-04, add a protection in GetNumberOfShells(), mma 35 35 // 11-02-05, GetNumberOfElectrons(Z,ShellNb), V.Ivanchenko 36 // 30-04-10, added fIndexOfShells, V.Ivanchenko 36 37 37 38 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... … … 44 45 45 46 const G4int 46 G4AtomicShells::fNumberOfShells[101] = 47 G4AtomicShells::fNumberOfShells[101] = 47 48 { 48 49 0 , // nonexisting zero element … … 74 75 // The total shell number is: 75 76 // 1 + G4AtomicShells::TotalNumberOfShells(100) = 1 + 1539 = 1540 77 78 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 79 80 const G4int 81 G4AtomicShells::fIndexOfShells[101] = 82 { 0, 83 1, 2, 3, 5, 7, 10, 13, 17, 21, 24, 84 28, 33, 38, 44, 50, 56, 62, 68, 75, 83, 85 91, 100, 109, 118, 127, 136, 145, 154, 164, 174, 86 184, 195, 206, 217, 228, 239, 251, 264, 277, 291, 87 305, 319, 333, 347, 361, 375, 390, 405, 420, 436, 88 452, 468, 484, 500, 517, 535, 553, 572, 591, 610, 89 629, 648, 667, 686, 706, 725, 744, 763, 782, 801, 90 821, 842, 863, 884, 905, 926, 947, 968, 989, 1011, 91 1033, 1056, 1079, 1102, 1125, 1149, 1173, 1198, 1223, 1249, 92 1275, 1302, 1329, 1356, 1382, 1408, 1435, 1462, 1488, 1514 93 }; 76 94 77 95 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... … … 729 747 G4AtomicShells::GetNumberOfShells(G4int Z) 730 748 { 731 assert (Z> =1 && Z<=101);749 assert (Z>0 && Z<101); 732 750 return fNumberOfShells[Z]; 733 751 } … … 738 756 G4AtomicShells::GetBindingEnergy(G4int Z, G4int ShellNb) 739 757 { 740 assert (Z>=1 && Z<=101 && ShellNb<fNumberOfShells[Z]); 741 742 G4int indice = 1; 743 for (G4int z = 1 ; z < Z ; z++) indice += fNumberOfShells[z]; 744 indice += ShellNb; 745 return fBindingEnergies[indice]*eV; 758 assert (Z>0 && Z<101 && ShellNb<fNumberOfShells[Z]); 759 return fBindingEnergies[fIndexOfShells[Z] + ShellNb]*CLHEP::eV; 746 760 } 747 761 … … 751 765 G4AtomicShells::GetNumberOfElectrons(G4int Z, G4int ShellNb) 752 766 { 753 assert (Z>=1 && Z<=101 && ShellNb<fNumberOfShells[Z]); 754 755 G4int indice = 1; 756 for (G4int z = 1 ; z < Z ; z++) indice += fNumberOfShells[z]; 757 indice += ShellNb; 758 return fNumberOfElectrons[indice]; 767 assert (Z>0 && Z<101 && ShellNb<fNumberOfShells[Z]); 768 return fNumberOfElectrons[fIndexOfShells[Z] + ShellNb]; 759 769 } 760 770 … … 763 773 G4double G4AtomicShells::GetTotalBindingEnergy (G4int Z) 764 774 { 765 assert (Z>=1 && Z< =101);775 assert (Z>=1 && Z<101); 766 776 767 G4int idx = 1;768 for (G4int z = 1 ; z < Z ; z++) idx += fNumberOfShells[z];777 G4int idx = fIndexOfShells[Z]; 778 G4int idxmax = idx + fNumberOfShells[Z]; 769 779 G4double energy = 0.0; 770 G4int idxmax = idx + fNumberOfShells[Z]; 771 for (G4int i=idx; i<idxmax; i++) {energy += fBindingEnergies[i];} 772 return energy*eV; 780 for (G4int i=idx; i<idxmax; ++i) {energy += fBindingEnergies[i];} 781 return energy*CLHEP::eV; 773 782 } 774 783 -
trunk/source/materials/src/G4DensityEffectData.cc
r1228 r1315 25 25 // 26 26 // 27 // $Id: G4DensityEffectData.cc,v 1. 9 2009/12/01 08:24:21 gcosmoExp $28 // GEANT4 tag $Name: geant4-09-0 3$27 // $Id: G4DensityEffectData.cc,v 1.12 2010/05/15 15:37:33 vnivanch Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 30 30 //--------------------------------------------------------------------------- … … 74 74 { 75 75 indexZ[i] = -1; 76 state[i] = kStateSolid; 76 77 } 77 78 78 //G4_H index=0 79 //G4_lH2 index=0 80 G4double M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021}; 81 AddMaterial(M1,"G4_lH2"); 82 83 //G4_H index=1 79 84 G4double M0[NDENSARRAY]={0.263,1.412,9.5835,1.8639,3.2718,0.14092,5.7273,0.0,0.024}; 80 85 AddMaterial(M0,"G4_H"); 81 indexZ[0]=0; 82 83 //G4_lH2 index=1 84 G4double M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021}; 85 AddMaterial(M1,"G4_lH2"); 86 indexZ[1]=1; 87 state[1]=kStateGas; 86 88 87 89 //G4_He index=2 … … 89 91 AddMaterial(M2,"G4_He"); 90 92 indexZ[2]=2; 93 state[2]=kStateGas; 91 94 92 95 //G4_Li index=3 … … 114 117 AddMaterial(M7,"G4_N"); 115 118 indexZ[7]=7; 119 state[7]=kStateGas; 116 120 117 121 //G4_O index=8 … … 119 123 AddMaterial(M8,"G4_O"); 120 124 indexZ[8]=8; 125 state[8]=kStateGas; 121 126 122 127 //G4_F index=9 … … 124 129 AddMaterial(M9,"G4_F"); 125 130 indexZ[9]=9; 131 state[9]=kStateGas; 126 132 127 133 //G4_Ne index=10 … … 129 135 AddMaterial(M10,"G4_Ne"); 130 136 indexZ[10]=10; 137 state[10]=kStateGas; 131 138 132 139 //G4_Na index=11 … … 164 171 AddMaterial(M17,"G4_Cl"); 165 172 indexZ[17]=17; 173 state[17]=kStateGas; 166 174 167 175 //G4_Ar index=18 … … 169 177 AddMaterial(M18,"G4_Ar"); 170 178 indexZ[18]=18; 179 state[18]=kStateGas; 171 180 172 181 //G4_K index=19 … … 243 252 G4double M33[NDENSARRAY]={45.779,2.219,5.0510,0.1767,3.5702,0.06633,3.4176,0.00,0.030}; 244 253 AddMaterial(M33,"G4_As"); 245 254 indexZ[33]=33; 246 255 247 256 //G4_Se index=34 … … 254 263 AddMaterial(M35,"G4_Br"); 255 264 indexZ[35]=35; 265 state[35]=kStateGas; 256 266 257 267 //G4_Kr index=36 … … 259 269 AddMaterial(M36,"G4_Kr"); 260 270 indexZ[36]=36; 271 state[36]=kStateGas; 261 272 262 273 //G4_Ru index=37 … … 349 360 AddMaterial(M54,"G4_Xe"); 350 361 indexZ[54]=54; 362 state[54]=kStateGas; 351 363 352 364 //G4_Cs index=55 … … 444 456 AddMaterial(M73,"G4_Ta"); 445 457 indexZ[73]=73; 458 446 459 //G4_W index=74 447 460 G4double M74[NDENSARRAY]={80.315,1.997,5.4059,0.2167,3.496,0.15509,2.8447,0.14,0.027}; … … 503 516 AddMaterial(M85,"G4_Rn"); 504 517 indexZ[86]=85; 518 state[86]=kStateGas; 505 519 506 520 //G4_Ra index=86 … … 1284 1298 } 1285 1299 1286 G4int G4DensityEffectData::Get Index(G4int Z)1300 G4int G4DensityEffectData::GetElementIndex(G4int Z, G4State st) 1287 1301 { 1288 1302 G4int idx = -1; 1289 if(Z >= 0 && Z < NDENSELEM) idx = indexZ[Z]; 1303 if(Z > 0 && Z < NDENSELEM) { 1304 if(st == state[Z]) { idx = indexZ[Z]; } 1305 else if(st == kStateUndefined) { idx = indexZ[Z]; } 1306 } 1290 1307 return idx; 1291 1308 } -
trunk/source/materials/src/G4Element.cc
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4Element.cc,v 1.3 4 2009/09/18 15:35:36 vnivanch Exp $28 // GEANT4 tag $Name: materials-V09-02-18$27 // $Id: G4Element.cc,v 1.35 2010/04/30 13:19:26 vnivanch Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... … … 57 57 58 58 #include "G4Element.hh" 59 #include "G4AtomicShells.hh" 59 60 #include <iomanip> 60 61 -
trunk/source/materials/src/G4IonisParamElm.cc
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4IonisParamElm.cc,v 1.15 2008/06/03 14:30:10 vnivanch Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18 $ 29 // 30 // 31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 32 // 27 // $Id: G4IonisParamElm.cc,v 1.16 2010/04/29 11:11:56 vnivanch Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 // 30 // 31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 32 // 33 // 09-07-98, data moved from G4Element. M.Maire 34 // 22-11-00, tabulation of ionisation potential from 35 // the ICRU Report N#37. V.Ivanchenko 36 // 08-03-01, correct handling of fShellCorrectionVector. M.Maire 37 // 17-10-02, Fix excitation energy interpolation. V.Ivanchenko 33 38 // 06-09-04, Update calculated values after any change of ionisation 34 39 // potential change. V.Ivanchenko 35 // 17-10-02, Fix excitation energy interpolation. V.Ivanchenko 36 // 08-03-01, correct handling of fShellCorrectionVector. M.Maire 37 // 22-11-00, tabulation of ionisation potential from 38 // the ICRU Report N#37. V.Ivanchenko 39 // 09-07-98, data moved from G4Element. M.Maire 40 // 29-04-10, Using G4Pow and mean ionisation energy from NIST V.Ivanchenko 40 41 // 41 42 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 42 43 43 44 #include "G4IonisParamElm.hh" 44 45 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 46 47 G4IonisParamElm::G4IonisParamElm(G4double Z) 48 { 49 if (Z < 1.) 45 #include "G4NistManager.hh" 46 #include "G4Pow.hh" 47 48 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... 49 50 G4IonisParamElm::G4IonisParamElm(G4double AtomNumber) 51 { 52 G4int Z = G4int(AtomNumber + 0.5); 53 if (Z < 1) { 50 54 G4Exception (" ERROR! It is not allowed to create an Element with Z < 1" ); 51 55 } 56 G4Pow* g4pow = G4Pow::GetInstance(); 57 52 58 // some basic functions of the atomic number 53 fZ = Z;54 fZ3 = std::pow(fZ, 1./3.);55 fZZ3 = std::pow(fZ*(fZ+1.), 1./3.);56 flogZ3 = std::log(fZ)/3.;59 fZ = Z; 60 fZ3 = g4pow->Z13(Z); 61 fZZ3 = fZ3*g4pow->Z13(Z+1); 62 flogZ3 = g4pow->logZ(Z)/3.; 57 63 58 64 // Parameters for energy loss by ionisation 59 65 /* 60 66 // Mean excitation energy 61 67 // from "Stopping Powers for Electrons and Positrons" … … 73 79 9.6, 9.7, 9.7, 9.8, 9.8, 9.8, 9.8, 9.9, 9.9, 9.9 }; 74 80 75 G4int iz = (G4int)Z - 1 ;76 if(0 > iz) iz = 0;77 else if(99 < iz) iz = 99 ;78 81 fMeanExcitationEnergy = fZ * exc[iz] * eV ; 82 */ 83 84 fMeanExcitationEnergy = 85 G4NistManager::Instance()->GetMeanIonisationEnergy(Z); 79 86 80 87 // compute parameters for ion transport … … 85 92 // Fast ions or hadrons 86 93 87 if(91 < iz) iz = 91; 94 G4int iz = Z - 1; 95 if(91 < iz) { iz = 91; } 88 96 89 97 static G4double vFermi[92] = { … … 150 158 G4IonisParamElm::G4IonisParamElm(__void__&) 151 159 : fShellCorrectionVector(0) 152 { 153 } 160 {} 154 161 155 162 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo.... … … 157 164 G4IonisParamElm::~G4IonisParamElm() 158 165 { 159 if (fShellCorrectionVector) delete [] fShellCorrectionVector;166 if (fShellCorrectionVector) { delete [] fShellCorrectionVector; } 160 167 } 161 168 … … 184 191 fClow = right.fClow; 185 192 fMeanExcitationEnergy = right.fMeanExcitationEnergy; 186 if (fShellCorrectionVector) delete [] fShellCorrectionVector;193 if (fShellCorrectionVector) { delete [] fShellCorrectionVector; } 187 194 fShellCorrectionVector = new G4double[3]; 188 195 fShellCorrectionVector[0] = right.fShellCorrectionVector[0]; -
trunk/source/materials/src/G4IonisParamMat.cc
r1228 r1315 25 25 // 26 26 // 27 // $Id: G4IonisParamMat.cc,v 1.3 4 2009/11/30 15:48:04vnivanch Exp $28 // GEANT4 tag $Name: geant4-09-0 3$27 // $Id: G4IonisParamMat.cc,v 1.38 2010/05/15 15:37:33 vnivanch Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // … … 62 62 fD0density = 0.0; 63 63 fAdjustmentFactor = 1.0; 64 if(!fDensityData) fDensityData = new G4DensityEffectData();64 if(!fDensityData) { fDensityData = new G4DensityEffectData(); } 65 65 66 66 // compute parameters … … 146 146 // R.M. Sternheimer, Atomic Data and Nuclear Data Tables, 30: 261 (1984) 147 147 G4int idx = fDensityData->GetIndex(fMaterial->GetName()); 148 // if(idx < 0 && fMaterial->GetNumberOfElements() == 1) { 149 // idx = fDensityData->GetIndex(G4int(fMaterial->GetZ())); 150 // } 148 if(idx < 0 && fMaterial->GetNumberOfElements() == 1) { 149 idx = fDensityData->GetElementIndex(G4int(fMaterial->GetZ()), 150 fMaterial->GetState()); 151 } 151 152 152 153 //G4cout << "DensityEffect for " << fMaterial->GetName() << " " << idx << G4endl; … … 309 310 // loop for the elements in the material 310 311 // to find out average values Z, vF, lF 311 G4double z = 0.0, vF = 0.0, lF = 0.0, norm = 0.0;312 G4double z(0.0), vF(0.0), lF(0.0), norm(0.0), a23(0.0); 312 313 313 314 if( 1 == NumberOfElements ) { … … 316 317 vF= element->GetIonisation()->GetFermiVelocity(); 317 318 lF= element->GetIonisation()->GetLFactor(); 319 a23 = std::pow(element->GetN(),-2./3.); 318 320 319 321 } else { … … 326 328 vF += element->GetIonisation()->GetFermiVelocity() * weight ; 327 329 lF += element->GetIonisation()->GetLFactor() * weight ; 330 a23 += std::pow(element->GetN(),-2./3.) * weight ; 328 331 } 329 z /= norm ; 330 vF /= norm ; 331 lF /= norm ; 332 z /= norm; 333 vF /= norm; 334 lF /= norm; 335 a23 /= norm; 332 336 } 333 337 fZeff = z; 334 338 fLfactor = lF; 335 339 fFermiEnergy = 25.*keV*vF*vF; 340 fInvA23 = a23; 336 341 } 337 342 … … 340 345 void G4IonisParamMat::SetMeanExcitationEnergy(G4double value) 341 346 { 342 if(value == fMeanExcitationEnergy || value <= 0.0) return;347 if(value == fMeanExcitationEnergy || value <= 0.0) { return; } 343 348 344 349 /* -
trunk/source/materials/src/G4MaterialPropertyVector.cc
r1196 r1315 25 25 // 26 26 // 27 // $Id: G4MaterialPropertyVector.cc,v 1.1 7 2009/04/21 15:35:45 gcosmoExp $28 // GEANT4 tag $Name: materials-V09-02-18$27 // $Id: G4MaterialPropertyVector.cc,v 1.18 2010/04/22 21:15:19 gum Exp $ 28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // … … 154 154 G4double G4MaterialPropertyVector::GetProperty(G4double aPhotonEnergy) const 155 155 { 156 G4MPVEntry *target, *temp;157 156 G4int left, right; 158 157 G4double ratio1, ratio2, pmright, pmleft, InterpolatedValue; … … 175 174 G4Exception("G4MaterialPropertyVector::GetProperty()", "OutOfRange", 176 175 JustWarning, "Attempt to retrieve property below range !"); 176 G4cout << " aPhotonEnergy = " << aPhotonEnergy/MeV 177 << " [MeV] PMmin = " << PMmin << " [MeV]" << G4endl; 177 178 return minProp; 178 179 } … … 182 183 G4Exception("G4MaterialPropertyVector::GetProperty()", "OutOfRange", 183 184 JustWarning, "Attempt to retrieve property above range !"); 185 G4cout << " aPhotonEnergy = " << aPhotonEnergy/MeV 186 << " [MeV] PMmax = " << PMmax << " [MeV]" << G4endl; 184 187 return maxProp; 185 188 } 186 187 target = new G4MPVEntry(aPhotonEnergy, 0.0); 188 189 temp = 0; 190 //temp = MPV.find(target); 191 std::vector<G4MPVEntry*>::const_iterator i; 192 for (i = MPV.begin(); i != MPV.end(); i++) 193 { 194 if (**i == *target) { temp = *i; break; } 195 } 196 if (temp != 0) 197 { 198 //////////////////////// 199 // Return actual value 200 //////////////////////// 201 202 G4double retval = temp->GetProperty(); 203 delete target; 204 return retval; 205 } 206 else 207 { 208 ////////////////////////////// 209 // Return interpolated value 210 ////////////////////////////// 211 212 GetAdjacentBins(aPhotonEnergy, &left, &right); 213 214 pmleft = MPV[left]->GetPhotonEnergy(); 215 pmright = MPV[right]->GetPhotonEnergy(); 216 ratio1 = (aPhotonEnergy-pmleft)/(pmright-pmleft); 217 ratio2 = 1 - ratio1; 218 InterpolatedValue = MPV[left]->GetProperty()*ratio2 + 219 MPV[right]->GetProperty()*ratio1; 220 delete target; 221 return InterpolatedValue; 222 } 189 190 ////////////////////////////// 191 // Return interpolated value 192 ////////////////////////////// 193 194 GetAdjacentBins(aPhotonEnergy, &left, &right); 195 pmleft = MPV[left]->GetPhotonEnergy(); 196 pmright = MPV[right]->GetPhotonEnergy(); 197 ratio1 = (aPhotonEnergy-pmleft)/(pmright-pmleft); 198 ratio2 = 1 - ratio1; 199 InterpolatedValue = MPV[left]->GetProperty()*ratio2 + 200 MPV[right]->GetProperty()*ratio1; 201 return InterpolatedValue; 223 202 } 224 203 … … 340 319 { 341 320 mid = (*left + *right)/2; 342 if (MPV[mid]->GetPhotonEnergy() < aPhotonEnergy)321 if (MPV[mid]->GetPhotonEnergy() <= aPhotonEnergy) 343 322 { 344 323 *left = mid; -
trunk/source/materials/src/G4NistMaterialBuilder.cc
r1228 r1315 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4NistMaterialBuilder.cc,v 1.2 3 2009/11/24 17:19:10vnivanch Exp $27 // GEANT4 tag $Name: geant4-09-0 3$26 // $Id: G4NistMaterialBuilder.cc,v 1.27 2010/05/20 13:08:22 vnivanch Exp $ 27 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 28 28 // 29 29 // … … 95 95 96 96 G4String name = matname; 97 if("G4_NYLON-6/6" == matname) name = "G4_NYLON-6-6";98 if("G4_NYLON-6/10" == matname) name = "G4_NYLON-6-10";97 if("G4_NYLON-6/6" == matname) { name = "G4_NYLON-6-6"; } 98 if("G4_NYLON-6/10" == matname) { name = "G4_NYLON-6-10";} 99 99 100 100 if (verbose > 1) { … … 107 107 G4Material* mat = 0; 108 108 109 for (G4int i=0; i<nMaterials; i++) {109 for (G4int i=0; i<nMaterials; ++i) { 110 110 111 111 // Is inside NIST DB? … … 124 124 // Check the list of all materials 125 125 if (nmat > 0) { 126 for (G4int i=0; i<nmat; i++) {126 for (G4int i=0; i<nmat; ++i) { 127 127 if(name == ((*theMaterialTable)[i])->GetName()) { 128 128 mat = (*theMaterialTable)[i]; … … 152 152 if (nMaterials == 0) return mat; 153 153 154 for (G4int i=0; i<nMaterials; i++) {154 for (G4int i=0; i<nMaterials; ++i) { 155 155 if (name == names[i]) { 156 156 mat = BuildMaterial(i, isotopes); … … 226 226 AddMaterial(name,dens*cm3/g,0,0.,nm,state,temp,pressure); 227 227 228 for (G4int i=0; i<nm; i++) {228 for (G4int i=0; i<nm; ++i) { 229 229 G4int Z = G4int((elmBuilder->FindOrBuildElement(elm[i]))->GetZ()); 230 230 AddElementByAtomCount(Z, nbAtoms[i]); … … 258 258 AddMaterial(name,dens*cm3/g,0,0.,nm,state,temp,pressure); 259 259 260 for (G4int i=0; i<nm; i++) {260 for (G4int i=0; i<nm; ++i) { 261 261 G4int Z = G4int((elmBuilder->FindOrBuildElement(elm[i]))->GetZ()); 262 262 AddElementByWeightFraction(Z, w[i]); … … 276 276 { 277 277 G4int idx = -1; 278 for (G4int i=0; i<nMaterials; i++) {278 for (G4int i=0; i<nMaterials; ++i) { 279 279 if (name == names[i]) { 280 280 G4cout << "G4NistMaterialBuilder::ConstructNewMaterial:" … … 350 350 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 351 351 352 void G4NistMaterialBuilder::ListMaterials(const G4String& list) 353 { 354 if (list == "simple") ListNistSimpleMaterials(); 355 if (list == "compound") ListNistCompoundMaterials(); 356 if (list == "hep") ListHepMaterials(); 357 358 if (list == "all") { 352 void G4NistMaterialBuilder::ListMaterials(const G4String& mnam) 353 { 354 if (mnam == "simple") { ListNistSimpleMaterials(); } 355 else if (mnam == "compound") { ListNistCompoundMaterials(); } 356 else if (mnam == "hep") { ListHepMaterials(); } 357 else if (mnam == "space") { ListSpaceMaterials(); } 358 359 else if (mnam == "all") { 359 360 ListNistSimpleMaterials(); 360 361 ListNistCompoundMaterials(); 361 362 ListHepMaterials(); 363 ListSpaceMaterials(); 362 364 } 363 365 } … … 372 374 G4cout << " Z Name ChFormula density(g/cm^3) I(eV) " << G4endl; 373 375 G4cout << "=======================================================" << G4endl; 374 for (G4int i=0; i<nElementary; i++) {DumpElm(i);}376 for (G4int i=0; i<nElementary; ++i) {DumpElm(i);} 375 377 G4cout << "=======================================================" << G4endl; 376 378 } … … 384 386 G4cout << " Ncomp Name ChFormula density(g/cm^3) I(eV) " << G4endl; 385 387 G4cout << "=======================================================" << G4endl; 386 for (G4int i=nElementary; i<nNIST; i++) {DumpMix(i);}388 for (G4int i=nElementary; i<nNIST; ++i) {DumpMix(i);} 387 389 G4cout << "=======================================================" << G4endl; 388 390 } … … 397 399 G4cout << " Ncomp Name ChFormula density(g/cm^3) I(eV) " << G4endl; 398 400 G4cout << "=======================================================" << G4endl; 399 for (G4int i=nNIST; i<nMaterials; i++) {DumpMix(i);} 401 for (G4int i=nNIST; i<nHEP; ++i) {DumpMix(i);} 402 G4cout << "=======================================================" << G4endl; 403 } 404 405 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 406 407 void G4NistMaterialBuilder::ListSpaceMaterials() 408 { 409 G4cout << "=======================================================" << G4endl; 410 G4cout << "### Space ISS Materials ##" << G4endl; 411 G4cout << "=======================================================" << G4endl; 412 G4cout << " Ncomp Name ChFormula density(g/cm^3) I(eV) " << G4endl; 413 G4cout << "=======================================================" << G4endl; 414 for (G4int i=nHEP; i<nMaterials; ++i) {DumpMix(i);} 400 415 G4cout << "=======================================================" << G4endl; 401 416 } … … 470 485 } 471 486 472 nMaterials++;487 ++nMaterials; 473 488 474 489 if(verbose > 1) { … … 497 512 return; 498 513 } else { 499 for(G4int i=0; i<nMaterials; i++) {514 for(G4int i=0; i<nMaterials; ++i) { 500 515 if(nameMat == names[i]) { 501 516 chFormulas[i] = ch; … … 526 541 return; 527 542 } else { 528 for(G4int i=0; i<nMaterials; i++) {543 for(G4int i=0; i<nMaterials; ++i) { 529 544 if(nameMat == names[i]) { 530 545 temperatures[i] = t; … … 545 560 elements.push_back(Z); 546 561 fractions.push_back(w); 547 nCurrent--;548 nComponents++;562 --nCurrent; 563 ++nComponents; 549 564 if (nCurrent == 0) { 550 565 G4int n = nMaterials - 1; … … 553 568 G4int imax = imin + components[n]; 554 569 555 for(G4int i=imin; i<imax; i++) {sum += fractions[i];}556 if (sum > 0.0) for (G4int i=imin; i<imax; i++) {fractions[i] /= sum;}570 for(G4int i=imin; i<imax; ++i) {sum += fractions[i];} 571 if (sum > 0.0) for (G4int i=imin; i<imax; ++i) {fractions[i] /= sum;} 557 572 } 558 573 } … … 590 605 void G4NistMaterialBuilder::Initialise() 591 606 { 592 if (verbose > 0) 607 if (verbose > 0) { 593 608 G4cout << "### G4NistMaterialBuilder::Initialise()" << G4endl; 594 609 } 595 610 NistSimpleMaterials(); 596 611 NistCompoundMaterials(); 597 612 HepAndNuclearMaterials(); 598 599 if (verbose > 1) ListMaterials("all"); 613 SpaceMaterials(); 614 615 if (verbose > 1) { ListMaterials("all"); } 600 616 } 601 617 … … 1319 1335 AddElementByWeightFraction( 7, 0.035451); 1320 1336 AddElementByWeightFraction( 8, 0.7101 ); 1321 1337 1322 1338 AddMaterial("G4_MUSCLE_WITHOUT_SUCROSE", 1.07, 0, 74.2, 4); 1323 1339 AddElementByWeightFraction( 1, 0.101969); … … 1443 1459 1444 1460 AddMaterial("G4_POLYTRIFLUOROCHLOROETHYLENE", 2.1, 0, 120.7, 3); 1461 // correct chemical name Polychlorotrifluoroethylene [CF2CClF]n, IvantchenkoA. 1445 1462 AddElementByWeightFraction( 6, 0.20625 ); 1446 1463 AddElementByWeightFraction( 9, 0.489354); … … 1713 1730 1714 1731 AddMaterial("G4_GRAPHITE", 2.21, 6, 78.); 1732 AddChemicalFormula("G4_GRAPHITE","Graphite"); 1733 1715 1734 nNIST = nMaterials; 1716 AddChemicalFormula("G4_GRAPHITE","Graphite");1717 1735 } 1718 1736 … … 1738 1756 1739 1757 AddMaterial("G4_GRAPHITE_POROUS", 1.7, 6, 78.); 1740 AddChemicalFormula("G4_GRAPHITE","Graphite"); 1741 1742 } 1743 1744 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 1745 1758 AddChemicalFormula("G4_GRAPHITE_POROUS","Graphite"); 1759 1760 // LUCITE is equal to plustiglass 1761 AddMaterial("G4_LUCITE", 1.19, 0, 74., 3); 1762 AddElementByWeightFraction( 1, 0.080538); 1763 AddElementByWeightFraction( 6, 0.599848); 1764 AddElementByWeightFraction( 8, 0.319614); 1765 1766 // SRIM-2008 materials 1767 AddMaterial("G4_BRASS", 8.52, 0, 0.0, 3); 1768 AddElementByAtomCount("Cu", 62); 1769 AddElementByAtomCount("Zn", 35); 1770 AddElementByAtomCount("Pb" , 3); 1771 1772 AddMaterial("G4_BRONZE", 8.82, 0, 0.0, 3); 1773 AddElementByAtomCount("Cu", 89); 1774 AddElementByAtomCount("Zn", 9); 1775 AddElementByAtomCount("Pb" , 2); 1776 1777 AddMaterial("G4_STAINLESS-STEEL", 8.00, 0, 0.0, 3); 1778 AddElementByAtomCount("Fe", 74); 1779 AddElementByAtomCount("Cr", 8); 1780 AddElementByAtomCount("Ni" ,18); 1781 1782 nHEP = nMaterials; 1783 } 1784 1785 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 1786 1787 void G4NistMaterialBuilder::SpaceMaterials() 1788 { 1789 // density in g/cm3 1790 1791 AddMaterial("G4_KEVLAR" , 1.44, 0, 0.0, 4); 1792 AddElementByAtomCount("C", 14); 1793 AddElementByAtomCount("H", 10); 1794 AddElementByAtomCount("O", 2); 1795 AddElementByAtomCount("N", 2); 1796 1797 AddMaterial("G4_DACRON" , 1.40, 0, 0.0, 3); // G4_POLYETHYLENE_TEREPHTALATE 1798 AddElementByAtomCount("C", 10); 1799 AddElementByAtomCount("H", 8); 1800 AddElementByAtomCount("O", 4); 1801 1802 AddMaterial("G4_NEOPRENE" , 1.23, 0, 0.0, 3); // POLYCLOROPRENE 1803 AddElementByAtomCount("C", 4); 1804 AddElementByAtomCount("H", 5); 1805 AddElementByAtomCount("Cl", 1); 1806 } 1807 1808 1809 1810 -
trunk/source/materials/test/G4MaterialsTest.cc
r1199 r1315 26 26 // 27 27 // $Id: G4MaterialsTest.cc,v 1.9 2006/06/29 19:13:14 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/G4SandiaTableTest.cc
r1199 r1315 26 26 // 27 27 // $Id: G4SandiaTableTest.cc,v 1.9 2006/06/29 19:13:17 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/NistMaterialTest1.cc
r1199 r1315 26 26 // 27 27 // $Id: NistMaterialTest1.cc,v 1.3 2006/06/29 19:13:19 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/NistMaterialTest2.cc
r1199 r1315 26 26 // 27 27 // $Id: NistMaterialTest2.cc,v 1.3 2006/06/29 19:13:21 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/nistComparison.cc
r1199 r1315 26 26 // 27 27 // $Id: nistComparison.cc,v 1.2 2006/06/29 19:13:23 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testAdditionOf_MPT_toMaterial.cc
r1199 r1315 26 26 // 27 27 // $Id: testAdditionOf_MPT_toMaterial.cc,v 1.6 2006/06/29 19:13:25 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testG4AtomicShells.cc
r1199 r1315 26 26 // 27 27 // $Id: testG4AtomicShells.cc,v 1.7 2009/09/18 07:47:07 grichine Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testMPVEntry.cc
r1199 r1315 26 26 // 27 27 // $Id: testMPVEntry.cc,v 1.5 2006/06/29 19:13:31 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testMaterialPropertiesTable.cc
r1199 r1315 26 26 // 27 27 // $Id: testMaterialPropertiesTable.cc,v 1.4 2006/06/29 19:13:33 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testMaterialPropertyVector.cc
r1199 r1315 26 26 // 27 27 // $Id: testMaterialPropertyVector.cc,v 1.6 2006/06/29 19:13:36 gunter Exp $ 28 // GEANT4 tag $Name: materials-V09-02-18$28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 29 29 // 30 30 // -
trunk/source/materials/test/testStoppingPower.cc
r1199 r1315 25 25 // 26 26 // 27 // GEANT4 tag $Name: materials-V09-02-18$27 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $ 28 28 // 29 29 //
Note: See TracChangeset
for help on using the changeset viewer.