3 modified files
GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.1 -r1.2
--- SiTrackerEndcap.java 25 Oct 2007 20:07:11 -0000 1.1
+++ SiTrackerEndcap.java 29 Oct 2007 18:30:10 -0000 1.2
@@ -166,8 +166,8 @@
dy1 = dy2 = thickness / 2;
double dx1, dx2;
double dphi = Math.PI / nwedges;
- dx1 = outerR * Math.tan(dphi);
- dx2 = innerR * Math.tan(dphi);
+ dx1 = innerR * Math.tan(dphi);
+ dx2 = outerR * Math.tan(dphi);
Trapezoid wedgeTrd = new Trapezoid(name + "_trapezoid",dx1*2,dx2*2,dy1*2,dy2*2,dz*2);
@@ -207,7 +207,7 @@
double dx1 = moduleTrd.x1();
double dx2 = moduleTrd.x2();
double dy = moduleTrd.y1();
- double deltax = dx1 - dx2;
+ double deltax = dx2 - dx1;
double side_slope = deltax / (2*dz);
List<Double> zcenters = new ArrayList<Double>();
@@ -224,8 +224,8 @@
zcenters.add((zmin+zmax)/2);
zsizes.add((zmax-zmin)/2);
- double xsize1 = dx2 + side_slope*(zmax+dz);
- double xsize2 = dx2 + side_slope*(zmin+dz);
+ double xsize1 = dx1 + side_slope*(zmin+dz);
+ double xsize2 = dx1 + side_slope*(zmax+dz);
xsizes1.add(xsize1);
xsizes2.add(xsize2);
@@ -236,8 +236,8 @@
double zmin = -dz;
zcenters.add((zmin+zmax)/2);
zsizes.add((zmax-zmin)/2);
- double xsize1 = dx2 + side_slope*(zmax+dz);
- double xsize2 = dx2 + side_slope*(zmin+dz);
+ double xsize1 = dx1 + side_slope*(zmin+dz);
+ double xsize2 = dx1 + side_slope*(zmax+dz);
xsizes1.add(xsize1);
xsizes2.add(xsize2);
}
@@ -350,7 +350,7 @@
{
String sliceName = subdetElement.getAttributeValue("name") + "_layer" + layerN + "_module" + imodule;
- Trap sliceTrap = new Trap(sliceName+"_trap",zsizes.get(i),theta*ix,0.0,dy,xsize2,xsize2,0.0,dy,xsize1,xsize1,0.0);
+ Trap sliceTrap = new Trap(sliceName+"_trap",zsizes.get(i),theta*ix,0.0,dy,xsize1,xsize1,0.0,dy,xsize2,xsize2,0.0);
lcdd.add(sliceTrap);
Volume sliceLV = new Volume(sliceName, sliceTrap, sliceMaterial);
GeomConverter/src/org/lcsim/detector/solids
diff -u -r1.3 -r1.4
--- Trd.java 9 Aug 2007 22:36:37 -0000 1.3
+++ Trd.java 29 Oct 2007 18:30:10 -0000 1.4
@@ -12,7 +12,7 @@
* <a href="http://www.lcsim.org/software/geant4/doxygen/html/classG4Trd.html">G4Trd class</a>.
*
* @author Jeremy McCormick
- * @version $Id: Trd.java,v 1.3 2007/08/09 22:36:37 jeremy Exp $
+ * @version $Id: Trd.java,v 1.4 2007/10/29 18:30:10 tknelson Exp $
*/
public class Trd
extends AbstractSolid
@@ -56,15 +56,15 @@
{
Hep3Vector points[] = new Hep3Vector[8];
- points[0] = new BasicHep3Vector(-dx1,-dy1,dz);
- points[1] = new BasicHep3Vector(-dx1,dy1,dz);
- points[2] = new BasicHep3Vector(dx1,dy1,dz);
- points[3] = new BasicHep3Vector(dx1,-dy1,dz);
+ points[0] = new BasicHep3Vector(-dx2,-dy1,dz);
+ points[1] = new BasicHep3Vector(-dx2,dy1,dz);
+ points[2] = new BasicHep3Vector(dx2,dy1,dz);
+ points[3] = new BasicHep3Vector(dx2,-dy1,dz);
- points[4] = new BasicHep3Vector(-dx2,-dy2,-dz);
- points[5] = new BasicHep3Vector(-dx2,dy2,-dz);
- points[6] = new BasicHep3Vector(dx2,dy2,-dz);
- points[7] = new BasicHep3Vector(dx2,-dy2,-dz);
+ points[4] = new BasicHep3Vector(-dx1,-dy2,-dz);
+ points[5] = new BasicHep3Vector(-dx1,dy2,-dz);
+ points[6] = new BasicHep3Vector(dx1,dy2,-dz);
+ points[7] = new BasicHep3Vector(dx1,-dy2,-dz);
return points;
}
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.5 -r1.6
--- SiTrackerEndcapConverter.java 19 Oct 2007 05:40:30 -0000 1.5
+++ SiTrackerEndcapConverter.java 29 Oct 2007 18:30:10 -0000 1.6
@@ -29,7 +29,7 @@
* Converter for SiTrackerEndcap.
*
* @author Jeremy McCormick, Tim Nelson
- * @version $Id: SiTrackerEndcapConverter.java,v 1.5 2007/10/19 05:40:30 tknelson Exp $
+ * @version $Id: SiTrackerEndcapConverter.java,v 1.6 2007/10/29 18:30:10 tknelson Exp $
*/
public class SiTrackerEndcapConverter
@@ -126,8 +126,8 @@
dy1 = dy2 = thickness / 2;
double dx1, dx2;
double dphi = Math.PI / nwedges;
- dx1 = outerR * Math.tan(dphi);
- dx2 = innerR * Math.tan(dphi);
+ dx1 = innerR * Math.tan(dphi);
+ dx2 = outerR * Math.tan(dphi);
Trd wedgeTrd = new Trd(name,dx1,dx2,dy1,dy2,dz);
@@ -227,7 +227,7 @@
double dx1 = moduleTrd.getXHalfLength1();
double dx2 = moduleTrd.getXHalfLength2();
double dy = moduleTrd.getYHalfLength1();
- double deltax = dx1 - dx2;
+ double deltax = dx2 - dx1;
double side_slope = deltax/(2*dz);
List<Double> zcenters = new ArrayList<Double>();
@@ -244,8 +244,8 @@
zcenters.add((zmin+zmax)/2);
zsizes.add((zmax-zmin)/2);
- double xsize1 = dx2 + side_slope*(zmax+dz);
- double xsize2 = dx2 + side_slope*(zmin+dz);
+ double xsize1 = dx1 + side_slope*(zmin+dz);
+ double xsize2 = dx1 + side_slope*(zmax+dz);
xsizes1.add(xsize1);
xsizes2.add(xsize2);
@@ -256,8 +256,8 @@
double zmin = -dz;
zcenters.add((zmin+zmax)/2);
zsizes.add((zmax-zmin)/2);
- double xsize1 = dx2 + side_slope*(zmax+dz);
- double xsize2 = dx2 + side_slope*(zmin+dz);
+ double xsize1 = dx1 + side_slope*(zmin+dz);
+ double xsize2 = dx1 + side_slope*(zmax+dz);
xsizes1.add(xsize1);
xsizes2.add(xsize2);
}
@@ -351,7 +351,7 @@
String sliceName = "module" + imodule;
- Trap sliceTrap = new Trap(sliceName,zsizes.get(i),theta*ix,0.0,dy,xsize2,xsize2,0.0,dy,xsize1,xsize1,0.0);
+ Trap sliceTrap = new Trap(sliceName,zsizes.get(i),theta*ix,0.0,dy,xsize1,xsize1,0.0,dy,xsize2,xsize2,0.0);
ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrap, sliceMaterial);
CVSspam 0.2.8