GeomConverter/testResources/org/lcsim/detector/converter/compact
diff -u -r1.3 -r1.4
--- SiTrackerEndcapTest.xml 18 Oct 2007 06:36:21 -0000 1.3
+++ SiTrackerEndcapTest.xml 19 Oct 2007 05:40:30 -0000 1.4
@@ -21,19 +21,35 @@
<detectors>
<detector id="1" name="SiTrackerEndcap" type="SiTrackerEndcap" readout="SiTrackerEndcap_RO" vis="TestVis">
- <layer id="1" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24">
+ <!-- Forward Tracker Layers -->
+
+ <layer id="1" inner_r="28.531" outer_r="169.53" inner_z="206.225" thickness="10.0" nwedges="24">
+ <module_parameters r_size="52.221" phi_size_max="50" />
+ </layer>
+
+ <layer id="2" inner_r="75.831" outer_r="169.53" inner_z="540.677" thickness="10.0" nwedges="24">
+ <module_parameters r_size="52.221" phi_size_max="50" />
+ </layer>
+
+ <layer id="3" inner_r="117.309" outer_r="169.53" inner_z="831.761" thickness="10.0" nwedges="24">
+ <module_parameters r_size="52.221" phi_size_max="50" />
+ </layer>
+
+
+ <!-- Endcap Tracker Layers -->
+ <layer id="4" inner_r="185.0" outer_r="478.0" inner_z="626.0" thickness="10.0" nwedges="24">
<module_parameters r_size="85.333" phi_size_max="80" />
</layer>
- <layer id="2" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24">
+ <layer id="5" inner_r="185.0" outer_r="734.0" inner_z="966.0" thickness="10.0" nwedges="24">
<module_parameters r_size="85.333" phi_size_max="80" />
</layer>
- <layer id="3" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24">
+ <layer id="6" inner_r="185.0" outer_r="990.0" inner_z="1307.0" thickness="10.0" nwedges="24">
<module_parameters r_size="85.333" phi_size_max="80" />
</layer>
- <layer id="4" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24">
+ <layer id="7" inner_r="185.0" outer_r="1246.0" inner_z="1648.0" thickness="10.0" nwedges="24">
<module_parameters r_size="85.333" phi_size_max="80" />
</layer>
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.4 -r1.5
--- SiTrackerEndcapConverter.java 18 Oct 2007 06:37:21 -0000 1.4
+++ SiTrackerEndcapConverter.java 19 Oct 2007 05:40:30 -0000 1.5
@@ -28,8 +28,8 @@
/**
* Converter for SiTrackerEndcap.
*
- * @author Jeremy McCormick
- * @version $Id: SiTrackerEndcapConverter.java,v 1.4 2007/10/18 06:37:21 tknelson Exp $
+ * @author Jeremy McCormick, Tim Nelson
+ * @version $Id: SiTrackerEndcapConverter.java,v 1.5 2007/10/19 05:40:30 tknelson Exp $
*/
public class SiTrackerEndcapConverter
@@ -224,20 +224,11 @@
Trd moduleTrd = (Trd)wedgeLV.getSolid();
double dz = ((Trd)wedgeLV.getSolid()).getZHalfLength();
-// System.out.println("\n" + "dz: "+dz);
double dx1 = moduleTrd.getXHalfLength1();
-// System.out.println("dx1: "+dx1);
double dx2 = moduleTrd.getXHalfLength2();
-// System.out.println("dx2: "+dx2);
double dy = moduleTrd.getYHalfLength1();
-// System.out.println("dy: "+dy);
double deltax = dx1 - dx2;
-// System.out.println("deltax: "+deltax);
double side_slope = deltax/(2*dz);
-// System.out.println("side_slope: "+side_slope);
-// System.out.println("r_size: "+r_size);
-
-// System.out.println("\n");
List<Double> zcenters = new ArrayList<Double>();
List<Double> zsizes = new ArrayList<Double>();
@@ -271,16 +262,8 @@
xsizes2.add(xsize2);
}
-// System.out.println("zcenters: "+zcenters);
-// System.out.println("zsizes: "+zsizes);
-// System.out.println("xsizes1: "+xsizes1);
-// System.out.println("xsizes2: "+xsizes2);
-
IMaterial sliceMaterial = wedgeLV.getMaterial();
-
-// int nxslices = 1;
-
double xsize1_min = 0.0;
double xsize_box = 0.0;
int nboxes = 0;
@@ -301,14 +284,11 @@
ntraps = 2;
}
- System.out.println("nboxes: "+nboxes);
-
double xmin = -nboxes*xsize_box;
double xmax = xmin+2*xsize_box;
for (int ibox = 0; ibox < nboxes; ibox++)
{
- System.out.println("ibox: "+ibox);
double xcenter = (xmin+xmax)/2;
xmin += 2*xsize_box;
@@ -316,8 +296,6 @@
String sliceName = "module" + imodule;
- System.out.println("sliceName: "+sliceName);
-
Box sliceBox = new Box(sliceName,xsize_box,dy,zsizes.get(i));
ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceBox, sliceMaterial);
@@ -339,8 +317,6 @@
{
String sliceName = "module" + imodule;
- System.out.println("sliceName: "+sliceName);
-
Trd sliceTrd = new Trd(sliceName,xsizes1.get(i),xsizes2.get(i),dy,dy,zsizes.get(i));
ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrd, sliceMaterial);
@@ -367,22 +343,14 @@
if (xsize1_min == 0.0) xsize1_min = xsize1;
double xsize2 = (xsizes2.get(i)-xoffset)/ntraps;
- System.out.println("xsize1: "+xsize1);
- System.out.println("xsize2: "+xsize2);
- System.out.println("xsize1_min: "+xsize1_min);
-
double xcenter = (xsize1+xsize2)/2 + xoffset;
double theta = Math.abs(Math.atan(side_slope/2));
for (int ix = -1; ix <=1; ix=ix+2)
{
- System.out.println("ix: "+ix);
-
String sliceName = "module" + imodule;
- System.out.println("sliceName: "+sliceName);
-
Trap sliceTrap = new Trap(sliceName,zsizes.get(i),theta*ix,0.0,dy,xsize2,xsize2,0.0,dy,xsize1,xsize1,0.0);
ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrap, sliceMaterial);
@@ -398,34 +366,10 @@
imodule++;
}
- }
-
-
-
+ }
}
-
-
-// for (int i=0; i<zcenters.size(); i++)
-// {
-// //String sliceName = subdet.getName() + "_layer" + layern + "_" + wedgeLV.getName() + "_module" + i;
-// String sliceName = "module" + i;
-//
-// Trd sliceTrd = new Trd(sliceName,xsizes1.get(i),xsizes2.get(i),dy,dy,zsizes.get(i));
-//
-// ILogicalVolume sliceLV = new LogicalVolume(sliceName, sliceTrd, sliceMaterial);
-//
-// Transform3D trans = new Transform3D(new Translation3D(0,0,zcenters.get(i)));
-//
-// new PhysicalVolume(
-// trans,
-// sliceName,
-// sliceLV,
-// wedgeLV,
-// i);
-// }
-
}
public Class getSubdetectorType()
