Author: [log in to unmask]
Date: Sat Nov 29 17:17:19 2014
New Revision: 3436
Log:
Add L1-3 support rotation correction from compact description.
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/HPSTrackerBuilder.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014.xml
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 Sat Nov 29 17:17:19 2014
@@ -66,7 +66,8 @@
SupportRing supportRing = new SupportRing("c_support", svtBox, null, svtBoxBasePlate);
surveyVolumes.add(supportRing);
- SupportRingL13BottomKinMount supportRingKinL13Bottom = new SupportRingL13BottomKinMount("c_support_kin_L13b", svtBox, null, supportRing);
+ AlignmentCorrection supBotCorr = this.getSupportAlignmentCorrection(false);
+ SupportRingL13BottomKinMount supportRingKinL13Bottom = new SupportRingL13BottomKinMount("c_support_kin_L13b", svtBox, supBotCorr, supportRing);
surveyVolumes.add(supportRingKinL13Bottom);
UChannelL13 uChannelL13Bottom = new UChannelL13Bottom("support_bottom_L13", svtBox, null, supportRingKinL13Bottom);
@@ -75,7 +76,8 @@
UChannelL13Plate uChannelL13BottomPlate = new UChannelL13BottomPlate("support_plate_bottom_L13", svtBox, null, uChannelL13Bottom);
surveyVolumes.add(uChannelL13BottomPlate);
- SupportRingL13TopKinMount supportRingKinL13Top = new SupportRingL13TopKinMount("c_support_kin_L13t", svtBox, null, supportRing);
+ AlignmentCorrection supTopCorr = this.getSupportAlignmentCorrection(true);
+ SupportRingL13TopKinMount supportRingKinL13Top = new SupportRingL13TopKinMount("c_support_kin_L13t", svtBox, supTopCorr, supportRing);
surveyVolumes.add(supportRingKinL13Top);
UChannelL13Top uChannelL13Top = new UChannelL13Top("support_top_L13", svtBox, null, supportRingKinL13Top);
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java Sat Nov 29 17:17:19 2014
@@ -122,8 +122,7 @@
double t[] = {0,0,0};
for(MilleParameter p_loop: milleparameters) {
boolean paramIsTop = p_loop.getHalf()==1?true:false;
- int paramType = p_loop.getType();
- if(paramIsTop==isTopLayer && paramType==3) {
+ if(paramIsTop==isTopLayer && p_loop.getType()==3) {
//xcheck
if(p_loop.getSensor()!=0) throw new RuntimeException("sensor name is not zero for support plate param! " + p_loop.getSensor());
// get the correction
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java Sat Nov 29 17:17:19 2014
@@ -178,7 +178,7 @@
setPos(new Translation3D(box_center.x(), box_center.y(), box_center.z()));
setRot(new RotationGeant(lcdd_rot_angles.x(), lcdd_rot_angles.y(), lcdd_rot_angles.z()));
- if(isDebug()) {
+ //if(isDebug()) {
System.out.printf("%s: box_center_base_local %s\n", this.getClass().getSimpleName(), box_center_base_local.toString());
System.out.printf("%s: box_center_base %s\n", this.getClass().getSimpleName(), box_center_base.toString());
@@ -191,7 +191,7 @@
//calculate the position in tracking volume separately as a xcheck
Hep3Vector box_center_tracking_xcheck = HPSTrackerBuilder.transformToTracking(box_center_base_local, base);
System.out.printf("%s: box_center_tracking_xcheck %s for %s\n", this.getClass().getSimpleName(), box_center_tracking_xcheck.toString(),base.getName());
- }
+ //}
}
Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java (original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java Sat Nov 29 17:17:19 2014
@@ -100,7 +100,7 @@
private void applyLocalAlignmentCorrections() {
// Apply alignment corrections to local coordinate system that is already built
- boolean debug_local = false;
+ boolean debug_local = true;
if(this.coord==null) throw new RuntimeException("no coordinate system was set before trying to apply alignment corrections.");
if(alignmentCorrections!=null) {
Modified: projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014.xml
=============================================================================
--- projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014.xml (original)
+++ projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014.xml Sat Nov 29 17:17:19 2014
@@ -249,7 +249,7 @@
<millepede_constant name="13300" value="0.0"/>
<!-- bottom support tilt angles -->
- <millepede_constant name="23100" value="0.0"/> <!-- + means closing -->
+ <millepede_constant name="23100" value="0.0"/> <!-- - means opening -->
<millepede_constant name="23200" value="0.0"/>
<millepede_constant name="23300" value="0.0"/>
########################################################################
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
