7 modified files
LCDetectors/detectors/sdfeb05
diff -u -r1.7 -r1.8
--- compact.xml 21 Jun 2005 22:06:04 -0000 1.7
+++ compact.xml 5 Jul 2005 20:19:22 -0000 1.8
@@ -35,27 +35,27 @@
<!-- 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>
@@ -63,32 +63,32 @@
<!-- 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="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">
@@ -101,23 +101,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="RPCGas">
<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="F" />
</material>
<material name="PolystyreneFoam">
LCDetectors/detectors/sdjan03
diff -u -r1.7 -r1.8
--- compact.xml 21 Jun 2005 22:06:04 -0000 1.7
+++ compact.xml 5 Jul 2005 20:19:22 -0000 1.8
@@ -46,48 +46,48 @@
<!-- 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="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>
<!-- 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>
</materials>
LCDetectors/detectors/sidmay05
diff -u -r1.12 -r1.13
--- compact.xml 21 Jun 2005 22:06:04 -0000 1.12
+++ compact.xml 5 Jul 2005 20:19:23 -0000 1.13
@@ -39,65 +39,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">
@@ -110,23 +110,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="RPCGas">
<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="F" />
</material>
<material name="PolystyreneFoam">
LCDetectors/detectors/sidmay05_20mr
diff -u -r1.1 -r1.2
--- compact.xml 30 Jun 2005 18:55:17 -0000 1.1
+++ compact.xml 5 Jul 2005 20:19:23 -0000 1.2
@@ -39,65 +39,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">
@@ -110,23 +110,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="RPCGas">
<D type="density" value="0.0045" 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="F" />
</material>
<material name="PolystyreneFoam">
LCDetectors/detectors/sidmay05_np
diff -u -r1.6 -r1.7
--- compact.xml 22 Jun 2005 20:11:59 -0000 1.6
+++ compact.xml 5 Jul 2005 20:19:24 -0000 1.7
@@ -37,9 +37,9 @@
<materials>
<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="381" ref="Fluorine_e" />
+ <composite n="209" ref="C" />
+ <composite n="239" ref="H" />
+ <composite n="381" ref="F" />
</material>
</materials>
LCDetectors/detectors/sidmay05_scinthcal
diff -u -r1.10 -r1.11
--- compact.xml 21 Jun 2005 22:06:05 -0000 1.10
+++ compact.xml 5 Jul 2005 20:19:24 -0000 1.11
@@ -33,65 +33,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">
@@ -104,23 +104,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="RPCGas">
<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="F" />
</material>
<material name="PolystyreneFoam">
LCDetectors/detectors/template/geometry/compact
diff -u -r1.3 -r1.4
--- compact.xml 30 Mar 2005 23:49:16 -0000 1.3
+++ compact.xml 5 Jul 2005 20:19:25 -0000 1.4
@@ -38,24 +38,24 @@
<materials>
<!-- elements -->
- <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>
- <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>
<!-- 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>
</materials>
CVSspam 0.2.8