Author: [log in to unmask]
Date: Tue Feb 24 21:02:53 2015
New Revision: 3557
Log:
Fix kapton lamination thickness for L4-6 half-modules. Optimize box dimensions for L4-6 half-modules to fix all overlaps in the tracker geometry.
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 Tue Feb 24 21:02:53 2015
@@ -13,7 +13,6 @@
import org.jdom.Element;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.BaseModule;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.CarbonFiber;
-import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.Sensor;
import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule;
@@ -1613,10 +1612,10 @@
public abstract static class LongHalfModule extends BaseModule {
- private static final double randomoffset = 5.0; //TODO this will be replaced when I fix the size of the half-module
- public static final double width = Sensor.width + randomoffset;
- public static final double length = Sensor.length + randomoffset/10.0;
- public static final double height = Sensor.getSensorThickness() + randomoffset/10.0;
+ //private static final double randomoffset = 5.0;
+ public static final double width = Sensor.width; // + randomoffset;
+ public static final double length = Sensor.length;// + randomoffset/10.0;
+ public static final double height = Sensor.height + HalfLongModuleLamination.height;
protected final static double sensor_z = 0.23*inch;
@@ -1633,7 +1632,10 @@
}
protected void setCenter() {
- setCenter(0.0,0.0,0.0);
+ double x = 0.0;
+ double y = 0.0;
+ double z = +0.5*Sensor.height - height/2.0;;
+ setCenter(x,y,z);
}
protected void setPos() {
@@ -1800,7 +1802,7 @@
protected void setCenter() {
double x = -1.0 * (TestRunHalfModule.getWidth()/2.0 - ( 12.66 - (8.83 -3.00) + Sensor.width/2.0 ) );
double y = TestRunHalfModule.getLength()/2.0 - ( (170.00 + 10.00) - Sensor.length/2.0);
- double z = -Sensor.getSensorThickness()/2.0 - HalfModuleLamination.thickness - CarbonFiber.thickness + half_module_thickness/2.0;
+ double z = -Sensor.getSensorThickness()/2.0 - HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination.thickness - CarbonFiber.thickness + half_module_thickness/2.0;
setCenter(x, y, z);
}
}
@@ -1841,7 +1843,7 @@
protected void setCenter() {
double x = -1.0 * (TestRunHalfModule.getWidth()/2.0 - ( 12.66 - (8.83 -3.00) + Sensor.width/2.0 ) );
double y = TestRunHalfModule.getLength()/2.0 - ( (170.00 + 10.00) - Sensor.length/2.0);
- double z = -Sensor.getSensorThickness()/2.0 - HalfModuleLamination.thickness - CarbonFiber.thickness + half_module_thickness/2.0;
+ double z = -Sensor.getSensorThickness()/2.0 - HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination.thickness - CarbonFiber.thickness + half_module_thickness/2.0;
setCenter(x, y, z);
}
protected void applyGenericCoordinateSystemCorrections() {
@@ -1875,7 +1877,7 @@
public static class HalfLongModuleLamination extends HPSTestRunTracker2014GeometryDefinition.HalfModuleComponent {
protected static final double width = Sensor.width;
protected static final double length = Sensor.length;
- protected static final double height = Sensor.getSensorThickness();
+ protected static final double height = 0.050;
public HalfLongModuleLamination(String name, SurveyVolume mother, int id) {
super(name, mother, null, id);
########################################################################
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
|