Print

Print


Commit in GeomConverter/test/org/lcsim/material on MAIN
test.xml+51-461.1 -> 1.2


GeomConverter/test/org/lcsim/material
test.xml 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- test.xml	28 Jun 2005 21:34:55 -0000	1.1
+++ test.xml	1 Jul 2005 00:11:00 -0000	1.2
@@ -3,11 +3,17 @@
 <materials>
 
       <!-- elements -->
-      <element name="Aluminum_e" formula="Al" Z="13.0">
+      <element name="Al" formula="Al" Z="13.0">
 	<atom type="A" unit="g/mole" value="26.98" />
       </element>
+      
+      <material name="Aluminum">
+	<D type="density" unit="g/cm3" value="2.70" />
+	<composite n="1" ref="Al" />
+      </material>
 
-      <element name="Argon_e" Z="18.0" N="40" >
+      <!--
+      <element name="Ar" Z="18.0" N="40" >
 	<atom type="A" unit="g/mol" value="39.9480" />
       </element>
 
@@ -19,11 +25,11 @@
 	<atom value="79.905"/>
       </element>
 
-      <element name="Boron_e" formula="B" Z="5.">
+      <element name="B" formula="B" Z="5.">
 	<atom value="10.811"/>
       </element>
       
-      <element name="Carbon_e" formula="C" Z="6.">
+      <element name="C" formula="C" Z="6.">
 	<atom value="12.01" />
       </element>
       
@@ -31,31 +37,31 @@
 	<atom value="18.998" />
       </element>    
 
-      <element name="Chlorine_e" formula="Cl" Z="17.">
+      <element name="Cl" formula="Cl" Z="17.">
 	<atom value="35.45" />
       </element>
 
-      <element name="Hydrogen_e" formula="H" Z="1.">
+      <element name="H" formula="H" Z="1.">
 	<atom value="1.01" />
       </element>
 
-      <element name="Iron_e" formula="Fe" Z="26.">
+      <element name="Fe" formula="Fe" Z="26.">
 	<atom value="55.85" />
       </element>
 
-      <element  name="Nitrogen_e"  Z="7.0"  N="14" >
+      <element  name="N"  Z="7.0"  N="14" >
 	<atom type="A" unit="g/mol" value=" 14.0100" />
       </element>
 
-      <element  name="Oxygen_e"  Z="8.0"  N="16" >
+      <element  name="O"  Z="8.0"  N="16" >
 	<atom type="A" unit="g/mol" value=" 16.0000" />
       </element>
 
-      <element name="Silicon_e" formula="Si" Z="14.">
+      <element name="Si" formula="Si" Z="14.">
 	<atom value="28.09" />
       </element>
 
-      <element name="Sodium_e" formula="Na" Z="11.">
+      <element name="Na" formula="Na" Z="11.">
 	<atom value="22.989770" />
       </element>
       
@@ -66,19 +72,17 @@
       <element name="Titanium_e" formula="Ti" Z="22.">
 	<atom value="47.867" />
       </element>
+      -->
 
       <!-- 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"/>
-      </material>
-
-      <material name="Aluminum">
-	<D type="density" unit="g/cm3" value="2.70" />
-	<composite n="1" ref="Aluminum_e" />
+	<fraction n="0.7803"  ref="N"/>
+	<fraction n="0.2103"  ref="O"/>
+	<fraction n="0.0094"  ref="Ar"/>
       </material>
+     
 
       <material name="Beryllium">
 	<D type="density" unit="g/cm3" value="1.848" />
@@ -87,38 +91,38 @@
 
       <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="Iron">
 	<D type="density" value="7.87" unit="g/cm3" />
-	<composite n="1" ref="Iron_e" />
+	<composite n="1" ref="Fe" />
       </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="Silicon">
 	<D type="density" value="2.33" unit="g/cm3" />
-	<composite n="1" ref="Silicon_e" />
+	<composite n="1" ref="Si" />
       </material>
 
       <material name="Tungsten">
@@ -133,32 +137,32 @@
       
      <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">
@@ -171,22 +175,22 @@
       
       <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="RPCGas">
        <D type="density" value="0.0037" unit="g/cm3"/>
-	<composite n="209"  ref="Carbon_e" />
-	<composite n="239" ref="Hydrogen_e" />
+	<composite n="209"  ref="C" />
+	<composite n="239" ref="H" />
 	<composite n="381"  ref="Fluorine_e" />
       </material> 
       
@@ -194,5 +198,6 @@
        <D type="density" value="0.0056" unit="g/cm3"/>
 	<fraction n="1.0"  ref="Polystyrene" />
       </material> 
+      -->
          
 </materials>
CVSspam 0.2.8