Author: [log in to unmask]
Date: Thu Nov 3 16:11:13 2016
New Revision: 4559
Log:
Updated correct positioning of L0
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 Thu Nov 3 16:11:13 2016
@@ -656,7 +656,8 @@
*
*/
public static class ShortSensor extends BaseSensor {
- static final double length= 10.00 + 1.00;
+ //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 height = thickness;
@@ -687,7 +688,7 @@
@Override
protected void setCenter() {
- setCenter(0,0,0);
+ setCenter(0,0,0);
}
@Override
@@ -727,7 +728,8 @@
*
*/
public static class ActiveShortSensor extends SurveyVolume {
- private static final double length = ShortSensor.length - (100.00 - 98.33);
+ //private static final double length = ShortSensor.length - (100.00 - 98.33);
+ private static final double length = ShortSensor.length;
private static final double width = ShortSensor.width - 2*0.250;
private static final double thickness = ShortSensor.thickness;
public ActiveShortSensor(String name, SurveyVolume m) {
@@ -881,8 +883,11 @@
// position this module w.r.t. previous L1 by shifting it along the channel
protected final static double shift_along_uchannel = -50.;
protected final static double shift_vertically_uchannel = 0;//20.6658;
- protected final static double cone_to_hole_along_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Bot.cone_to_hole_along_uchannel + shift_along_uchannel;
- protected final static double cone_to_hole_across_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Bot.cone_to_hole_across_uchannel;
+ protected final static double shift_across_uchannel = 8.19;
+ protected final static double shift_again_along_uchannel = 4.66;
+
+ protected final static double cone_to_hole_along_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Bot.cone_to_hole_along_uchannel + shift_along_uchannel - shift_again_along_uchannel;
+ protected final static double cone_to_hole_across_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Bot.cone_to_hole_across_uchannel + shift_across_uchannel; //change x position layer 1 bot
protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Bot.cone_to_hole_vertical_from_uchannel + shift_vertically_uchannel;
public ModuleL1Bot(String name, SurveyVolume mother,
@@ -905,9 +910,11 @@
// position this module w.r.t. previous L1 by shifting it along the channel
// note flip
protected final static double shift_along_uchannel = -50.;
+ protected final static double shift_across_uchannel = 7.81;
+ protected final static double shift_again_along_uchannel = 4.32;
// note flip wr.t. bottom
- protected final static double cone_to_hole_along_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Top.cone_to_hole_along_uchannel + shift_along_uchannel;
- protected final static double cone_to_hole_across_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Top.cone_to_hole_across_uchannel;
+ protected final static double cone_to_hole_along_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Top.cone_to_hole_along_uchannel + shift_along_uchannel + shift_again_along_uchannel;
+ protected final static double cone_to_hole_across_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Top.cone_to_hole_across_uchannel - shift_across_uchannel; //change x position layer 1 top
protected final static double cone_to_hole_vertical_from_uchannel = HPSTracker2014v1GeometryDefinition.ModuleL1Top.cone_to_hole_vertical_from_uchannel;
public ModuleL1Top(String name, SurveyVolume mother,
