Author: [log in to unmask]
Date: Thu Jan 15 16:33:18 2015
New Revision: 3494
Log:
fix two typos in the module definition. All sensor positions now matches Shawn's 3D model
Modified:
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2014GeometryDefinition.java Thu Jan 15 16:33:18 2015
@@ -1617,6 +1617,7 @@
public static final double width = Sensor.width + randomoffset;
public static final double length = Sensor.length + randomoffset/10.0;
public static final double height = Sensor.getSensorThickness() + randomoffset/10.0;
+ protected final static double sensor_z = 0.23*inch;
public LongHalfModule(String name, SurveyVolume mother,
@@ -1649,8 +1650,7 @@
public static class LongAxialHoleHalfModule extends LongHalfModule {
private final static double sensor_x = 1.382*inch;
- private final static double sensor_y = 3.817*inch;
- private final static double sensor_z = 0.32*inch;
+ private final static double sensor_y = 3.887*inch;
public LongAxialHoleHalfModule(String name, SurveyVolume mother,
@@ -1674,7 +1674,6 @@
private final static double sensor_x = 1.382*inch;
private final static double sensor_y = 7.863*inch;
- private final static double sensor_z = 0.32*inch;
public LongAxialSlotHalfModule(String name, SurveyVolume mother,
@@ -1695,6 +1694,7 @@
public abstract static class LongStereoHalfModule extends LongHalfModule {
+ protected final static double sensor_z = 0.52*inch;
protected final static double stereo_angle = 0.05;
public LongStereoHalfModule(String name, SurveyVolume mother,
@@ -1734,7 +1734,6 @@
private final static double sensor_x = 1.282*inch;
private final static double sensor_y = 3.889*inch;
- private final static double sensor_z = 0.52*inch;
public LongStereoHoleHalfModule(String name, SurveyVolume mother,
AlignmentCorrection alignmentCorrection, int layer,
@@ -1755,9 +1754,7 @@
private final static double sensor_x = 1.481*inch;
private final static double sensor_y = 7.861*inch;
- private final static double sensor_z = 0.52*inch;
-
-
+
public LongStereoSlotHalfModule(String name, SurveyVolume mother,
AlignmentCorrection alignmentCorrection, int layer,
String half) {
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1
