Author: [log in to unmask] Date: Mon Dec 8 22:31:46 2014 New Revision: 3443 Log: Use Shawn's module numbers for module positions in U-channels. 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 Mon Dec 8 22:31:46 2014 @@ -271,13 +271,13 @@ } protected void setPos() { - final double ball_pos_x = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_x + SvtBoxBasePlate.width/2.0 - 6.622*inch; - final double ball_pos_y = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_y + SvtBoxBasePlate.length -28.531*inch; + final double ball_pos_x = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_x + SvtBoxBasePlate.width/2.0 - 6.997*inch; + final double ball_pos_y = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_y + SvtBoxBasePlate.length -28.543*inch; final double ball_pos_z = 0.0; final double vee_pos_x = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_x + SvtBoxBasePlate.width/2.0 + 6.622*inch; - final double vee_pos_y = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_y + SvtBoxBasePlate.length - 28.127*inch; + final double vee_pos_y = -SvtBoxBasePlate.kin_mount_to_edge_of_plate_y + SvtBoxBasePlate.length - 28.116*inch; final double vee_pos_z = 0.0; @@ -976,9 +976,9 @@ init(); } protected Hep3Vector getHolePosition() { - double x = hole_to_center_of_plate_width_dir; - double y = getHoleModuleCenterOffset(); - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L1; + double x = 95.25; + double y = 9.525; + double z = -51.435; return new BasicHep3Vector(x, y, z); } @@ -994,9 +994,9 @@ } protected Hep3Vector getHolePosition() { - double x = -1.0*hole_to_center_of_plate_width_dir; // not minus sign compared to bottom - double y = getHoleModuleCenterOffset(); - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L1; + double x = -95.25; // note minus sign compared to bottom + double y = -9.525; + double z = -51.435; return new BasicHep3Vector(x, y, z); } @@ -1012,10 +1012,9 @@ init(); } protected Hep3Vector getHolePosition() { - //hole position (sensor side) - double x = hole_to_center_of_plate_width_dir; - double y = getHoleModuleCenterOffset() + UChannelL13Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L2; + double x = 95.25; + double y = 109.525; + double z = -51.435 - 1.5; return new BasicHep3Vector(x, y, z); } @@ -1030,9 +1029,9 @@ } protected Hep3Vector getHolePosition() { - double x = -1.0*hole_to_center_of_plate_width_dir; // not minus sign compared to bottom - double y = getHoleModuleCenterOffset() + UChannelL13Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L2; + double x = -95.25; // note minus sign compared to bottom + double y = 90.475; + double z = -51.435 - 1.5; return new BasicHep3Vector(x, y, z); } @@ -1049,10 +1048,9 @@ init(); } protected Hep3Vector getHolePosition() { - //hole position (sensor side) - double x = hole_to_center_of_plate_width_dir; - double y = getHoleModuleCenterOffset() + 2*UChannelL13Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L3; + double x = 95.25; + double y = 209.525; + double z = -51.435 - 2*1.5; return new BasicHep3Vector(x, y, z); } @@ -1067,9 +1065,9 @@ } protected Hep3Vector getHolePosition() { - double x = -1.0*hole_to_center_of_plate_width_dir; // not minus sign compared to bottom - double y = getHoleModuleCenterOffset() + 2*UChannelL13Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL13.side_plate_cone_y - UChannelL13Plate.pocket_depth_L2; + double x = -95.25; // note minus sign compared to bottom + double y = 190.475; + double z = -51.435 - 2*1.5; return new BasicHep3Vector(x, y, z); } @@ -1180,9 +1178,12 @@ } protected Hep3Vector getHole() { - double x = hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset(); //Note minus sign compared to top - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L4; + double x = 149.225; + double y = 9.525; + double z = -53.34; + //double x = hole_to_center_of_plate_width_dir; + //double y = -getHoleModuleCenterOffset(); //Note minus sign compared to top + //double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L4; return new BasicHep3Vector(x, y, z); } @@ -1197,9 +1198,12 @@ } protected Hep3Vector getHole() { - double x = -1*hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset(); - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L4; + double x = -149.225; + double y = -9.525; + double z = -53.34; +// double x = -1*hole_to_center_of_plate_width_dir; +// double y = -getHoleModuleCenterOffset(); +// double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L4; return new BasicHep3Vector(x, y, z); } @@ -1215,9 +1219,9 @@ } protected Hep3Vector getHole() { - double x = hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset() + UChannelL46Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L5; + double x = 149.225; + double y = 209.525; + double z = -53.34 - 3.0; return new BasicHep3Vector(x, y, z); } @@ -1232,9 +1236,9 @@ } protected Hep3Vector getHole() { - double x = -1*hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset() + UChannelL46Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L5; + double x = -149.225; + double y = 190.475; + double z = -53.34 - 3.0; return new BasicHep3Vector(x, y, z); } @@ -1249,9 +1253,9 @@ } protected Hep3Vector getHole() { - double x = hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset() + 2.0*UChannelL46Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L6; + double x = 149.225; + double y = 409.525; + double z = -53.34 - 2*3.0; return new BasicHep3Vector(x, y, z); } @@ -1266,9 +1270,9 @@ } protected Hep3Vector getHole() { - double x = -hole_to_center_of_plate_width_dir; - double y = -getHoleModuleCenterOffset() + 2.0*UChannelL46Plate.module_mounting_hole_to_hole_x; - double z = -UChannelL46.side_plate_cone_y - UChannelL46Plate.pocket_depth_L6; + double x = -149.225; + double y = 390.475; + double z = -53.34 - 2*3.0; return new BasicHep3Vector(x, y, z); } ######################################################################## 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