Author: [log in to unmask]
Date: Tue Nov 22 11:20:44 2016
New Revision: 4577

Log:
Changed the dimensions of silicon microstrips to 200 microns. Also, moved L3 and L4 0.8 mm closer to that beam. 

Modified:
    java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java

Modified: java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java
 =============================================================================
--- java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java	(original)
+++ java/branches/layer0-thin-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTracker2017GeometryDefinition.java	Tue Nov 22 11:20:44 2016
@@ -485,7 +485,7 @@
         // Note the L1 measures are used here
         protected final static double cone_to_hole_along_uchannel = HPSTracker2014GeometryDefinition.ModuleL1Top.cone_to_hole_along_uchannel;
         protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014GeometryDefinition.ModuleL1Top.cone_to_hole_vertical_from_uchannel;
-
+        
         public ModuleL2Top(String name, SurveyVolume mother,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
             super(name, mother, alignmentCorrection, ref);
@@ -504,7 +504,8 @@
         // Note the L2 measures are used here
         protected final static double cone_to_hole_along_uchannel = HPSTracker2014GeometryDefinition.ModuleL2Bot.cone_to_hole_along_uchannel;
         protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014GeometryDefinition.ModuleL2Bot.cone_to_hole_vertical_from_uchannel;
-
+        protected final static double L3_new_vertical_shift = 0.8;
+        
         public ModuleL3Bot(String name, SurveyVolume mother,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
             super(name, mother, alignmentCorrection, ref);
@@ -513,7 +514,7 @@
         protected Hep3Vector getHolePosition() {
             double x = cone_to_hole_across_uchannel;
             double y = cone_to_hole_along_uchannel;
-            double z = cone_to_hole_vertical_from_uchannel;
+            double z = cone_to_hole_vertical_from_uchannel + L3_new_vertical_shift;
             return new BasicHep3Vector(x, y, z);
         }
         
@@ -523,7 +524,8 @@
         // Note the L2 measures are used here
         protected final static double cone_to_hole_along_uchannel = HPSTracker2014GeometryDefinition.ModuleL2Top.cone_to_hole_along_uchannel;
         protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014GeometryDefinition.ModuleL2Top.cone_to_hole_vertical_from_uchannel;
-
+        protected final static double L3_new_vertical_shift = 0.8;
+        
         public ModuleL3Top(String name, SurveyVolume mother,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
             super(name, mother, alignmentCorrection, ref);
@@ -532,7 +534,7 @@
         protected Hep3Vector getHolePosition() {
             double x = cone_to_hole_across_uchannel;
             double y = cone_to_hole_along_uchannel;
-            double z = cone_to_hole_vertical_from_uchannel;
+            double z = cone_to_hole_vertical_from_uchannel + L3_new_vertical_shift;
             return new BasicHep3Vector(x, y, z);
         }
         
@@ -542,7 +544,8 @@
         // Note the L2 measures are used here
         protected final static double cone_to_hole_along_uchannel = HPSTracker2014GeometryDefinition.ModuleL3Bot.cone_to_hole_along_uchannel;
         protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014GeometryDefinition.ModuleL3Bot.cone_to_hole_vertical_from_uchannel;
-
+        protected final static double L4_new_vertical_shift = 0.8;
+        
         public ModuleL4Bot(String name, SurveyVolume mother,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
             super(name, mother, alignmentCorrection, ref);
@@ -551,7 +554,7 @@
         protected Hep3Vector getHolePosition() {
             double x = cone_to_hole_across_uchannel;
             double y = cone_to_hole_along_uchannel;
-            double z = cone_to_hole_vertical_from_uchannel;
+            double z = cone_to_hole_vertical_from_uchannel + L4_new_vertical_shift;
             return new BasicHep3Vector(x, y, z);
         }
         
@@ -561,7 +564,8 @@
         // Note the L2 measures are used here
         protected final static double cone_to_hole_along_uchannel = HPSTracker2014GeometryDefinition.ModuleL3Top.cone_to_hole_along_uchannel;
         protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014GeometryDefinition.ModuleL3Top.cone_to_hole_vertical_from_uchannel;
-
+        protected final static double L4_new_vertical_shift = 0.8;
+        
         public ModuleL4Top(String name, SurveyVolume mother,
                 AlignmentCorrection alignmentCorrection, SurveyVolume ref) {
             super(name, mother, alignmentCorrection, ref);
@@ -570,7 +574,7 @@
         protected Hep3Vector getHolePosition() {
             double x = cone_to_hole_across_uchannel;
             double y = cone_to_hole_along_uchannel;
-            double z = cone_to_hole_vertical_from_uchannel;
+            double z = cone_to_hole_vertical_from_uchannel + L4_new_vertical_shift;
             return new BasicHep3Vector(x, y, z);
         }
         
@@ -659,7 +663,7 @@
         //static final double length= 10.00 + 1.00; 
         static final double length= 10.00;
         static final double width = 14.080 + 2*0.250; 
-        static final double thickness = 0.250;
+        static final double thickness = 0.200; //0.250;
         static final double height = thickness;
         public ShortSensor(String name, SurveyVolume mother, AlignmentCorrection alignmentCorrection, int id) {
             super(name, mother, alignmentCorrection, id);