GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.14 -r1.15
--- PolyhedraEndcapCalorimeter.java 30 Oct 2006 06:20:08 -0000 1.14
+++ PolyhedraEndcapCalorimeter.java 30 Oct 2006 07:39:03 -0000 1.15
@@ -36,10 +36,10 @@
private Element node;
// 25 micron tolerance for staves and layers.
- //double tolerance=0.025;
+ double tolerance=0.025;
// 1 micron tolerance between sublayers.
- //double slice_tolerance=0.001;
+ double slice_tolerance=0.001;
public PolyhedraEndcapCalorimeter(Element node) throws JDOMException
{
@@ -100,17 +100,17 @@
double outerFaceLength = rmax * tan(halfInnerAngle) * 2;
Trapezoid sectTrd = new Trapezoid(detName + "_stave_trapezoid");
- //sectTrd.setY2(subdetector_thickness - tolerance);
- //sectTrd.setY1(subdetector_thickness - tolerance);
- //sectTrd.setZ(radial_thickness - tolerance);
- //sectTrd.setX1(innerFaceLength - tolerance);
- //sectTrd.setX2(outerFaceLength - tolerance);
-
- sectTrd.setY2(subdetector_thickness);
- sectTrd.setY1(subdetector_thickness);
- sectTrd.setZ(radial_thickness);
- sectTrd.setX1(innerFaceLength);
- sectTrd.setX2(outerFaceLength);
+ sectTrd.setY2(subdetector_thickness - tolerance);
+ sectTrd.setY1(subdetector_thickness - tolerance);
+ sectTrd.setZ(radial_thickness - tolerance);
+ sectTrd.setX1(innerFaceLength - tolerance);
+ sectTrd.setX2(outerFaceLength - tolerance);
+
+ //sectTrd.setY2(subdetector_thickness);
+ //sectTrd.setY1(subdetector_thickness);
+ //sectTrd.setZ(radial_thickness);
+ //sectTrd.setX1(innerFaceLength);
+ //sectTrd.setX2(outerFaceLength);
solids.addSolid(sectTrd);
Volume sectVolume = new Volume(detName + "_stave");
@@ -143,17 +143,18 @@
// Layer trapezoid.
Trapezoid layer_trd = new Trapezoid(layer_name + "_trapezoid");
- //layer_trd.setX1(innerFaceLength - tolerance);
- //layer_trd.setX2(outerFaceLength - tolerance);
- //layer_trd.setY1(layer_thickness - tolerance);
- //layer_trd.setY2(layer_thickness - tolerance);
- //layer_trd.setZ(radial_thickness - tolerance);
- layer_trd.setX1(innerFaceLength);
- layer_trd.setX2(outerFaceLength);
- layer_trd.setY1(layer_thickness);
- layer_trd.setY2(layer_thickness);
- layer_trd.setZ(radial_thickness);
+ layer_trd.setX1(innerFaceLength - tolerance);
+ layer_trd.setX2(outerFaceLength - tolerance);
+ layer_trd.setY1(layer_thickness - tolerance);
+ layer_trd.setY2(layer_thickness - tolerance);
+ layer_trd.setZ(radial_thickness - tolerance);
+
+ //layer_trd.setX1(innerFaceLength);
+ //layer_trd.setX2(outerFaceLength);
+ //layer_trd.setY1(layer_thickness);
+ //layer_trd.setY2(layer_thickness);
+ //layer_trd.setZ(radial_thickness);
solids.addSolid(layer_trd);
@@ -181,17 +182,17 @@
Trapezoid sliceTrd = new Trapezoid(slice_name + "_trapezoid");
- //sliceTrd.setX1(innerFaceLength - tolerance);
- //sliceTrd.setX2(outerFaceLength - `);
- //sliceTrd.setY1(slice_thickness - slice_tolerance);
- //sliceTrd.setY2(slice_thickness - slice_tolerance);
- //sliceTrd.setZ(radial_thickness - tolerance);
+ sliceTrd.setX1(innerFaceLength - tolerance);
+ sliceTrd.setX2(outerFaceLength - tolerance);
+ sliceTrd.setY1(slice_thickness - slice_tolerance);
+ sliceTrd.setY2(slice_thickness - slice_tolerance);
+ sliceTrd.setZ(radial_thickness - tolerance);
- sliceTrd.setX1(innerFaceLength);
- sliceTrd.setX2(outerFaceLength);
- sliceTrd.setY1(slice_thickness);
- sliceTrd.setY2(slice_thickness);
- sliceTrd.setZ(radial_thickness);
+ //sliceTrd.setX1(innerFaceLength);
+ //sliceTrd.setX2(outerFaceLength);
+ //sliceTrd.setY1(slice_thickness);
+ //sliceTrd.setY2(slice_thickness);
+ //sliceTrd.setZ(radial_thickness);
solids.addSolid(sliceTrd);