GeomConverter/src/org/lcsim/material
diff -u -r1.2 -r1.3
--- elements.xml 1 Jul 2005 00:05:59 -0000 1.2
+++ elements.xml 25 Jan 2006 00:27:11 -0000 1.3
@@ -262,7 +262,7 @@
<element name="H" formula="H" Z="1.0">
<atom type="A" unit="g/mol" value="1.00794" />
</element>
- <material name="Hydrogen">
+ <material name="Hydrogen" state="gas">
<D type="density" unit="g/cm3" value="0.0708" />
<composite n="1" ref="H" />
</material>
GeomConverter/src/org/lcsim/material
diff -u -r1.6 -r1.7
--- materials.xml 16 Jul 2005 01:11:36 -0000 1.6
+++ materials.xml 25 Jan 2006 00:27:11 -0000 1.7
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<materials>
- <!--
- Air by weight from
-
- http://www.engineeringtoolbox.com/air-composition-24_212.html
+ <!--
+ Air by weight from
+
+ http://www.engineeringtoolbox.com/air-composition-24_212.html
-->
<material name="Air">
<D type="density" unit="g/cm3" value="0.0012"/>
@@ -18,104 +18,104 @@
<composite n="44" ref="H"/>
<composite n="15" ref="C"/>
<composite n="7" ref="O"/>
- </material>
+ </material>
+
+ <material name="Quartz">
+ <D type="density" value="2.2" unit="g/cm3"/>
+ <composite n="1" ref="Si"/>
+ <composite n="2" ref="O"/>
+ </material>
+
+ <material name="G10">
+ <D type="density" value="1.7" unit="g/cm3"/>
+ <fraction n="0.08" ref="Cl"/>
+ <fraction n="0.773" ref="Quartz"/>
+ <fraction n="0.147" ref="Epoxy"/>
+ </material>
+
+ <material name="Polystyrene">
+ <D value="1.032" unit="g/cm3"/>
+ <composite n="19" ref="C"/>
+ <composite n="21" ref="H"/>
+ </material>
+
+ <material name="Steel235">
+ <D value="7.85" unit="g/cm3"/>
+ <fraction n="0.998" ref="Fe"/>
+ <fraction n=".002" ref="C"/>
+ </material>
+
+ <material name="SiliconOxide">
+ <D type="density" value="2.65" unit="g/cm3"/>
+ <composite n="1" ref="Si"/>
+ <composite n="2" ref="O"/>
+ </material>
+
+ <material name="BoronOxide">
+ <D type="density" value="2.46" unit="g/cm3"/>
+ <composite n="2" ref="B"/>
+ <composite n="3" ref="O"/>
+ </material>
+
+ <material name="SodiumOxide">
+ <D type="density" value="2.65" unit="g/cm3"/>
+ <composite n="2" ref="Na"/>
+ <composite n="1" ref="O"/>
+ </material>
+
+ <material name="AluminumOxide">
+ <D type="density" value="3.89" unit="g/cm3"/>
+ <composite n="2" ref="Al"/>
+ <composite n="3" ref="O"/>
+ </material>
+
+ <material name="PyrexGlass">
+ <D type="density" value="2.23" unit="g/cm3"/>
+ <fraction n="0.806" ref="SiliconOxide"/>
+ <fraction n="0.130" ref="BoronOxide"/>
+ <fraction n="0.040" ref="SodiumOxide"/>
+ <fraction n="0.023" ref="AluminumOxide"/>
+ </material>
+
+ <material name="CarbonFiber">
+ <D type="density" value="1.5" unit="g/cm3"/>
+ <fraction n="0.65" ref="C"/>
+ <fraction n="0.35" ref="Epoxy"/>
+ </material>
+
+ <material name="Rohacell31">
+ <D type="density" value="0.032" unit="g/cm3"/>
+ <composite n="9" ref="C"/>
+ <composite n="13" ref="H"/>
+ <composite n="2" ref="O"/>
+ <composite n="1" ref="N"/>
+ </material>
+
+ <material name="RPCGasDefault" state="gas">
+ <D type="density" value="0.0037" unit="g/cm3"/>
+ <composite n="209" ref="C"/>
+ <composite n="239" ref="H"/>
+ <composite n="381" ref="F"/>
+ </material>
+
+ <material name="PolystyreneFoam">
+ <D type="density" value="0.0056" unit="g/cm3"/>
+ <fraction n="1.0" ref="Polystyrene"/>
+ </material>
+
+ <material name="Kapton">
+ <D value="1.43" unit="g/cm3" />
+ <composite n="22" ref="C"/>
+ <composite n="10" ref="H" />
+ <composite n="2" ref="N" />
+ <composite n="5" ref="O" />
+ </material>
+
+ <material name="PEEK">
+ <D value="1.37" unit="g/cm3" />
+ <composite n="19" ref="C"/>
+ <composite n="12" ref="H" />
+ <composite n="3" ref="O" />
+ </material>
- <material name="Quartz">
- <D type="density" value="2.2" unit="g/cm3"/>
- <composite n="1" ref="Si"/>
- <composite n="2" ref="O"/>
- </material>
-
- <material name="G10">
- <D type="density" value="1.7" unit="g/cm3"/>
- <fraction n="0.08" ref="Cl"/>
- <fraction n="0.773" ref="Quartz"/>
- <fraction n="0.147" ref="Epoxy"/>
- </material>
-
- <material name="Polystyrene">
- <D value="1.032" unit="g/cm3"/>
- <composite n="19" ref="C"/>
- <composite n="21" ref="H"/>
- </material>
-
- <material name="Steel235">
- <D value="7.85" unit="g/cm3"/>
- <fraction n="0.998" ref="Fe"/>
- <fraction n=".002" ref="C"/>
- </material>
-
- <material name="SiliconOxide">
- <D type="density" value="2.65" unit="g/cm3"/>
- <composite n="1" ref="Si"/>
- <composite n="2" ref="O"/>
- </material>
-
- <material name="BoronOxide">
- <D type="density" value="2.46" unit="g/cm3"/>
- <composite n="2" ref="B"/>
- <composite n="3" ref="O"/>
- </material>
-
- <material name="SodiumOxide">
- <D type="density" value="2.65" unit="g/cm3"/>
- <composite n="2" ref="Na"/>
- <composite n="1" ref="O"/>
- </material>
-
- <material name="AluminumOxide">
- <D type="density" value="3.89" unit="g/cm3"/>
- <composite n="2" ref="Al"/>
- <composite n="3" ref="O"/>
- </material>
-
- <material name="PyrexGlass">
- <D type="density" value="2.23" unit="g/cm3"/>
- <fraction n="0.806" ref="SiliconOxide"/>
- <fraction n="0.130" ref="BoronOxide"/>
- <fraction n="0.040" ref="SodiumOxide"/>
- <fraction n="0.023" ref="AluminumOxide"/>
- </material>
-
- <material name="CarbonFiber">
- <D type="density" value="1.5" unit="g/cm3"/>
- <fraction n="0.65" ref="C"/>
- <fraction n="0.35" ref="Epoxy"/>
- </material>
-
- <material name="Rohacell31">
- <D type="density" value="0.032" unit="g/cm3"/>
- <composite n="9" ref="C"/>
- <composite n="13" ref="H"/>
- <composite n="2" ref="O"/>
- <composite n="1" ref="N"/>
- </material>
-
- <material name="RPCGasDefault">
- <D type="density" value="0.0037" unit="g/cm3"/>
- <composite n="209" ref="C"/>
- <composite n="239" ref="H"/>
- <composite n="381" ref="F"/>
- </material>
-
- <material name="PolystyreneFoam">
- <D type="density" value="0.0056" unit="g/cm3"/>
- <fraction n="1.0" ref="Polystyrene"/>
- </material>
-
- <material name="Kapton">
- <D value="1.43" unit="g/cm3" />
- <composite n="22" ref="C"/>
- <composite n="10" ref="H" />
- <composite n="2" ref="N" />
- <composite n="5" ref="O" />
- </material>
-
- <material name="PEEK">
- <D value="1.37" unit="g/cm3" />
- <composite n="19" ref="C"/>
- <composite n="12" ref="H" />
- <composite n="3" ref="O" />
- </material>
-
</materials>