Commit in lcsim/src/org/lcsim/detector/sdjan03 on MAIN
compact.xml+21-791.5 -> 1.6
Change reference method and take out elements and their derived materials.  Fixed test failures reported by Norman.

lcsim/src/org/lcsim/detector/sdjan03
compact.xml 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- compact.xml	21 Jun 2005 22:20:19 -0000	1.5
+++ compact.xml	1 Jul 2005 21:05:26 -0000	1.6
@@ -44,140 +44,82 @@
 
   <materials>
 
-      <!-- elements -->
-      <element name="Aluminum_e" formula="Al" Z="13.0">
-	<atom type="A" unit="g/mole" value="26.98" />
-      </element>
-
-      <element name="Argon_e" Z="18.0" N="40" >
-	<atom type="A" unit="g/mol" value="39.9480" />
-      </element>
-
-      <element name="Beryllium_e" formula="Be" Z="4.0">
-	<atom type="A" unit="g/mol" value="9.012182" />
-      </element>
-
-      <element name="Bromine_e" formula="Br" Z="35.">
-	<atom value="79.905"/>
-      </element>
-
-      <element name="Carbon_e" formula="C" Z="6.">
-	<atom value="12.01" />
-      </element>
-
-      <element name="Chlorine_e" formula="Cl" Z="17.">
-	<atom value="35.45" />
-      </element>
-
-      <element name="Copper_e" formula="Cu" Z="29.">
-	<atom value="63.546" />
-      </element>
-
-      <element name="Hydrogen_e" formula="H" Z="1.">
-	<atom value="1.01" />
-      </element>
-
-      <element name="Iron_e" formula="Fe" Z="26.">
-	<atom value="55.85" />
-      </element>
-
-      <element  name="Nitrogen_e"  Z="7.0"  N="14" >
-	<atom type="A" unit="g/mol" value=" 14.0100" />
-      </element>
-
-      <element  name="Oxygen_e"  Z="8.0"  N="16" >
-	<atom type="A" unit="g/mol" value=" 16.0000" />
-      </element>
-
-      <element name="Silicon_e" formula="Si" Z="14.">
-	<atom value="28.09" />
-      </element>
-
-      <element name="Tungsten_e" formula="W" Z="74.">
-	<atom value="183.84" />
-      </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"/>
+	<fraction n="0.7803"  ref="N"/>
+	<fraction n="0.2103"  ref="O"/>
+	<fraction n="0.0094"  ref="Ar"/>
       </material>
 
       <material name="Aluminum">
 	<D type="density" unit="g/cm3" value="2.70" />
-	<composite n="1" ref="Aluminum_e" />
+	<composite n="1" ref="Al" />
       </material>
 
       <material name="Beryllium">
 	<D type="density" unit="g/cm3" value="1.848" />
-	<composite n="1" ref="Beryllium_e" />
+	<composite n="1" ref="Be" />
       </material>
 
       <!-- so can easily replace references 
 	   with something more realistic later -->
       <material  name="MuonAir"  >
 	<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="Copper">
 	<D type="density" value="8.96" unit="g/cm3"/>
-	<composite n="1" ref="Copper_e"/>
+	<composite n="1" ref="Cu"/>
       </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="Iron">
 	<D type="density" value="7.87" unit="g/cm3" />
-	<composite n="1" ref="Iron_e" />
+	<composite n="1" ref="Fe" />
       </material>
 
       <!-- based on Mokka's generic polystyrene 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>
 
       <!-- SS def taken from examples/tbeam/global_materials.inc, Steel235 -->
       <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="Tungsten">
-	<D type="density" value="19.3" unit="g/cm3"/>
-	<composite n="1" ref="Tungsten_e" />
-      </material>
-      
   </materials>
   
   <detectors>
CVSspam 0.2.8