Author: [log in to unmask]
Date: Wed Jun 24 17:19:01 2015
New Revision: 3198
Log:
fix offset of survey cone
Modified:
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/ReadSurveyOutput.java
java/trunk/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014v1Survey.xml
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java Wed Jun 24 17:19:01 2015
@@ -328,14 +328,7 @@
}
public static boolean isModule(String name) {
- Pattern pattern = Pattern.compile("module_L[1-6][bt]$");
- Matcher matcher = pattern.matcher(name);
- boolean found = false;
- while(matcher.matches()) {
- //System.out.printf("isModule: found %s\n", matcher.group());
- found = true;
- }
- return found?true:false;
+ return Pattern.matches("module_L[1-6][bt]$", name);
}
public static int getUChannelSupportLayer(String name) {
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/ReadSurveyOutput.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/ReadSurveyOutput.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/ReadSurveyOutput.java Wed Jun 24 17:19:01 2015
@@ -95,7 +95,7 @@
logger.info("dT " + dT.toString());
logger.info("orgT " + orgT.toString());
//translate to center of SVT box
- Hep3Vector orgTbox = VecOp.sub(orgT, new BasicHep3Vector(0, 0, 0.375*HPSTrackerGeometryDefinition.inch));
+ Hep3Vector orgTbox = VecOp.add(orgT, new BasicHep3Vector(0, 0, 0.375*HPSTrackerGeometryDefinition.inch));
logger.info("orgTbox " + orgTbox.toString());
orgTbox = VecOp.sub(orgTbox, new BasicHep3Vector(0, 0, HPSTracker2014GeometryDefinition.SvtBox.length/2.0));
Modified: java/trunk/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014v1Survey.xml
=============================================================================
--- java/trunk/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014v1Survey.xml (original)
+++ java/trunk/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSTracker2014v1Survey.xml Wed Jun 24 17:19:01 2015
@@ -58,6 +58,7 @@
<SurveyVolumes>
<!-- U-channel in Svt box survey survey -->
+
<SurveyVolume name="support_bottom_L46" desc="B46 ball basis in box fiducial frame:">
<origin x="-5.9779" y="-8.4112" z="789.6352"/>
<unitvec name="X" x="9.9955e-01" y="-7.7349e-05" z="-3.0082e-02"/>
@@ -96,10 +97,9 @@
</SurveyVolume>
-
<!-- Module support surface survey -->
- <!--
+
<SurveyVolume name="module_L1t" desc="Top L1 pin basis in U-channel fiducial frame:">
<origin x="-95.2594" y="51.3976" z="-9.5359"/>
<unitvec name="X" x="1.0000e+00" y="-9.0423e-06" z="1.9487e-04"/>
@@ -173,14 +173,14 @@
<unitvec name="Y" x="5.9519e-05" y="1.0000e+00" z="-4.2261e-04"/>
<unitvec name="Z" x="6.3379e-05" y="4.2261e-04" z="1.0000e+00"/>
</SurveyVolume>
- -->
+
<!-- Sensor position survey -->
- <!--
+
<SurveyVolume name="module_L1t_halfmodule_stereo" desc="Top L1S sensor basis in pin frame:">
<origin x="124.125" y="39.2422" z="-13.84"/>
<unitvec name="X" x="9.9500e-01" y="9.9895e-02" z="-1.3013e-04"/>
@@ -401,7 +401,7 @@
<unitvec name="Y" x="2.0836e-04" y="-1.0000e+00" z="-1.5378e-04"/>
<unitvec name="Z" x="7.4449e-04" y="-1.5363e-04" z="1.0000e+00"/>
</SurveyVolume>
- -->
+
</SurveyVolumes>
@@ -648,12 +648,12 @@
<!-- top support tilt angles -->
- <millepede_constant name="13100" value="0.00" /> <!-- + means opening-->
+ <millepede_constant name="13100" value="0.0" /> <!-- + means opening-->
<millepede_constant name="13200" value="0.0" />
<millepede_constant name="13300" value="0.0" />
<!-- bottom support tilt angles -->
- <millepede_constant name="23100" value="-0.000" /> <!-- - means opening -->
+ <millepede_constant name="23100" value="-0.0" /> <!-- - means opening -->
<millepede_constant name="23200" value="0.0" />
<millepede_constant name="23300" value="0.0" />
