Author: [log in to unmask]
Date: Thu Nov 3 16:10:28 2016
New Revision: 4558
Log:
Updated correct carbon fiber and kapton dimensions.
Modified:
java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
=============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java (original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java Thu Nov 3 16:10:28 2016
@@ -940,7 +940,8 @@
// Distance from edge of cold block to hole/ball position: 5mm
protected static final double dist_sensor_center_to_coldblock_hole_vdir = (180.0 - 30.0 + (33.75 - 5.0)) - Sensor.length/2.0;
protected static final double half_module_thickness = TestRunHalfModule.getHybridThickness() + TestRunHalfModule.getCFThickness() + HalfModuleLamination.thickness;
- protected static final double half_module_length = TestRunHalfModule.getCFLength();
+ //protected static final double half_module_length = TestRunHalfModule.getCFLength();
+ protected static final double half_module_length = 200.0;
protected static final double half_module_width = 6.83 + Sensor.width;
protected double stereo_angle = 0.0;
@@ -1492,8 +1493,8 @@
*
*/
public static class HalfModuleLamination extends HalfModuleComponent {
- protected static final double length = 184.0;
- protected static final double width = 40.0; // -2.0; // width under the sensor, 2mm wider under hybrid.
+ protected static final double length = Sensor.length; //184.0;
+ protected static final double width = Sensor.width - 2.34; //40.0; // -2.0; // width under the sensor, 2mm wider under hybrid.
protected static final double thickness = 0.050;
public HalfModuleLamination(String name, SurveyVolume m, int id) {
super(name, m, null, id);
@@ -1523,8 +1524,12 @@
// double flat_pos_kapton_local_y = ball_pos_kapton_local_y + Sensor.getSensorLength(); // arbitrary distance
// double flat_pos_kapton_local_z = ball_pos_kapton_local_z;
- double ball_pos_kapton_local_x = Sensor.width/2.0 + 6.83 - 6.0 - width/2.0;
- double ball_pos_kapton_local_y = Sensor.length/2.0 - 170.0 - 10.0 + 8.5 + length/2.0;
+ //double ball_pos_kapton_local_x = Sensor.width/2.0 + 6.83 - 6.0 - width/2.0;
+ //double ball_pos_kapton_local_y = Sensor.length/2.0 - 170.0 - 10.0 + 8.5 + length/2.0;
+ //double ball_pos_kapton_local_z = -1.0 * (Sensor.getSensorThickness()/2.0 + HalfModuleLamination.thickness/2.0);
+
+ double ball_pos_kapton_local_x = 0;
+ double ball_pos_kapton_local_y = 0;
double ball_pos_kapton_local_z = -1.0 * (Sensor.getSensorThickness()/2.0 + HalfModuleLamination.thickness/2.0);
//ballPos = new BasicHep3Vector(ball_pos_kapton_local_x,ball_pos_kapton_local_y,ball_pos_kapton_local_z);
@@ -1571,9 +1576,9 @@
*
*/
public static class CarbonFiber extends HalfModuleComponent {
- protected static final double length = 200.;
- protected static final double width = 45.;
- protected static final double thickness = 0.250;
+ protected static final double length = Sensor.length; //200.;
+ protected static final double width = 36.02; //45.;
+ protected static final double thickness = 0.203; //0.250;
public CarbonFiber(String name, SurveyVolume m, int id) {
super(name, m, null, id);
init();
@@ -1609,10 +1614,14 @@
// setFlatPos(flat_pos_cf_local_x,flat_pos_cf_local_y,flat_pos_cf_local_z);
- final double ball_pos_cf_local_x = Sensor.width/2.0 + 6.83 - width/2.0;
- final double ball_pos_cf_local_y = Sensor.length/2.0 - 170.0 - 10.0 + length/2.0;
+ //final double ball_pos_cf_local_x = Sensor.width/2.0 + 6.83 - width/2.0;
+ //final double ball_pos_cf_local_y = Sensor.length/2.0 - 170.0 - 10.0 + length/2.0;
+ //final double ball_pos_cf_local_z = -1 * ( Sensor.getSensorThickness()/2.0 + HalfModuleLamination.thickness + TestRunHalfModule.getCFThickness()/2.0 );
+
+ final double ball_pos_cf_local_x = 0;
+ final double ball_pos_cf_local_y = 0;
final double ball_pos_cf_local_z = -1 * ( Sensor.getSensorThickness()/2.0 + HalfModuleLamination.thickness + TestRunHalfModule.getCFThickness()/2.0 );
-
+
ballPos = new BasicHep3Vector(ball_pos_cf_local_x, ball_pos_cf_local_y, ball_pos_cf_local_z);
veePos = new BasicHep3Vector(ballPos.x() + 1.0, ballPos.y(), ballPos.z());
flatPos = new BasicHep3Vector(ballPos.x(), ballPos.y() + 1.0, ballPos.z());
