LCDetectors/detectors/sidloi
diff -u -r1.5 -r1.6
--- compact.xml 4 Feb 2009 18:50:22 -0000 1.5
+++ compact.xml 4 Feb 2009 19:42:26 -0000 1.6
@@ -20,6 +20,27 @@
<constant name="VXD_CF_sensor" value="0.026*cm"/>
<constant name="VXD_CF_support" value="0.05*cm"/>
<constant name="bp_cone_slope" value="(8.96-1.20)/(185-6.25)"/>
+
+ <!-- solenoid -->
+ <constant name="SolenoidBarrelInnerRadius" value="259.1*cm"/>
+ <constant name="SolenoidBarrelOuterZ" value="293.3*cm"/> <!-- outer cryostat z - 5cm for cryostat thickness -->
+
+ <constant name="SolenoidBarrelInnerCryostatThickness" value="3.0*cm"/>
+ <constant name="SolenoidBarrelInnerAirgapThickness" value="11.0*cm"/>
+ <constant name="SolenoidBarrelAlConductorThickness" value="38.4*cm"/>
+ <constant name="SolenoidBarrelQuenchbackThickness" value="5.0*cm"/>
+ <constant name="SolenoidBarrelOuterAirgapThickness" value="18.7*cm"/>
+ <constant name="SolenoidBarrelOuterCryostatThickness" value="4.0*cm"/>
+ <constant name="SolenoidEndcapCryostatThickness" value="5.0*cm"/>
+ <constant name="SolenoidEndcapAirgapThickness" value="19.0*cm"/>
+
+ <constant name="SolenoidBarrelConductorInnerRadius" value="SolenoidBarrelInnerRadius+SolenoidBarrelInnerCryostatThickness+SolenoidBarrelInnerAirgapThickness"/>
+ <constant name="SolenoidBarrelOuterCryostatInnerRadius" value="SolenoidBarrelConductorInnerRadius+SolenoidBarrelAlConductorThickness+SolenoidBarrelQuenchbackThickness"/>
+ <constant name="SolenoidBarrelOuterRadius" value="SolenoidBarrelOuterCryostatInnerRadius+SolenoidBarrelOuterAirgapThickness+SolenoidBarrelOuterCryostatThickness"/>
+ <constant name="SolenoidCoilOuterZ" value="SolenoidBarrelOuterZ-SolenoidEndcapCryostatThickness-SolenoidEndcapAirgapThickness"/>
+
+ <constant name="SolenoidalFieldRadius" value="(SolenoidBarrelConductorInnerRadius+SolenoidBarrelAlConductorThickness/2.)"/>
+
</define>
<materials>
<material name="TungstenDens23">
@@ -901,13 +922,32 @@
</layer>
</detector>
- <!-- TODO: Define real internal geometry. -->
+ <!-- Solenoid -->
+
<detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
- <layer id="1" inner_r="2591.0" outer_z="2983.0">
- <slice material="Steel235" thickness="801.0"/>
+ <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ">
+ <slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
+ <slice material="Vacuum" thickness="SolenoidBarrelInnerAirgapThickness" />
+ </layer>
+ <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="SolenoidCoilOuterZ">
+ <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
+ <slice material="Aluminum" thickness="SolenoidBarrelQuenchbackThickness" />
+ </layer>
+ <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ">
+ <slice material="Vacuum" thickness="SolenoidBarrelOuterAirgapThickness" />
+ <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
</layer>
</detector>
+ <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
+ <layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius">
+ <slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
+ </layer>
+ </detector>
+
+
+ <!-- Muon System -->
+
<detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter" readout="MuonBarrelHits">
<!-- TODO: Check the z value. -->
<dimensions numsides="8" rmin="3442.0" z="3018.0 * 2"/>
@@ -1069,28 +1109,6 @@
<rotation x="0.0" y="0.0070" z="0.0" />
</detector>
-<!--
- <detector id="0" name="SolenoidCoilBarrel" type="MultiLayerTracker" insideTrackingVolume="false">
- <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ">
- <slice material="Steel235" thickness="SolenoidBarrelInnerCryostatThickness" />
- <slice material="Air" thickness="SolenoidBarrelInnerAirgapThickness" />
- </layer>
- <layer id="2" inner_r="SolenoidBarrelConductorInnerRadius" outer_z="262.5*cm">
- <slice material="Aluminum" thickness="SolenoidBarrelAlConductorThickness" />
- <slice material="Steel235" thickness="SolenoidBarrelSteelThickness" />
- </layer>
- <layer id="3" inner_r="SolenoidBarrelOuterCryostatInnerRadius" outer_z="SolenoidBarrelOuterZ">
- <slice material="Air" thickness="SolenoidBarrelOuterAirgapThickness" />
- <slice material="Steel235" thickness="SolenoidBarrelOuterCryostatThickness" />
- </layer>
- </detector>
-
- <detector id="0" name="SolenoidCoilEnds" type="DiskTracker" reflect="true" insideTrackingVolume="false">
- <layer id="1" inner_r="SolenoidBarrelInnerRadius" inner_z="SolenoidBarrelOuterZ" outer_r="SolenoidBarrelOuterRadius">
- <slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
- </layer>
- </detector>
--->
<detector id="15" name="SiTrackerForward" type="SiTrackerEndcap" readout="SiTrackerForwardHits">
<module name="SiTrackerForwardModule">