Author: [log in to unmask]
Date: Fri Dec  5 16:42:48 2014
New Revision: 3439

Log:
Fix kin mount offset

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	Fri Dec  5 16:42:48 2014
@@ -448,7 +448,7 @@
             final double ball_pos_x = 4*inch;
             //final double ball_pos_y = (4.175 + 2*3.937) * inch; 
             final double ball_pos_y =  cone_to_edge_of_plate_y - kin_mount_to_edge_of_plate_y;
-            final double ball_pos_z = -SupportRingL13KinMount.kin_mount_offset_vertically + UChannelL13Plate.height + side_plate_cone_y; 
+            final double ball_pos_z = -UChannelPlate.dist_from_plate_surface_to_pivot_point + UChannelL13Plate.height + side_plate_cone_y; 
             
             ballPos = new BasicHep3Vector(ball_pos_x, ball_pos_y, ball_pos_z);
             veePos = new BasicHep3Vector(ballPos.x()-1, ballPos.y(), ballPos.z());
@@ -499,16 +499,31 @@
         }
     }
 
-    
-    
-    
+
     /**
      * Abstract @SurveyVolume volume defining the coordinate system of the u-channel plate
 
      * @author Per Hansson Adrian <[log in to unmask]>
      *
      */
-    public abstract static class UChannelL13Plate extends SurveyVolume {
+    public abstract static class UChannelPlate extends SurveyVolume {
+        public UChannelPlate(String name, SurveyVolume m,
+                AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
+            super(name, m, alignmentCorrection, ref);
+        }
+
+        // the kin mount cone is recessed into the plate meaning that the effective pivot axis is 
+        // also recessed into the plate from the surface
+        public static final double dist_from_plate_surface_to_pivot_point = 0.0295*inch;
+    }
+
+    /**
+     * Abstract @SurveyVolume volume defining the coordinate system of the u-channel plate
+
+     * @author Per Hansson Adrian <[log in to unmask]>
+     *
+     */
+    public abstract static class UChannelL13Plate extends UChannelPlate {
         private final static double pocket_depth_L1 = 0.025;
         private final static double pocket_depth_L2 = pocket_depth_L1 + 0.059;
         private final static double pocket_depth_L3 = pocket_depth_L2 + 0.059;
@@ -516,6 +531,8 @@
         private static final double width = 9.25*inch;
         protected static final double height = 0.375*inch;
         protected final static double length = 16.0*inch;
+        
+
         
         public UChannelL13Plate(String name, SurveyVolume m,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
@@ -766,7 +783,7 @@
      * @author Per Hansson Adrian <[log in to unmask]>
      *
      */
-    public abstract static class UChannelL46Plate extends SurveyVolume {
+    public abstract static class UChannelL46Plate extends UChannelPlate {
         public final static double pocket_depth_L4 = 0.1;
         public final static double pocket_depth_L5 = pocket_depth_L4 + 0.118;
         public final static double pocket_depth_L6 = pocket_depth_L5 + 0.118;

########################################################################
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