LCDetectors/detectors/sid02

diff -u -r1.20 -r1.21
--- compact.xml	29 Aug 2008 20:39:18 -0000	1.20
+++ compact.xml	29 Aug 2008 22:00:18 -0000	1.21
@@ -8,7 +8,7 @@

         author="Norman Graf"
         url="http://confluence.slac.stanford.edu/display/ilc/sid02"
         status="development"

-        version="$Id: compact.xml,v 1.20 2008/08/29 20:39:18 ngraf Exp $">

+        version="$Id: compact.xml,v 1.21 2008/08/29 22:00:18 ngraf Exp $">

         <comment>The compact format for the Silicon Detector v02 to be used in the LOI 080826</comment>
     </info>
 

@@ -40,12 +40,14 @@

         <constant name="SolenoidBarrelSteelThickness" value="6.0*cm"/>
         <constant name="SolenoidBarrelOuterAirgapThickness" value="20.0*cm"/>
         <constant name="SolenoidBarrelOuterCryostatThickness" value="3.0*cm"/>

-        <constant name="SolenoidEndcapCryostatThickness" value="6.0*cm"/>

+        <constant name="SolenoidEndcapCryostatThickness" value="6.0*cm"/>       

     
         <constant name="SolenoidBarrelConductorInnerRadius" value="SolenoidBarrelInnerRadius+SolenoidBarrelInnerCryostatThickness+SolenoidBarrelInnerAirgapThickness"/>
         <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="SolenoidBarrelConductorInnerRadius+SolenoidBarrelAlConductorThickness+SolenoidBarrelSteelThickness"/>
         <constant name="SolenoidBarrelOuterRadius" value="SolenoidBarrelOuterCryostatInnerRadius+SolenoidBarrelOuterAirgapThickness+SolenoidBarrelOuterCryostatThickness"/>

-         

+      
+        <constant name="SolenoidalFieldRadius" value="(SolenoidBarrelConductorInnerRadius+SolenoidBarrelAlConductorThickness/2.)"/>
+    

         <!-- muon system -->
         <constant name="MuonBarrelStayClear" value="1.0*cm"/>
         <constant name="MuonBarrelOuterZ" value="SolenoidBarrelOuterZ+SolenoidEndcapCryostatThickness"/>

@@ -72,7 +74,7 @@

             <fraction n="0.044" ref="Ni"/>
             <fraction n="0.006" ref="Fe"/>
         </material>   

-         <material name="BoratedPolyethylene5">

+        <material name="BoratedPolyethylene5">

             <D value="0.93" unit="g/cm3"/>
             <fraction n="0.612" ref="C"/>
             <fraction n="0.222" ref="O"/>

@@ -942,7 +944,7 @@

         <field type="Solenoid" name="GlobalSolenoid"
         inner_field="5.0"
         outer_field="-0.6"

-        zmax="1000"
-        outer_radius="(250.0+ 5.0 + 17.5 + 40./2.)*cm"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Air gap + half coil-->

+        zmax="1000*cm"
+        outer_radius="SolenoidalFieldRadius"/>  <!-- SolenoidCoilBarrel inner_radius + Al support + Air gap + half coil-->

     </fields>
 </lccdd>