4 modified files
GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.5 -r1.6
--- ForwardDetectorTest.xml 21 Jun 2005 22:07:01 -0000 1.5
+++ ForwardDetectorTest.xml 1 Jul 2005 00:13:30 -0000 1.6
@@ -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>
GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.2 -r1.3
--- CylindricalCalorimeterTest.xml 21 Jun 2005 22:07:01 -0000 1.2
+++ CylindricalCalorimeterTest.xml 1 Jul 2005 00:13:30 -0000 1.3
@@ -45,9 +45,9 @@
<dimensions inner_r = "127.0*cm" outer_z = "179.5*cm" />
<layer repeat="30">
<slice material = "Tungsten" thickness = "0.25*cm" />
- <slice material = "G10" thickness = "0.068*cm" />
+ <slice material = "Nitrogen" thickness = "0.068*cm" />
<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
- <slice material = "Air" thickness = "0.025*cm" />
+ <slice material = "Oxygen" thickness = "0.025*cm" />
</layer>
</detector>
@@ -55,9 +55,9 @@
<dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
- <slice material = "G10" thickness = "0.068*cm" />
+ <slice material = "Nitrogen" thickness = "0.068*cm" />
<slice material = "Silicon" thickness = "0.032*cm" sensitive = "yes" />
- <slice material = "Air" thickness = "0.025*cm" />
+ <slice material = "Oxygen" thickness = "0.025*cm" />
</layer>
</detector>
</detectors>
@@ -78,6 +78,6 @@
inner_field="5.0"
outer_field="-0.6"
zmax="1000"
- outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/> <!-- SolenoidCoilBarrel inner_radius + Al support + Air gap + half coil-->
+ outer_radius="(221.0+ 5.0 + 17.5 + 40./2.)*cm"/> <!-- SolenoidCoilBarrel inner_radius + Al support + Oxygen gap + half coil-->
</fields>
</lccdd>
GeomConverter/test/org/lcsim/geometry/compact
diff -u -r1.10 -r1.11
--- sdjan03_compact.xml 21 Jun 2005 22:07:00 -0000 1.10
+++ sdjan03_compact.xml 1 Jul 2005 00:13:30 -0000 1.11
@@ -46,36 +46,36 @@
<!-- 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>
<!-- 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="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>
@@ -83,15 +83,15 @@
<!-- 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>
GeomConverter/test/org/lcsim/geometry/compact
diff -u -r1.3 -r1.4
--- npcyl.xml 21 Jun 2005 22:07:00 -0000 1.3
+++ npcyl.xml 1 Jul 2005 00:13:30 -0000 1.4
@@ -37,24 +37,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
