GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd

diff -u -r1.16 -r1.17
--- SiTrackerEndcap.java	3 Feb 2009 23:36:16 -0000	1.16
+++ SiTrackerEndcap.java	4 Feb 2009 23:05:18 -0000	1.17
@@ -208,6 +208,11 @@

         dx1 = innerR * Math.tan(dphi);
         dx2 = outerR * Math.tan(dphi);
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        dx1 -= 0.00001;
+        dx2 -= 0.00001;
+        dz -= 0.00001;
+        

         Trapezoid wedgeTrd = new Trapezoid(name + "_trapezoid",dx1,dx2,dy1,dy2,dz);
         
         lcdd.add(wedgeTrd);

@@ -454,6 +459,10 @@

         double posY = -(moduleBox.getY() / 2);
         double moduleZ = moduleBox.getZ();
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        moduleX -= 0.0001;
+        moduleZ -= 0.0001;
+        

         String moduleName = moduleVolume.getVolumeName();
         
         int sensor=0;

@@ -515,6 +524,11 @@

         double y1 = trd.y1();
         double z = trd.z();
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        x1 -= 0.0001;
+        x2 -= 0.0001;
+        z -= 0.0001;
+        

         double posY = -y1;
         
         String moduleName = moduleVolume.getVolumeName();

@@ -584,6 +598,13 @@

         double theta = trap.getTheta();
         double phi = trap.getPhi();
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        x1 -= 0.0001;
+        x2 -= 0.0001;
+        x3 -= 0.0001;
+        x4 -= 0.0001;
+        z -= 0.0001;
+        

         double posY = -y1;
         
         int sensor = 0;

GeomConverter/src/org/lcsim/detector/converter/compact

diff -u -r1.29 -r1.30
--- SiTrackerEndcapConverter.java	3 Feb 2009 23:36:16 -0000	1.29
+++ SiTrackerEndcapConverter.java	4 Feb 2009 23:05:18 -0000	1.30
@@ -59,7 +59,7 @@

  * Converter for SiTrackerEndcap.
  *
  * @author Jeremy McCormick, Tim Nelson

- * @version $Id: SiTrackerEndcapConverter.java,v 1.29 2009/02/03 23:36:16 tknelson Exp $

+ * @version $Id: SiTrackerEndcapConverter.java,v 1.30 2009/02/04 23:05:18 tknelson Exp $

  */
 
 public class SiTrackerEndcapConverter

@@ -245,6 +245,11 @@

         dx1 = innerR * Math.tan(dphi);
         dx2 = outerR * Math.tan(dphi);
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        dx1 -= 0.00001;
+        dx2 -= 0.00001;
+        dz -= 0.00001;
+        

         Trd wedgeTrd = new Trd(name,dx1,dx2,dy1,dy2,dz);
         
         ILogicalVolume wedgeLV = new LogicalVolume(name, wedgeTrd, material);

@@ -529,6 +534,10 @@

         double posY = -moduleBox.getYHalfLength();
         double moduleX = moduleBox.getXHalfLength();
         double moduleZ = moduleBox.getZHalfLength();

+
+        // pull corners in by 0.1 microns to eliminate overlaps.
+        moduleX -= 0.0001;
+        moduleZ -= 0.0001;

         
         for (SiTrackerModuleComponentParameters component : moduleParameters)
         {

@@ -562,6 +571,11 @@

         double y1 = trd.getYHalfLength1();
         double z = trd.getZHalfLength();
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        x1 -= 0.0001;
+        x2 -= 0.0001;
+        z -= 0.0001;
+        

         double posY = -y1;
         
         for (SiTrackerModuleComponentParameters component : moduleParameters)

@@ -603,6 +617,13 @@

         double phi = trap.getPhi();
         double posY = -y1;
         

+        // pull corners in by 0.1 microns to eliminate overlaps.
+        x1 -= 0.0001;
+        x2 -= 0.0001;
+        x3 -= 0.0001;
+        x4 -= 0.0001;
+        z -= 0.0001;
+        

         for (SiTrackerModuleComponentParameters component : moduleParameters)
         {
             double thickness = component.getThickness();