GeomConverter/src/org/lcsim/geometry/compact/converter/lcdd
diff -u -r1.8 -r1.9
--- HPSTracker.java 19 Mar 2012 21:25:38 -0000 1.8
+++ HPSTracker.java 20 Mar 2012 18:05:34 -0000 1.9
@@ -162,7 +162,7 @@
Rotation rotr = new Rotation(moduleBaseName + "_reflect_rotation");
rotr.setX(0);
rotr.setY(theta);
- rotr.setZ(Math.PI/2 - bot_phi0);
+ rotr.setZ(-Math.PI/2 - bot_phi0);
lcdd.add(pr);
lcdd.add(rotr);
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.7 -r1.8
--- HPSTrackerConverter.java 19 Mar 2012 21:06:00 -0000 1.7
+++ HPSTrackerConverter.java 20 Mar 2012 18:05:34 -0000 1.8
@@ -184,7 +184,8 @@
{
String moduleBaseName = subdetName + "_layer" + layerId + "_module" + moduleNumber;
Translation3D p = new Translation3D(x, y, z + dz);
- RotationGeant rot = new RotationGeant(0, theta,-(Math.PI / 2 + top_phi0));
+ //RotationGeant rot = new RotationGeant(0, theta,-(Math.PI / 2 + top_phi0));
+ RotationGeant rot = new RotationGeant(0, theta,-Math.PI/2 - top_phi0);
new PhysicalVolume(new Transform3D(p, rot), moduleBaseName, moduleVolume, detector.getTrackingVolume().getLogicalVolume(), 0);
String path = "/" + detector.getTrackingVolume().getName() + "/" + moduleBaseName;
new SiTrackerModule(moduleBaseName, layerPos, path, moduleNumber);
@@ -193,8 +194,9 @@
{
Translation3D pr = new Translation3D(x, -y, z + dz);
//first x, then y, then z...
- RotationGeant rotr = new RotationGeant(0, theta, Math.PI/2 - bot_phi0); // Correct???
- String path2 = "/" + detector.getTrackingVolume().getName() + "/" + moduleBaseName + "_reflected";
+ //RotationGeant rotr = new RotationGeant(0, theta, Math.PI/2 - bot_phi0);
+ RotationGeant rotr = new RotationGeant(0, theta, -Math.PI/2 - bot_phi0);
+ String path2 = "/" + detector.getTrackingVolume().getName() + "/" + moduleBaseName + "_reflected";
new PhysicalVolume(new Transform3D(pr, rotr), moduleBaseName + "_reflected", moduleVolume, detector.getTrackingVolume().getLogicalVolume(), k);
new SiTrackerModule(moduleBaseName + "_reflected", layerNeg, path2, moduleNumber);
}
@@ -370,6 +372,7 @@
private double senseTransferEfficiency = 0.419;
// TODO: Move this method to a Driver class.
+ /*
private void configSensor(SiSensor sensor)
{
//
@@ -409,6 +412,7 @@
double[][] transferEfficiencies = {{readoutTransferEfficiency, senseTransferEfficiency}};
sensor.setTransferEfficiencies(ChargeCarrier.HOLE, new BasicMatrix(transferEfficiencies));
}
+ */
static class ModuleComponentParameters
{