GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.17 -r1.18
--- SiTrackerEndcap.java 4 Feb 2009 23:05:18 -0000 1.17
+++ SiTrackerEndcap.java 4 Feb 2009 23:54:59 -0000 1.18
@@ -209,9 +209,9 @@
dx2 = outerR * Math.tan(dphi);
// pull corners in by 0.1 microns to eliminate overlaps.
- dx1 -= 0.00001;
- dx2 -= 0.00001;
- dz -= 0.00001;
+ dx1 -= 0.0001;
+ dx2 -= 0.0001;
+ dz -= 0.0001;
Trapezoid wedgeTrd = new Trapezoid(name + "_trapezoid",dx1,dx2,dy1,dy2,dz);
@@ -459,9 +459,9 @@
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;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ moduleX -= 0.0005;
+ moduleZ -= 0.0005;
String moduleName = moduleVolume.getVolumeName();
@@ -524,10 +524,10 @@
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;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ x1 -= 0.0005;
+ x2 -= 0.0005;
+ z -= 0.0005;
double posY = -y1;
@@ -598,12 +598,12 @@
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;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ x1 -= 0.0005;
+ x2 -= 0.0005;
+ x3 -= 0.0005;
+ x4 -= 0.0005;
+ z -= 0.0005;
double posY = -y1;
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.30 -r1.31
--- SiTrackerEndcapConverter.java 4 Feb 2009 23:05:18 -0000 1.30
+++ SiTrackerEndcapConverter.java 4 Feb 2009 23:55:00 -0000 1.31
@@ -59,7 +59,7 @@
* Converter for SiTrackerEndcap.
*
* @author Jeremy McCormick, Tim Nelson
- * @version $Id: SiTrackerEndcapConverter.java,v 1.30 2009/02/04 23:05:18 tknelson Exp $
+ * @version $Id: SiTrackerEndcapConverter.java,v 1.31 2009/02/04 23:55:00 tknelson Exp $
*/
public class SiTrackerEndcapConverter
@@ -246,9 +246,9 @@
dx2 = outerR * Math.tan(dphi);
// pull corners in by 0.1 microns to eliminate overlaps.
- dx1 -= 0.00001;
- dx2 -= 0.00001;
- dz -= 0.00001;
+ dx1 -= 0.0001;
+ dx2 -= 0.0001;
+ dz -= 0.0001;
Trd wedgeTrd = new Trd(name,dx1,dx2,dy1,dy2,dz);
@@ -535,9 +535,9 @@
double moduleX = moduleBox.getXHalfLength();
double moduleZ = moduleBox.getZHalfLength();
- // pull corners in by 0.1 microns to eliminate overlaps.
- moduleX -= 0.0001;
- moduleZ -= 0.0001;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ moduleX -= 0.0005;
+ moduleZ -= 0.0005;
for (SiTrackerModuleComponentParameters component : moduleParameters)
{
@@ -571,10 +571,10 @@
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;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ x1 -= 0.0005;
+ x2 -= 0.0005;
+ z -= 0.0005;
double posY = -y1;
@@ -617,12 +617,12 @@
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;
+ // pull corners in by 0.5 microns to eliminate overlaps.
+ x1 -= 0.0005;
+ x2 -= 0.0005;
+ x3 -= 0.0005;
+ x4 -= 0.0005;
+ z -= 0.0005;
for (SiTrackerModuleComponentParameters component : moduleParameters)
{