Changeset 1315 for trunk/source/materials/src/G4DensityEffectData.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

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

File:

• trunk/source/materials/src/G4DensityEffectData.cc (modified) (16 diffs)

trunk/source/materials/src/G4DensityEffectData.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4DensityEffectData.cc,v 1.9 2009/12/01 08:24:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4DensityEffectData.cc,v 1.12 2010/05/15 15:37:33 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 
 //---------------------------------------------------------------------------
@@ -74 +74 @@
     {
       indexZ[i] = -1;
+      state[i]  = kStateSolid;
     }
 
-//G4_H  index=0
+//G4_lH2  index=0
+  G4double M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021};
+  AddMaterial(M1,"G4_lH2");
+
+//G4_H  index=1
   G4double M0[NDENSARRAY]={0.263,1.412,9.5835,1.8639,3.2718,0.14092,5.7273,0.0,0.024};
   AddMaterial(M0,"G4_H");
-  indexZ[0]=0;
-
-//G4_lH2  index=1
-  G4double M1[NDENSARRAY]={7.031,1.546,3.2632,0.4759,1.9215,0.13483,5.6249,0,0.021};
-  AddMaterial(M1,"G4_lH2");
+  indexZ[1]=1;
+  state[1]=kStateGas;
 
 //G4_He  index=2
@@ -89 +91 @@
   AddMaterial(M2,"G4_He");
   indexZ[2]=2;
+  state[2]=kStateGas;
 
 //G4_Li  index=3
@@ -114 +117 @@
   AddMaterial(M7,"G4_N");
   indexZ[7]=7;
+  state[7]=kStateGas;
 
 //G4_O  index=8
@@ -119 +123 @@
   AddMaterial(M8,"G4_O");
   indexZ[8]=8;
+  state[8]=kStateGas;
 
 //G4_F  index=9
@@ -124 +129 @@
   AddMaterial(M9,"G4_F");
   indexZ[9]=9;
+  state[9]=kStateGas;
 
 //G4_Ne  index=10
@@ -129 +135 @@
   AddMaterial(M10,"G4_Ne");
   indexZ[10]=10;
+  state[10]=kStateGas;
 
 //G4_Na  index=11
@@ -164 +171 @@
   AddMaterial(M17,"G4_Cl");
   indexZ[17]=17;
+  state[17]=kStateGas;
 
 //G4_Ar  index=18
@@ -169 +177 @@
   AddMaterial(M18,"G4_Ar");
   indexZ[18]=18;
+  state[18]=kStateGas;
 
 //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};
   AddMaterial(M33,"G4_As");
-   indexZ[33]=33;
+  indexZ[33]=33;
 
 //G4_Se  index=34
@@ -254 +263 @@
   AddMaterial(M35,"G4_Br");
   indexZ[35]=35;
+  state[35]=kStateGas;
 
 //G4_Kr  index=36
@@ -259 +269 @@
   AddMaterial(M36,"G4_Kr");
   indexZ[36]=36;
+  state[36]=kStateGas;
 
 //G4_Ru  index=37
@@ -349 +360 @@
   AddMaterial(M54,"G4_Xe");
   indexZ[54]=54;
+  state[54]=kStateGas;
 
 //G4_Cs  index=55
@@ -444 +456 @@
   AddMaterial(M73,"G4_Ta");
   indexZ[73]=73;
+
 //G4_W  index=74
   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");
   indexZ[86]=85;
+  state[86]=kStateGas;
 
 //G4_Ra  index=86
@@ -1284 +1298 @@
 }
 
-G4int G4DensityEffectData::GetIndex(G4int Z)
+G4int G4DensityEffectData::GetElementIndex(G4int Z, G4State st)
 {
   G4int idx = -1;
-  if(Z >= 0 && Z < NDENSELEM) idx = indexZ[Z]; 
+  if(Z > 0 && Z < NDENSELEM) { 
+    if(st == state[Z])             { idx = indexZ[Z]; } 
+    else if(st == kStateUndefined) { idx = indexZ[Z]; }
+  } 
   return idx;
 }