Print

Print


Commit in GeomConverter/src/org/lcsim/material on MAIN
elements.xml+223-2231.1 -> 1.2
materials.xml+29-291.2 -> 1.3
+252-252
2 modified files
Change reference method of element materials to using abbrev for element and full name for the corresponding material.

GeomConverter/src/org/lcsim/material
elements.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- elements.xml	9 Jun 2005 03:34:42 -0000	1.1
+++ elements.xml	1 Jul 2005 00:05:59 -0000	1.2
@@ -1,781 +1,781 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <materials>
-  <element name="Actinium_e" formula="Ac" Z="89">
+  <element name="Ac" formula="Ac" Z="89.0">
     <atom type="A" unit="g/mol" value="227.0" />
   </element>
   <material name="Actinium">
     <D type="density" unit="g/cm3" value="10.07" />
-    <composite n="1" ref="Actinium_e" />
+    <composite n="1" ref="Ac" />
   </material>
-  <element name="Silver_e" formula="Ag" Z="47">
+  <element name="Ag" formula="Ag" Z="47.0">
     <atom type="A" unit="g/mol" value="107.8682" />
   </element>
   <material name="Silver">
     <D type="density" unit="g/cm3" value="10.501" />
-    <composite n="1" ref="Silver_e" />
+    <composite n="1" ref="Ag" />
   </material>
-  <element name="Aluminum_e" formula="Al" Z="13">
+  <element name="Al" formula="Al" Z="13.0">
     <atom type="A" unit="g/mol" value="26.981538" />
   </element>
   <material name="Aluminum">
     <D type="density" unit="g/cm3" value="2.7" />
-    <composite n="1" ref="Aluminum_e" />
+    <composite n="1" ref="Al" />
   </material>
-  <element name="Americium_e" formula="Am" Z="95">
+  <element name="Am" formula="Am" Z="95.0">
     <atom type="A" unit="g/mol" value="243.0" />
   </element>
   <material name="Americium">
     <D type="density" unit="g/cm3" value="13.69" />
-    <composite n="1" ref="Americium_e" />
+    <composite n="1" ref="Am" />
   </material>
-  <element name="Argon_e" formula="Ar" Z="18">
+  <element name="Ar" formula="Ar" Z="18.0">
     <atom type="A" unit="g/mol" value="39.948" />
   </element>
   <material name="Argon">
     <D type="density" unit="g/cm3" value="1.396" />
-    <composite n="1" ref="Argon_e" />
+    <composite n="1" ref="Ar" />
   </material>
-  <element name="Arsenic_e" formula="As" Z="33">
+  <element name="As" formula="As" Z="33.0">
     <atom type="A" unit="g/mol" value="74.9216" />
   </element>
   <material name="Arsenic">
     <D type="density" unit="g/cm3" value="5.776" />
-    <composite n="1" ref="Arsenic_e" />
+    <composite n="1" ref="As" />
   </material>
-  <element name="Astatine_e" formula="At" Z="85">
+  <element name="At" formula="At" Z="85.0">
     <atom type="A" unit="g/mol" value="210.0" />
   </element>
   <material name="Astatine">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Astatine_e" />
+    <composite n="1" ref="At" />
   </material>
-  <element name="Gold_e" formula="Au" Z="79">
+  <element name="Au" formula="Au" Z="79.0">
     <atom type="A" unit="g/mol" value="196.96655" />
   </element>
   <material name="Gold">
     <D type="density" unit="g/cm3" value="19.282" />
-    <composite n="1" ref="Gold_e" />
+    <composite n="1" ref="Au" />
   </material>
-  <element name="Boron_e" formula="B" Z="5">
+  <element name="B" formula="B" Z="5.0">
     <atom type="A" unit="g/mol" value="10.811" />
   </element>
   <material name="Boron">
     <D type="density" unit="g/cm3" value="2.37" />
-    <composite n="1" ref="Boron_e" />
+    <composite n="1" ref="B" />
   </material>
-  <element name="Barium_e" formula="Ba" Z="56">
+  <element name="Ba" formula="Ba" Z="56.0">
     <atom type="A" unit="g/mol" value="137.327" />
   </element>
   <material name="Barium">
     <D type="density" unit="g/cm3" value="3.62" />
-    <composite n="1" ref="Barium_e" />
+    <composite n="1" ref="Ba" />
   </material>
-  <element name="Beryllium_e" formula="Be" Z="4">
+  <element name="Be" formula="Be" Z="4.0">
     <atom type="A" unit="g/mol" value="9.012182" />
   </element>
   <material name="Beryllium">
     <D type="density" unit="g/cm3" value="1.85" />
-    <composite n="1" ref="Beryllium_e" />
+    <composite n="1" ref="Be" />
   </material>
-  <element name="Bismuth_e" formula="Bi" Z="83">
+  <element name="Bi" formula="Bi" Z="83.0">
     <atom type="A" unit="g/mol" value="208.98038" />
   </element>
   <material name="Bismuth">
     <D type="density" unit="g/cm3" value="9.807" />
-    <composite n="1" ref="Bismuth_e" />
+    <composite n="1" ref="Bi" />
   </material>
-  <element name="Berkelium_e" formula="Bk" Z="97">
+  <element name="Bk" formula="Bk" Z="97.0">
     <atom type="A" unit="g/mol" value="247.0" />
   </element>
   <material name="Berkelium">
     <D type="density" unit="g/cm3" value="14.0" />
-    <composite n="1" ref="Berkelium_e" />
+    <composite n="1" ref="Bk" />
   </material>
-  <element name="Bromine_e" formula="Br" Z="35">
+  <element name="Br" formula="Br" Z="35.0">
     <atom type="A" unit="g/mol" value="79.904" />
   </element>
   <material name="Bromine">
     <D type="density" unit="g/cm3" value="3.11" />
-    <composite n="1" ref="Bromine_e" />
+    <composite n="1" ref="Br" />
   </material>
-  <element name="Carbon_e" formula="C" Z="6">
+  <element name="C" formula="C" Z="6.0">
     <atom type="A" unit="g/mol" value="12.0107" />
   </element>
   <material name="Carbon">
     <D type="density" unit="g/cm3" value="2.267" />
-    <composite n="1" ref="Carbon_e" />
+    <composite n="1" ref="C" />
   </material>
-  <element name="Calcium_e" formula="Ca" Z="20">
+  <element name="Ca" formula="Ca" Z="20.0">
     <atom type="A" unit="g/mol" value="40.078" />
   </element>
   <material name="Calcium">
     <D type="density" unit="g/cm3" value="1.54" />
-    <composite n="1" ref="Calcium_e" />
+    <composite n="1" ref="Ca" />
   </material>
-  <element name="Cadmium_e" formula="Cd" Z="48">
+  <element name="Cd" formula="Cd" Z="48.0">
     <atom type="A" unit="g/mol" value="112.411" />
   </element>
   <material name="Cadmium">
     <D type="density" unit="g/cm3" value="8.69" />
-    <composite n="1" ref="Cadmium_e" />
+    <composite n="1" ref="Cd" />
   </material>
-  <element name="Cerium_e" formula="Ce" Z="58">
+  <element name="Ce" formula="Ce" Z="58.0">
     <atom type="A" unit="g/mol" value="140.116" />
   </element>
   <material name="Cerium">
     <D type="density" unit="g/cm3" value="8.16" />
-    <composite n="1" ref="Cerium_e" />
+    <composite n="1" ref="Ce" />
   </material>
-  <element name="Californium_e" formula="Cf" Z="98">
+  <element name="Cf" formula="Cf" Z="98.0">
     <atom type="A" unit="g/mol" value="251.0" />
   </element>
   <material name="Californium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Californium_e" />
+    <composite n="1" ref="Cf" />
   </material>
-  <element name="Chlorine_e" formula="Cl" Z="17">
+  <element name="Cl" formula="Cl" Z="17.0">
     <atom type="A" unit="g/mol" value="35.4527" />
   </element>
   <material name="Chlorine">
     <D type="density" unit="g/cm3" value="1.56" />
-    <composite n="1" ref="Chlorine_e" />
+    <composite n="1" ref="Cl" />
   </material>
-  <element name="Curium_e" formula="Cm" Z="96">
+  <element name="Cm" formula="Cm" Z="96.0">
     <atom type="A" unit="g/mol" value="247.0" />
   </element>
   <material name="Curium">
     <D type="density" unit="g/cm3" value="13.51" />
-    <composite n="1" ref="Curium_e" />
+    <composite n="1" ref="Cm" />
   </material>
-  <element name="Cobalt_e" formula="Co" Z="27">
+  <element name="Co" formula="Co" Z="27.0">
     <atom type="A" unit="g/mol" value="58.9332" />
   </element>
   <material name="Cobalt">
     <D type="density" unit="g/cm3" value="8.86" />
-    <composite n="1" ref="Cobalt_e" />
+    <composite n="1" ref="Co" />
   </material>
-  <element name="Chromium_e" formula="Cr" Z="24">
+  <element name="Cr" formula="Cr" Z="24.0">
     <atom type="A" unit="g/mol" value="51.9961" />
   </element>
   <material name="Chromium">
     <D type="density" unit="g/cm3" value="7.15" />
-    <composite n="1" ref="Chromium_e" />
+    <composite n="1" ref="Cr" />
   </material>
-  <element name="Cesium_e" formula="Cs" Z="55">
+  <element name="Cs" formula="Cs" Z="55.0">
     <atom type="A" unit="g/mol" value="132.90545" />
   </element>
   <material name="Cesium">
     <D type="density" unit="g/cm3" value="1.93" />
-    <composite n="1" ref="Cesium_e" />
+    <composite n="1" ref="Cs" />
   </material>
-  <element name="Copper_e" formula="Cu" Z="29">
+  <element name="Cu" formula="Cu" Z="29.0">
     <atom type="A" unit="g/mol" value="63.546" />
   </element>
   <material name="Copper">
     <D type="density" unit="g/cm3" value="8.933" />
-    <composite n="1" ref="Copper_e" />
+    <composite n="1" ref="Cu" />
   </material>
-  <element name="Deuterium_e" formula="D" Z="1">
+  <element name="D" formula="D" Z="1.0">
     <atom type="A" unit="g/mol" value="2.014" />
   </element>
   <material name="Deuterium">
     <D type="density" unit="g/cm3" value="0.16" />
-    <composite n="1" ref="Deuterium_e" />
+    <composite n="1" ref="D" />
   </material>
-  <element name="Dysprosium_e" formula="Dy" Z="66">
+  <element name="Dy" formula="Dy" Z="66.0">
     <atom type="A" unit="g/mol" value="162.5" />
   </element>
   <material name="Dysprosium">
     <D type="density" unit="g/cm3" value="8.55" />
-    <composite n="1" ref="Dysprosium_e" />
+    <composite n="1" ref="Dy" />
   </material>
-  <element name="Erbium_e" formula="Er" Z="68">
+  <element name="Er" formula="Er" Z="68.0">
     <atom type="A" unit="g/mol" value="167.26" />
   </element>
   <material name="Erbium">
     <D type="density" unit="g/cm3" value="9.07" />
-    <composite n="1" ref="Erbium_e" />
+    <composite n="1" ref="Er" />
   </material>
-  <element name="Einsteinium_e" formula="Es" Z="99">
+  <element name="Es" formula="Es" Z="99.0">
     <atom type="A" unit="g/mol" value="252.0" />
   </element>
   <material name="Einsteinium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Einsteinium_e" />
+    <composite n="1" ref="Es" />
   </material>
-  <element name="Europium_e" formula="Eu" Z="63">
+  <element name="Eu" formula="Eu" Z="63.0">
     <atom type="A" unit="g/mol" value="151.964" />
   </element>
   <material name="Europium">
     <D type="density" unit="g/cm3" value="5.24" />
-    <composite n="1" ref="Europium_e" />
+    <composite n="1" ref="Eu" />
   </material>
-  <element name="Fluorine_e" formula="F" Z="9">
+  <element name="F" formula="F" Z="9.0">
     <atom type="A" unit="g/mol" value="18.9984032" />
   </element>
   <material name="Fluorine">
     <D type="density" unit="g/cm3" value="1.5" />
-    <composite n="1" ref="Fluorine_e" />
+    <composite n="1" ref="F" />
   </material>
-  <element name="Iron_e" formula="Fe" Z="26">
+  <element name="Fe" formula="Fe" Z="26.0">
     <atom type="A" unit="g/mol" value="55.845" />
   </element>
   <material name="Iron">
     <D type="density" unit="g/cm3" value="7.875" />
-    <composite n="1" ref="Iron_e" />
+    <composite n="1" ref="Fe" />
   </material>
-  <element name="Fermium_e" formula="Fm" Z="100">
+  <element name="Fm" formula="Fm" Z="100.0">
     <atom type="A" unit="g/mol" value="257.0" />
   </element>
   <material name="Fermium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Fermium_e" />
+    <composite n="1" ref="Fm" />
   </material>
-  <element name="Francium_e" formula="Fr" Z="87">
+  <element name="Fr" formula="Fr" Z="87.0">
     <atom type="A" unit="g/mol" value="223.0" />
   </element>
   <material name="Francium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Francium_e" />
+    <composite n="1" ref="Fr" />
   </material>
-  <element name="Gallium_e" formula="Ga" Z="31">
+  <element name="Ga" formula="Ga" Z="31.0">
     <atom type="A" unit="g/mol" value="69.723" />
   </element>
   <material name="Gallium">
     <D type="density" unit="g/cm3" value="5.91" />
-    <composite n="1" ref="Gallium_e" />
+    <composite n="1" ref="Ga" />
   </material>
-  <element name="Gadolinium_e" formula="Gd" Z="64">
+  <element name="Gd" formula="Gd" Z="64.0">
     <atom type="A" unit="g/mol" value="157.25" />
   </element>
   <material name="Gadolinium">
     <D type="density" unit="g/cm3" value="7.9" />
-    <composite n="1" ref="Gadolinium_e" />
+    <composite n="1" ref="Gd" />
   </material>
-  <element name="Germanium_e" formula="Ge" Z="32">
+  <element name="Ge" formula="Ge" Z="32.0">
     <atom type="A" unit="g/mol" value="72.61" />
   </element>
   <material name="Germanium">
     <D type="density" unit="g/cm3" value="5.323" />
-    <composite n="1" ref="Germanium_e" />
+    <composite n="1" ref="Ge" />
   </material>
-  <element name="Hydrogen_e" formula="H" Z="1">
+  <element name="H" formula="H" Z="1.0">
     <atom type="A" unit="g/mol" value="1.00794" />
   </element>
   <material name="Hydrogen">
     <D type="density" unit="g/cm3" value="0.0708" />
-    <composite n="1" ref="Hydrogen_e" />
+    <composite n="1" ref="H" />
   </material>
-  <element name="Hahnium_e" formula="Ha" Z="105">
+  <element name="Ha" formula="Ha" Z="105.0">
     <atom type="A" unit="g/mol" value="262.0" />
   </element>
   <material name="Hahnium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Hahnium_e" />
+    <composite n="1" ref="Ha" />
   </material>
-  <element name="Helium_e" formula="He" Z="2">
+  <element name="He" formula="He" Z="2.0">
     <atom type="A" unit="g/mol" value="4.002602" />
   </element>
   <material name="Helium">
     <D type="density" unit="g/cm3" value="0.124901" />
-    <composite n="1" ref="Helium_e" />
+    <composite n="1" ref="He" />
   </material>
-  <element name="Hafnium_e" formula="Hf" Z="72">
+  <element name="Hf" formula="Hf" Z="72.0">
     <atom type="A" unit="g/mol" value="178.49" />
   </element>
   <material name="Hafnium">
     <D type="density" unit="g/cm3" value="13.3" />
-    <composite n="1" ref="Hafnium_e" />
+    <composite n="1" ref="Hf" />
   </material>
-  <element name="Mercury_e" formula="Hg" Z="80">
+  <element name="Hg" formula="Hg" Z="80.0">
     <atom type="A" unit="g/mol" value="200.59" />
   </element>
   <material name="Mercury">
     <D type="density" unit="g/cm3" value="13.5336" />
-    <composite n="1" ref="Mercury_e" />
+    <composite n="1" ref="Hg" />
   </material>
-  <element name="Holmium_e" formula="Ho" Z="67">
+  <element name="Ho" formula="Ho" Z="67.0">
     <atom type="A" unit="g/mol" value="164.93032" />
   </element>
   <material name="Holmium">
     <D type="density" unit="g/cm3" value="8.8" />
-    <composite n="1" ref="Holmium_e" />
+    <composite n="1" ref="Ho" />
   </material>
-  <element name="Hassium_e" formula="Hs" Z="108">
+  <element name="Hs" formula="Hs" Z="108.0">
     <atom type="A" unit="g/mol" value="269.0" />
   </element>
   <material name="Hassium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Hassium_e" />
+    <composite n="1" ref="Hs" />
   </material>
-  <element name="Iodine_e" formula="I" Z="53">
+  <element name="I" formula="I" Z="53.0">
     <atom type="A" unit="g/mol" value="126.90447" />
   </element>
   <material name="Iodine">
     <D type="density" unit="g/cm3" value="4.93" />
-    <composite n="1" ref="Iodine_e" />
+    <composite n="1" ref="I" />
   </material>
-  <element name="Indium_e" formula="In" Z="49">
+  <element name="In" formula="In" Z="49.0">
     <atom type="A" unit="g/mol" value="114.818" />
   </element>
   <material name="Indium">
     <D type="density" unit="g/cm3" value="7.31" />
-    <composite n="1" ref="Indium_e" />
+    <composite n="1" ref="In" />
   </material>
-  <element name="Iridium_e" formula="Ir" Z="77">
+  <element name="Ir" formula="Ir" Z="77.0">
     <atom type="A" unit="g/mol" value="192.217" />
   </element>
   <material name="Iridium">
     <D type="density" unit="g/cm3" value="22.5" />
-    <composite n="1" ref="Iridium_e" />
+    <composite n="1" ref="Ir" />
   </material>
-  <element name="Potassium_e" formula="K" Z="19">
+  <element name="K" formula="K" Z="19.0">
     <atom type="A" unit="g/mol" value="39.0983" />
   </element>
   <material name="Potassium">
     <D type="density" unit="g/cm3" value="0.89" />
-    <composite n="1" ref="Potassium_e" />
+    <composite n="1" ref="K" />
   </material>
-  <element name="Krypton_e" formula="Kr" Z="36">
+  <element name="Kr" formula="Kr" Z="36.0">
     <atom type="A" unit="g/mol" value="83.8" />
   </element>
   <material name="Krypton">
     <D type="density" unit="g/cm3" value="2.418" />
-    <composite n="1" ref="Krypton_e" />
+    <composite n="1" ref="Kr" />
   </material>
-  <element name="Lanthanum_e" formula="La" Z="57">
+  <element name="La" formula="La" Z="57.0">
     <atom type="A" unit="g/mol" value="138.9055" />
   </element>
   <material name="Lanthanum">
     <D type="density" unit="g/cm3" value="6.15" />
-    <composite n="1" ref="Lanthanum_e" />
+    <composite n="1" ref="La" />
   </material>
-  <element name="Lithium_e" formula="Li" Z="3">
+  <element name="Li" formula="Li" Z="3.0">
     <atom type="A" unit="g/mol" value="6.941" />
   </element>
   <material name="Lithium">
     <D type="density" unit="g/cm3" value="0.534" />
-    <composite n="1" ref="Lithium_e" />
+    <composite n="1" ref="Li" />
   </material>
-  <element name="Lawrencium_e" formula="Lr" Z="103">
+  <element name="Lr" formula="Lr" Z="103.0">
     <atom type="A" unit="g/mol" value="262.0" />
   </element>
   <material name="Lawrencium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Lawrencium_e" />
+    <composite n="1" ref="Lr" />
   </material>
-  <element name="Lutetium_e" formula="Lu" Z="71">
+  <element name="Lu" formula="Lu" Z="71.0">
     <atom type="A" unit="g/mol" value="174.967" />
   </element>
   <material name="Lutetium">
     <D type="density" unit="g/cm3" value="9.84" />
-    <composite n="1" ref="Lutetium_e" />
+    <composite n="1" ref="Lu" />
   </material>
-  <element name="Mendelevium_e" formula="Md" Z="101">
+  <element name="Md" formula="Md" Z="101.0">
     <atom type="A" unit="g/mol" value="258.0" />
   </element>
   <material name="Mendelevium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Mendelevium_e" />
+    <composite n="1" ref="Md" />
   </material>
-  <element name="Magnesium_e" formula="Mg" Z="12">
+  <element name="Mg" formula="Mg" Z="12.0">
     <atom type="A" unit="g/mol" value="24.305" />
   </element>
   <material name="Magnesium">
     <D type="density" unit="g/cm3" value="1.74" />
-    <composite n="1" ref="Magnesium_e" />
+    <composite n="1" ref="Mg" />
   </material>
-  <element name="Manganese_e" formula="Mn" Z="25">
+  <element name="Mn" formula="Mn" Z="25.0">
     <atom type="A" unit="g/mol" value="54.938049" />
   </element>
   <material name="Manganese">
     <D type="density" unit="g/cm3" value="7.3" />
-    <composite n="1" ref="Manganese_e" />
+    <composite n="1" ref="Mn" />
   </material>
-  <element name="Molybdenum_e" formula="Mo" Z="42">
+  <element name="Mo" formula="Mo" Z="42.0">
     <atom type="A" unit="g/mol" value="95.94" />
   </element>
   <material name="Molybdenum">
     <D type="density" unit="g/cm3" value="10.2" />
-    <composite n="1" ref="Molybdenum_e" />
+    <composite n="1" ref="Mo" />
   </material>
-  <element name="Meitnerium_e" formula="Mt" Z="109">
+  <element name="Mt" formula="Mt" Z="109.0">
     <atom type="A" unit="g/mol" value="268.0" />
   </element>
   <material name="Meitnerium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Meitnerium_e" />
+    <composite n="1" ref="Mt" />
   </material>
-  <element name="Nitrogen_e" formula="N" Z="7">
+  <element name="N" formula="N" Z="7.0">
     <atom type="A" unit="g/mol" value="14.00674" />
   </element>
   <material name="Nitrogen">
     <D type="density" unit="g/cm3" value="0.807" />
-    <composite n="1" ref="Nitrogen_e" />
+    <composite n="1" ref="N" />
   </material>
-  <element name="Sodium_e" formula="Na" Z="11">
+  <element name="Na" formula="Na" Z="11.0">
     <atom type="A" unit="g/mol" value="22.98977" />
   </element>
   <material name="Sodium">
     <D type="density" unit="g/cm3" value="0.97" />
-    <composite n="1" ref="Sodium_e" />
+    <composite n="1" ref="Na" />
   </material>
-  <element name="Niobium_e" formula="Nb" Z="41">
+  <element name="Nb" formula="Nb" Z="41.0">
     <atom type="A" unit="g/mol" value="92.90638" />
   </element>
   <material name="Niobium">
     <D type="density" unit="g/cm3" value="8.57" />
-    <composite n="1" ref="Niobium_e" />
+    <composite n="1" ref="Nb" />
   </material>
-  <element name="Neodymium_e" formula="Nd" Z="60">
+  <element name="Nd" formula="Nd" Z="60.0">
     <atom type="A" unit="g/mol" value="144.24" />
   </element>
   <material name="Neodymium">
     <D type="density" unit="g/cm3" value="7.01" />
-    <composite n="1" ref="Neodymium_e" />
+    <composite n="1" ref="Nd" />
   </material>
-  <element name="Neon_e" formula="Ne" Z="10">
+  <element name="Ne" formula="Ne" Z="10.0">
     <atom type="A" unit="g/mol" value="20.1797" />
   </element>
   <material name="Neon">
     <D type="density" unit="g/cm3" value="1.204" />
-    <composite n="1" ref="Neon_e" />
+    <composite n="1" ref="Ne" />
   </material>
-  <element name="Nickel_e" formula="Ni" Z="28">
+  <element name="Ni" formula="Ni" Z="28.0">
     <atom type="A" unit="g/mol" value="58.6934" />
   </element>
   <material name="Nickel">
     <D type="density" unit="g/cm3" value="8.912" />
-    <composite n="1" ref="Nickel_e" />
+    <composite n="1" ref="Ni" />
   </material>
-  <element name="Nobelium_e" formula="No" Z="102">
+  <element name="No" formula="No" Z="102.0">
     <atom type="A" unit="g/mol" value="259.0" />
   </element>
   <material name="Nobelium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Nobelium_e" />
+    <composite n="1" ref="No" />
   </material>
-  <element name="Neptunium_e" formula="Np" Z="93">
+  <element name="Np" formula="Np" Z="93.0">
     <atom type="A" unit="g/mol" value="237.0" />
   </element>
   <material name="Neptunium">
     <D type="density" unit="g/cm3" value="20.25" />
-    <composite n="1" ref="Neptunium_e" />
+    <composite n="1" ref="Np" />
   </material>
-  <element name="Nielsbohrium_e" formula="Ns" Z="107">
+  <element name="Ns" formula="Ns" Z="107.0">
     <atom type="A" unit="g/mol" value="264.0" />
   </element>
   <material name="Nielsbohrium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Nielsbohrium_e" />
+    <composite n="1" ref="Ns" />
   </material>
-  <element name="Oxygen_e" formula="O" Z="8">
+  <element name="O" formula="O" Z="8.0">
     <atom type="A" unit="g/mol" value="15.9994" />
   </element>
   <material name="Oxygen">
     <D type="density" unit="g/cm3" value="1.141" />
-    <composite n="1" ref="Oxygen_e" />
+    <composite n="1" ref="O" />
   </material>
-  <element name="Osmium_e" formula="Os" Z="76">
+  <element name="Os" formula="Os" Z="76.0">
     <atom type="A" unit="g/mol" value="190.23" />
   </element>
   <material name="Osmium">
     <D type="density" unit="g/cm3" value="22.5" />
-    <composite n="1" ref="Osmium_e" />
+    <composite n="1" ref="Os" />
   </material>
-  <element name="Phosphorus_e" formula="P" Z="15">
+  <element name="P" formula="P" Z="15.0">
     <atom type="A" unit="g/mol" value="30.973761" />
   </element>
   <material name="Phosphorus">
     <D type="density" unit="g/cm3" value="1.82" />
-    <composite n="1" ref="Phosphorus_e" />
+    <composite n="1" ref="P" />
   </material>
-  <element name="Protactinium_e" formula="Pa" Z="91">
+  <element name="Pa" formula="Pa" Z="91.0">
     <atom type="A" unit="g/mol" value="231.03588" />
   </element>
   <material name="Protactinium">
     <D type="density" unit="g/cm3" value="15.37" />
-    <composite n="1" ref="Protactinium_e" />
+    <composite n="1" ref="Pa" />
   </material>
-  <element name="Lead_e" formula="Pb" Z="82">
+  <element name="Pb" formula="Pb" Z="82.0">
     <atom type="A" unit="g/mol" value="207.2" />
   </element>
   <material name="Lead">
     <D type="density" unit="g/cm3" value="11.342" />
-    <composite n="1" ref="Lead_e" />
+    <composite n="1" ref="Pb" />
   </material>
-  <element name="Palladium_e" formula="Pd" Z="46">
+  <element name="Pd" formula="Pd" Z="46.0">
     <atom type="A" unit="g/mol" value="106.42" />
   </element>
   <material name="Palladium">
     <D type="density" unit="g/cm3" value="12.0" />
-    <composite n="1" ref="Palladium_e" />
+    <composite n="1" ref="Pd" />
   </material>
-  <element name="Promethium_e" formula="Pm" Z="61">
+  <element name="Pm" formula="Pm" Z="61.0">
     <atom type="A" unit="g/mol" value="145.0" />
   </element>
   <material name="Promethium">
     <D type="density" unit="g/cm3" value="7.26" />
-    <composite n="1" ref="Promethium_e" />
+    <composite n="1" ref="Pm" />
   </material>
-  <element name="Polonium_e" formula="Po" Z="84">
+  <element name="Po" formula="Po" Z="84.0">
     <atom type="A" unit="g/mol" value="209.0" />
   </element>
   <material name="Polonium">
     <D type="density" unit="g/cm3" value="9.32" />
-    <composite n="1" ref="Polonium_e" />
+    <composite n="1" ref="Po" />
   </material>
-  <element name="Praseodymium_e" formula="Pr" Z="59">
+  <element name="Pr" formula="Pr" Z="59.0">
     <atom type="A" unit="g/mol" value="140.90765" />
   </element>
   <material name="Praseodymium">
     <D type="density" unit="g/cm3" value="6.77" />
-    <composite n="1" ref="Praseodymium_e" />
+    <composite n="1" ref="Pr" />
   </material>
-  <element name="Platinum_e" formula="Pt" Z="78">
+  <element name="Pt" formula="Pt" Z="78.0">
     <atom type="A" unit="g/mol" value="195.078" />
   </element>
   <material name="Platinum">
     <D type="density" unit="g/cm3" value="21.46" />
-    <composite n="1" ref="Platinum_e" />
+    <composite n="1" ref="Pt" />
   </material>
-  <element name="Plutonium_e" formula="Pu" Z="94">
+  <element name="Pu" formula="Pu" Z="94.0">
     <atom type="A" unit="g/mol" value="244.0" />
   </element>
   <material name="Plutonium">
     <D type="density" unit="g/cm3" value="19.84" />
-    <composite n="1" ref="Plutonium_e" />
+    <composite n="1" ref="Pu" />
   </material>
-  <element name="Radium_e" formula="Ra" Z="88">
+  <element name="Ra" formula="Ra" Z="88.0">
     <atom type="A" unit="g/mol" value="226.0" />
   </element>
   <material name="Radium">
     <D type="density" unit="g/cm3" value="5.0" />
-    <composite n="1" ref="Radium_e" />
+    <composite n="1" ref="Ra" />
   </material>
-  <element name="Rubidium_e" formula="Rb" Z="37">
+  <element name="Rb" formula="Rb" Z="37.0">
     <atom type="A" unit="g/mol" value="85.4678" />
   </element>
   <material name="Rubidium">
     <D type="density" unit="g/cm3" value="1.53" />
-    <composite n="1" ref="Rubidium_e" />
+    <composite n="1" ref="Rb" />
   </material>
-  <element name="Rhenium_e" formula="Re" Z="75">
+  <element name="Re" formula="Re" Z="75.0">
     <atom type="A" unit="g/mol" value="186.207" />
   </element>
   <material name="Rhenium">
     <D type="density" unit="g/cm3" value="20.8" />
-    <composite n="1" ref="Rhenium_e" />
+    <composite n="1" ref="Re" />
   </material>
-  <element name="Rutherfordium_e" formula="Rf" Z="104">
+  <element name="Rf" formula="Rf" Z="104.0">
     <atom type="A" unit="g/mol" value="261.0" />
   </element>
   <material name="Rutherfordium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Rutherfordium_e" />
+    <composite n="1" ref="Rf" />
   </material>
-  <element name="Rhodium_e" formula="Rh" Z="45">
+  <element name="Rh" formula="Rh" Z="45.0">
     <atom type="A" unit="g/mol" value="102.9055" />
   </element>
-  <material name="Rhodium">
+  <material name="densitydium">
     <D type="density" unit="g/cm3" value="12.4" />
-    <composite n="1" ref="Rhodium_e" />
+    <composite n="1" ref="Rh" />
   </material>
-  <element name="Radon_e" formula="Rn" Z="86">
+  <element name="Rn" formula="Rn" Z="86.0">
     <atom type="A" unit="g/mol" value="222.0" />
   </element>
   <material name="Radon">
     <D type="density" unit="g/cm3" value="4.4" />
-    <composite n="1" ref="Radon_e" />
+    <composite n="1" ref="Rn" />
   </material>
-  <element name="Ruthenium_e" formula="Ru" Z="44">
+  <element name="Ru" formula="Ru" Z="44.0">
     <atom type="A" unit="g/mol" value="101.07" />
   </element>
   <material name="Ruthenium">
     <D type="density" unit="g/cm3" value="12.1" />
-    <composite n="1" ref="Ruthenium_e" />
+    <composite n="1" ref="Ru" />
   </material>
-  <element name="Sulfur_e" formula="S" Z="16">
+  <element name="S" formula="S" Z="16.0">
     <atom type="A" unit="g/mol" value="32.066" />
   </element>
   <material name="Sulfur">
     <D type="density" unit="g/cm3" value="2.067" />
-    <composite n="1" ref="Sulfur_e" />
+    <composite n="1" ref="S" />
   </material>
-  <element name="Antimony_e" formula="Sb" Z="51">
+  <element name="Sb" formula="Sb" Z="51.0">
     <atom type="A" unit="g/mol" value="121.76" />
   </element>
   <material name="Antimony">
     <D type="density" unit="g/cm3" value="6.685" />
-    <composite n="1" ref="Antimony_e" />
+    <composite n="1" ref="Sb" />
   </material>
-  <element name="Scandium_e" formula="Sc" Z="21">
+  <element name="Sc" formula="Sc" Z="21.0">
     <atom type="A" unit="g/mol" value="44.95591" />
   </element>
   <material name="Scandium">
     <D type="density" unit="g/cm3" value="2.99" />
-    <composite n="1" ref="Scandium_e" />
+    <composite n="1" ref="Sc" />
   </material>
-  <element name="Selenium_e" formula="Se" Z="34">
+  <element name="Se" formula="Se" Z="34.0">
     <atom type="A" unit="g/mol" value="78.96" />
   </element>
   <material name="Selenium">
     <D type="density" unit="g/cm3" value="4.809" />
-    <composite n="1" ref="Selenium_e" />
+    <composite n="1" ref="Se" />
   </material>
-  <element name="Seaborgium_e" formula="Sg" Z="106">
+  <element name="Sg" formula="Sg" Z="106.0">
     <atom type="A" unit="g/mol" value="266.0" />
   </element>
   <material name="Seaborgium">
     <D type="density" unit="g/cm3" value="-1.0" />
-    <composite n="1" ref="Seaborgium_e" />
+    <composite n="1" ref="Sg" />
   </material>
-  <element name="Silicon_e" formula="Si" Z="14">
+  <element name="Si" formula="Si" Z="14.0">
     <atom type="A" unit="g/mol" value="28.0855" />
   </element>
   <material name="Silicon">
     <D type="density" unit="g/cm3" value="2.3296" />
-    <composite n="1" ref="Silicon_e" />
+    <composite n="1" ref="Si" />
   </material>
-  <element name="Samarium_e" formula="Sm" Z="62">
+  <element name="Sm" formula="Sm" Z="62.0">
     <atom type="A" unit="g/mol" value="150.36" />
   </element>
   <material name="Samarium">
     <D type="density" unit="g/cm3" value="7.52" />
-    <composite n="1" ref="Samarium_e" />
+    <composite n="1" ref="Sm" />
   </material>
-  <element name="Tin_e" formula="Sn" Z="50">
+  <element name="Sn" formula="Sn" Z="50.0">
     <atom type="A" unit="g/mol" value="118.71" />
   </element>
   <material name="Tin">
     <D type="density" unit="g/cm3" value="7.287" />
-    <composite n="1" ref="Tin_e" />
+    <composite n="1" ref="Sn" />
   </material>
-  <element name="Strontium_e" formula="Sr" Z="38">
+  <element name="Sr" formula="Sr" Z="38.0">
     <atom type="A" unit="g/mol" value="87.62" />
   </element>
   <material name="Strontium">
     <D type="density" unit="g/cm3" value="2.64" />
-    <composite n="1" ref="Strontium_e" />
+    <composite n="1" ref="Sr" />
   </material>
-  <element name="Tantalum_e" formula="Ta" Z="73">
+  <element name="Ta" formula="Ta" Z="73.0">
     <atom type="A" unit="g/mol" value="180.9479" />
   </element>
   <material name="Tantalum">
     <D type="density" unit="g/cm3" value="16.4" />
-    <composite n="1" ref="Tantalum_e" />
+    <composite n="1" ref="Ta" />
   </material>
-  <element name="Terbium_e" formula="Tb" Z="65">
+  <element name="Tb" formula="Tb" Z="65.0">
     <atom type="A" unit="g/mol" value="158.92534" />
   </element>
   <material name="Terbium">
     <D type="density" unit="g/cm3" value="8.23" />
-    <composite n="1" ref="Terbium_e" />
+    <composite n="1" ref="Tb" />
   </material>
-  <element name="Technetium_e" formula="Tc" Z="43">
+  <element name="Tc" formula="Tc" Z="43.0">
     <atom type="A" unit="g/mol" value="98.0" />
   </element>
   <material name="Technetium">
     <D type="density" unit="g/cm3" value="11.0" />
-    <composite n="1" ref="Technetium_e" />
+    <composite n="1" ref="Tc" />
   </material>
-  <element name="Tellurium_e" formula="Te" Z="52">
+  <element name="Te" formula="Te" Z="52.0">
     <atom type="A" unit="g/mol" value="127.6" />
   </element>
   <material name="Tellurium">
     <D type="density" unit="g/cm3" value="6.232" />
-    <composite n="1" ref="Tellurium_e" />
+    <composite n="1" ref="Te" />
   </material>
-  <element name="Thorium_e" formula="Th" Z="90">
+  <element name="Th" formula="Th" Z="90.0">
     <atom type="A" unit="g/mol" value="232.0381" />
   </element>
   <material name="Thorium">
     <D type="density" unit="g/cm3" value="11.72" />
-    <composite n="1" ref="Thorium_e" />
+    <composite n="1" ref="Th" />
   </material>
-  <element name="Titanium_e" formula="Ti" Z="22">
+  <element name="Ti" formula="Ti" Z="22.0">
     <atom type="A" unit="g/mol" value="47.867" />
   </element>
   <material name="Titanium">
     <D type="density" unit="g/cm3" value="4.5" />
-    <composite n="1" ref="Titanium_e" />
+    <composite n="1" ref="Ti" />
   </material>
-  <element name="Thallium_e" formula="Tl" Z="81">
+  <element name="Tl" formula="Tl" Z="81.0">
     <atom type="A" unit="g/mol" value="204.3833" />
   </element>
   <material name="Thallium">
     <D type="density" unit="g/cm3" value="11.8" />
-    <composite n="1" ref="Thallium_e" />
+    <composite n="1" ref="Tl" />
   </material>
-  <element name="Thulium_e" formula="Tm" Z="69">
+  <element name="Tm" formula="Tm" Z="69.0">
     <atom type="A" unit="g/mol" value="168.93421" />
   </element>
   <material name="Thulium">
     <D type="density" unit="g/cm3" value="9.32" />
-    <composite n="1" ref="Thulium_e" />
+    <composite n="1" ref="Tm" />
   </material>
-  <element name="Uranium_e" formula="U" Z="92">
+  <element name="U" formula="U" Z="92.0">
     <atom type="A" unit="g/mol" value="238.0289" />
   </element>
   <material name="Uranium">
     <D type="density" unit="g/cm3" value="18.95" />
-    <composite n="1" ref="Uranium_e" />
+    <composite n="1" ref="U" />
   </material>
-  <element name="Vanadium_e" formula="V" Z="23">
+  <element name="V" formula="V" Z="23.0">
     <atom type="A" unit="g/mol" value="50.9415" />
   </element>
   <material name="Vanadium">
     <D type="density" unit="g/cm3" value="6.0" />
-    <composite n="1" ref="Vanadium_e" />
+    <composite n="1" ref="V" />
   </material>
-  <element name="Tungsten_e" formula="W" Z="74">
+  <element name="W" formula="W" Z="74.0">
     <atom type="A" unit="g/mol" value="183.84" />
   </element>
   <material name="Tungsten">
     <D type="density" unit="g/cm3" value="19.3" />
-    <composite n="1" ref="Tungsten_e" />
+    <composite n="1" ref="W" />
   </material>
-  <element name="Xenon_e" formula="Xe" Z="54">
+  <element name="Xe" formula="Xe" Z="54.0">
     <atom type="A" unit="g/mol" value="131.29" />
   </element>
   <material name="Xenon">
     <D type="density" unit="g/cm3" value="2.953" />
-    <composite n="1" ref="Xenon_e" />
+    <composite n="1" ref="Xe" />
   </material>
-  <element name="Yttrium_e" formula="Y" Z="39">
+  <element name="Y" formula="Y" Z="39.0">
     <atom type="A" unit="g/mol" value="88.90585" />
   </element>
   <material name="Yttrium">
     <D type="density" unit="g/cm3" value="4.47" />
-    <composite n="1" ref="Yttrium_e" />
+    <composite n="1" ref="Y" />
   </material>
-  <element name="Ytterbium_e" formula="Yb" Z="70">
+  <element name="Yb" formula="Yb" Z="70.0">
     <atom type="A" unit="g/mol" value="173.04" />
   </element>
   <material name="Ytterbium">
     <D type="density" unit="g/cm3" value="6.9" />
-    <composite n="1" ref="Ytterbium_e" />
+    <composite n="1" ref="Yb" />
   </material>
-  <element name="Zinc_e" formula="Zn" Z="30">
+  <element name="Zn" formula="Zn" Z="30.0">
     <atom type="A" unit="g/mol" value="65.39" />
   </element>
   <material name="Zinc">
     <D type="density" unit="g/cm3" value="7.134" />
-    <composite n="1" ref="Zinc_e" />
+    <composite n="1" ref="Zn" />
   </material>
-  <element name="Zirconium_e" formula="Zr" Z="40">
+  <element name="Zr" formula="Zr" Z="40.0">
     <atom type="A" unit="g/mol" value="91.224" />
   </element>
   <material name="Zirconium">
     <D type="density" unit="g/cm3" value="6.52" />
-    <composite n="1" ref="Zirconium_e" />
+    <composite n="1" ref="Zr" />
   </material>
-  <element name="vacuum_e" formula="vacuum" Z="0">
+  <element name="vacuum" formula="vacuum" Z="0.0">
     <atom type="A" unit="g/mol" value="0.0" />
[truncated at 1000 lines; 8 more skipped]

GeomConverter/src/org/lcsim/material
materials.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- materials.xml	9 Jun 2005 17:35:21 -0000	1.2
+++ materials.xml	1 Jul 2005 00:05:59 -0000	1.3
@@ -2,65 +2,65 @@
 <materials>
   <material name="Air">
     <D type="density" unit="g/cm3" value="0.0012"/>
-    <fraction n="0.7803" ref="Nitrogen_e"/>
-    <fraction n="0.2103" ref="Oxygen_e"/>
-    <fraction n="0.0094" ref="Argon_e"/>
+    <fraction n="0.7803" ref="N"/>
+    <fraction n="0.2103" ref="O"/>
+    <fraction n="0.0094" ref="Ar"/>
   </material>
 
   <material name="Epoxy">
     <D type="density" value="1.3" unit="g/cm3"/>
-    <composite n="44" ref="Hydrogen_e"/>
-    <composite n="15" ref="Carbon_e"/>
-    <composite n="7" ref="Oxygen_e"/>
+    <composite n="44" ref="H"/>
+    <composite n="15" ref="C"/>
+    <composite n="7" ref="O"/>
     </material>
 
     <material name="Quartz">
       <D type="density" value="2.2" unit="g/cm3"/>
-      <composite n="1" ref="Silicon_e"/>
-      <composite n="2" ref="Oxygen_e"/>
+      <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="Chlorine_e"/>
+      <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="Carbon_e"/>
-	<composite n="21" ref="Hydrogen_e"/>
+	<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="Iron_e"/>
-      <fraction n=".002" ref="Carbon_e"/>
+      <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="Silicon_e"/>
-      <composite n="2" ref="Oxygen_e"/>
+      <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="Boron_e"/>
-      <composite n="3" ref="Oxygen_e"/>
+      <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="Sodium_e"/>
-      <composite n="1" ref="Oxygen_e"/>
+      <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="Aluminum_e"/>
-      <composite n="3" ref="Oxygen_e"/>
+      <composite n="2" ref="Al"/>
+      <composite n="3" ref="O"/>
     </material>
 
     <material name="PyrexGlass">
@@ -73,23 +73,23 @@
 
       <material name="CarbonFiber">
 	<D type="density" value="1.5" unit="g/cm3"/>
-	<fraction n="0.65" ref="Carbon_e"/>
+	<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="Carbon_e"/>
-	<composite n="13" ref="Hydrogen_e"/>
-	<composite n="2" ref="Oxygen_e"/>
-	<composite n="1" ref="Nitrogen_e"/>
+	<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="Carbon_e"/>
-	<composite n="239" ref="Hydrogen_e"/>
-	<composite n="381" ref="Fluorine_e"/>
+	<composite n="209" ref="C"/>
+	<composite n="239" ref="H"/>
+	<composite n="381" ref="Fl"/>
       </material>
 
       <material name="PolystyreneFoam">
CVSspam 0.2.8