GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.1.2.1 -r1.1.2.2
--- PolyconeSupportTest.java 31 Oct 2005 19:02:59 -0000 1.1.2.1
+++ PolyconeSupportTest.java 31 Oct 2005 19:20:15 -0000 1.1.2.2
@@ -43,13 +43,19 @@
PolyconeSupport bp = (PolyconeSupport) det.getSubdetectors().get("BeamPipe");
assert(bp != null);
- assert(bp.getNumberOfZPlanes() == 6);
+ assert(bp.getNumberOfZPlanes() == 4);
for(PolyconeSupport.ZPlane zp : bp.getZPlanes())
{
assert(zp.getRMin() != 0);
assert(zp.getRMax() != 0);
assert(zp.getZ() != 0);
+
+ /* thickness of this zplane should be 1 cm == 10 mm */
+ if (zp.getRMin() == 12.34)
+ {
+ assert(zp.getRMax() - zp.getRMin() == 10.0);
+ }
}
}
}
\ No newline at end of file
GeomConverter/test/org/lcsim/geometry/subdetector
diff -u -r1.1.2.1 -r1.1.2.2
--- PolyconeSupportTest.xml 31 Oct 2005 19:02:59 -0000 1.1.2.1
+++ PolyconeSupportTest.xml 31 Oct 2005 19:20:15 -0000 1.1.2.2
@@ -23,10 +23,6 @@
<constant name="world_y" value="world_side" />
<constant name="world_z" value="world_side" />
- <!-- tracking region -->
- <constant name="tracking_region_radius" value="126.5*cm"/>
- <constant name="tracking_region_zmax" value="167.9*cm"/>
-
</define>
<materials>
@@ -38,24 +34,10 @@
<detector id="0" name="BeamPipe" type="PolyconeSupport" insideTrackingVolume="true">
<material name="Beryllium"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="-tracking_region_zmax" />
<zplane rmin="1.2*cm" rmax="1.3*cm" z="-6.251*cm"/>
<zplane rmin="1.2*cm" rmax="1.240*cm" z="-6.25*cm"/>
- <zplane rmin="1.2*cm" rmax="1.240*cm" z="6.25*cm" />
+ <zplane rmin="1.234*cm" rmax="2.234*cm" z="6.25*cm" />
<zplane rmin="1.2*cm" rmax="1.3*cm" z="6.251*cm" />
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.3)" z="tracking_region_zmax" />
- </detector>
-
- <!-- BeamPipe Liner -->
-
- <detector id="0" name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true">
- <material name="Titanium"/>
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" z="-tracking_region_zmax" />
- <zplane rmin="1.1925*cm" rmax="1.2*cm" z="-6.251*cm"/>
- <zplane rmin="1.1975*cm" rmax="1.20*cm" z="-6.25*cm" />
- <zplane rmin="1.1975*cm" rmax="1.20*cm" z="6.25*cm" />
- <zplane rmin="1.1925*cm" rmax="1.2*cm" z="6.251*cm" />
- <zplane rmin = "((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.1925)" rmax="((tracking_region_zmax-6.25)*(8.96-1.2)/(185.-6.25)+1.2)" z="tracking_region_zmax" />
</detector>
</detectors>