| Commit in LCDetectors/detectors on MAIN |
| sidaug05_20mr/compact.xml | +6 | -6 | 1.1 -> 1.2 |
| sidaug05_4tesla/compact.xml | +6 | -6 | 1.1 -> 1.2 |
| sidaug05_scinthcal/compact.xml | +6 | -6 | 1.2 -> 1.3 |
| +18 | -18 | |
3 modified files
LCDetectors/detectors/sidaug05_20mr
diff -u -r1.1 -r1.2
--- compact.xml 25 Jul 2005 02:18:21 -0000 1.1
+++ compact.xml 28 Jul 2005 22:32:09 -0000 1.2
@@ -27,7 +27,7 @@
<constant name="world_z" value="world_side" />
<!-- tracking region -->
- <constant name="tracking_region_radius" value="125.5*cm"/>
+ <constant name="tracking_region_radius" value="126.5*cm"/>
<constant name="tracking_region_zmax" value="167.9*cm"/>
</define>
@@ -66,14 +66,14 @@
<detector id="1" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
<zplane rmin="1.3*cm" rmax="1.399*cm" z="-6.251*cm"/>
</detector>
<detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
<zplane rmin="1.3*cm" rmax="1.399*cm" z="6.251*cm"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
</detector>
<!-- Vertex Detector -->
@@ -279,7 +279,7 @@
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
</layer>
- <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "125.300*cm">
+ <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "126.300*cm">
<slice material = "CarbonFiber" thickness = "0.039*cm" />
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
@@ -386,7 +386,7 @@
<layer id="4" inner_r = "96.800*cm" inner_z = "131.7*cm" outer_r = "119.300*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
- <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "127.0*cm">
+ <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
</detector>
@@ -429,7 +429,7 @@
</detector>
<detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
- <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
+ <dimensions inner_r = "20.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
<slice material = "G10" thickness = "0.068*cm" />
LCDetectors/detectors/sidaug05_4tesla
diff -u -r1.1 -r1.2
--- compact.xml 25 Jul 2005 02:19:43 -0000 1.1
+++ compact.xml 28 Jul 2005 22:32:09 -0000 1.2
@@ -27,7 +27,7 @@
<constant name="world_z" value="world_side" />
<!-- tracking region -->
- <constant name="tracking_region_radius" value="125.5*cm"/>
+ <constant name="tracking_region_radius" value="126.5*cm"/>
<constant name="tracking_region_zmax" value="167.9*cm"/>
</define>
@@ -66,14 +66,14 @@
<detector id="1" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
<zplane rmin="1.3*cm" rmax="1.399*cm" z="-6.251*cm"/>
</detector>
<detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
<zplane rmin="1.3*cm" rmax="1.399*cm" z="6.251*cm"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
</detector>
<!-- Vertex Detector -->
@@ -279,7 +279,7 @@
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
</layer>
- <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "125.300*cm">
+ <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "126.300*cm">
<slice material = "CarbonFiber" thickness = "0.039*cm" />
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
@@ -386,7 +386,7 @@
<layer id="4" inner_r = "96.800*cm" inner_z = "131.7*cm" outer_r = "119.300*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
- <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "127.0*cm">
+ <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
</detector>
@@ -429,7 +429,7 @@
</detector>
<detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
- <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
+ <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
<slice material = "G10" thickness = "0.068*cm" />
LCDetectors/detectors/sidaug05_scinthcal
diff -u -r1.2 -r1.3
--- compact.xml 25 Jul 2005 03:39:06 -0000 1.2
+++ compact.xml 28 Jul 2005 22:32:09 -0000 1.3
@@ -27,7 +27,7 @@
<constant name="world_z" value="world_side" />
<!-- tracking region -->
- <constant name="tracking_region_radius" value="125.5*cm"/>
+ <constant name="tracking_region_radius" value="126.5*cm"/>
<constant name="tracking_region_zmax" value="167.9*cm"/>
</define>
@@ -66,14 +66,14 @@
<detector id="1" name="VXDserviceZforward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="-tracking_region_zmax" />
<zplane rmin="1.3*cm" rmax="1.399*cm" z="-6.251*cm"/>
</detector>
<detector id="0" name="VXDserviceZbackward" type="PolyconeSupport" insideTrackingVolume="true">
<material name="G10"/>
<zplane rmin="1.3*cm" rmax="1.399*cm" z="6.251*cm"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.3)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
+ <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3990)" z="tracking_region_zmax" />
</detector>
<!-- Vertex Detector -->
@@ -279,7 +279,7 @@
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
</layer>
- <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "125.300*cm">
+ <layer id="5" inner_r = "18.9*cm" inner_z = "162.0*cm" outer_r = "126.300*cm">
<slice material = "CarbonFiber" thickness = "0.039*cm" />
<slice material = "Rohacell31" thickness = "2.5*cm" />
<slice material = "CarbonFiber" thickness = "0.039*cm" />
@@ -386,7 +386,7 @@
<layer id="4" inner_r = "96.800*cm" inner_z = "131.7*cm" outer_r = "119.300*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
- <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "127.0*cm">
+ <layer id="5" inner_r = "119.300*cm" inner_z = "161.7*cm" outer_r = "126.5*cm">
<slice material = "CarbonFiber" thickness = "0.15*cm" />
</layer>
</detector>
@@ -429,7 +429,7 @@
</detector>
<detector id="6" name="EMEndcap" reflect="true" type="CylindricalEndcapCalorimeter" readout="EcalEndcapHits">
- <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "125.0*cm" />
+ <dimensions inner_r = "26.0*cm" inner_z = "168.0*cm" outer_r = "126.5*cm" />
<layer repeat="30" >
<slice material = "Tungsten" thickness = "0.25*cm" />
<slice material = "G10" thickness = "0.068*cm" />
CVSspam 0.2.8
