Commit in hps-detectors/detectors/HPS-TestRun-v2 on MAIN | |||
compact.xml | +51 | -36 | 1.3 -> 1.4 |
Added Tim's latest survey data.
diff -u -r1.3 -r1.4 --- compact.xml 11 May 2012 21:33:32 -0000 1.3 +++ compact.xml 14 May 2012 22:48:52 -0000 1.4 @@ -50,29 +50,44 @@
<constant name="y4" value="30.67" /> <constant name="y5" value="30.67" /> -->
- <!-- module y gaps...Based on Tim's guess (for the top..L1 ~5.5mm more open than L5 -->
+ <!-- module y gaps...Based on Tim's guess (for the top..L1 ~5.5mm more open than L5
<constant name="y1" value="36.17" /> <constant name="y2" value="35.25" /> <constant name="y3" value="34.34" /> <constant name="y4" value="32.5" /> <constant name="y5" value="30.67" />
+ -->
- <!-- module y gaps...Pelle's playground --> - <!-- - <constant name="y1" value="35.17" /> - <constant name="y2" value="34.75" /> - <constant name="y3" value="33.85" /> - <constant name="y4" value="32.5" /> - <constant name="y5" value="30.67" /> - --> - <!-- constant shifts in x - <constant name="x1s" value="40.0" /> - <constant name="x2s" value="11.0" /> - <constant name="x3s" value="4.0" /> - <constant name="x4s" value="20.0" /> - <constant name="x5s" value="20.0" /> - -->
+ <!-- module y gaps...Based on Tim's guess (as of 5/14/12) --> + +<!-- +Top: +L1 37.12 +L2 35.94 +L3 35.00 +L4 33.15 +L5 31.35 + +Bottom: +L1 -34.92 +L2 -34.37 +L3 -33.54 +L4 -32.54 +L5 -30.83 +--> + <constant name="y1t" value="37.12" /> + <constant name="y2t" value="35.94" /> + <constant name="y3t" value="35.00" /> + <constant name="y4t" value="33.15" /> + <constant name="y5t" value="31.35" /> + + <constant name="y1b" value="-34.92" /> + <constant name="y2b" value="-34.37" /> + <constant name="y3b" value="-33.54" /> + <constant name="y4b" value="-32.54" /> + <constant name="y5b" value="-30.83" /> +
<constant name="x1s" value="0.0" /> <constant name="x2s" value="0.0" /> <constant name="x3s" value="0.0" />
@@ -112,44 +127,44 @@
</module> <layer id="1">
- <module_placement name="TestRunModule" id="0" x="100*sin(y_rot)+x1s" y="y1" z="100.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> - <module_placement name="TestRunModule" id="1" x="100*sin(y_rot)+x1s" y="-y1" z="100.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
+ <module_placement name="TestRunModule" id="0" x="100*sin(y_rot)+x1s" y="y1t" z="100.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> + <module_placement name="TestRunModule" id="1" x="100*sin(y_rot)+x1s" y="y1b" z="100.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
</layer> <layer id="2">
- <module_placement name="TestRunModule" id="0" x="110*sin(y_rot)+x1s" y="y1" z="110.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> - <module_placement name="TestRunModule" id="1" x="110*sin(y_rot)+x1s" y="-y1" z="110.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
+ <module_placement name="TestRunModule" id="0" x="110*sin(y_rot)+x1s" y="y1t" z="110.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> + <module_placement name="TestRunModule" id="1" x="110*sin(y_rot)+x1s" y="y1b" z="110.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
</layer> <layer id="3">
- <module_placement name="TestRunModule" id="0" x="200*sin(y_rot)+x2s" y="y2" z="200.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> - <module_placement name="TestRunModule" id="1" x="200*sin(y_rot)+x2s" y="-y2" z="200.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
+ <module_placement name="TestRunModule" id="0" x="200*sin(y_rot)+x2s" y="y2t" z="200.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> + <module_placement name="TestRunModule" id="1" x="200*sin(y_rot)+x2s" y="y2b" z="200.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
</layer> <layer id="4">
- <module_placement name="TestRunModule" id="0" x="210*sin(y_rot)+x2s" y="y2" z="210.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> - <module_placement name="TestRunModule" id="1" x="210*sin(y_rot)+x2s" y="-y2" z="210.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
+ <module_placement name="TestRunModule" id="0" x="210*sin(y_rot)+x2s" y="y2t" z="210.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> + <module_placement name="TestRunModule" id="1" x="210*sin(y_rot)+x2s" y="y2b" z="210.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
</layer> <layer id="5">
- <module_placement name="TestRunModule" id="0" x="300*sin(y_rot)+x3s" y="y3" z="300.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> - <module_placement name="TestRunModule" id="1" x="300*sin(y_rot)+x3s" y="-y3" z="300.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
+ <module_placement name="TestRunModule" id="0" x="300*sin(y_rot)+x3s" y="y3t" z="300.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> + <module_placement name="TestRunModule" id="1" x="300*sin(y_rot)+x3s" y="y3b" z="300.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6707963267948966"/>
</layer> <layer id="6">
- <module_placement name="TestRunModule" id="0" x="310*sin(y_rot)+x3s" y="y3" z="310.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> - <module_placement name="TestRunModule" id="1" x="310*sin(y_rot)+x3s" y="-y3" z="310.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
+ <module_placement name="TestRunModule" id="0" x="310*sin(y_rot)+x3s" y="y3t" z="310.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.812386326794897"/> + <module_placement name="TestRunModule" id="1" x="310*sin(y_rot)+x3s" y="y3b" z="310.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
</layer> <layer id="7">
- <module_placement name="TestRunModule" id="0" x="500*sin(y_rot)+x4s" y="y4" z="500.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> - <module_placement name="TestRunModule" id="1" x="500*sin(y_rot)+x4s" y="-y4" z="500.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6207963267948966"/>
+ <module_placement name="TestRunModule" id="0" x="500*sin(y_rot)+x4s" y="y4t" z="500.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> + <module_placement name="TestRunModule" id="1" x="500*sin(y_rot)+x4s" y="y4b" z="500.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6207963267948966"/>
</layer> <layer id="8">
- <module_placement name="TestRunModule" id="0" x="510*sin(y_rot)+x4s" y="y4" z="510.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.762386326794896"/> - <module_placement name="TestRunModule" id="1" x="510*sin(y_rot)+x4s" y="-y4" z="510.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
+ <module_placement name="TestRunModule" id="0" x="510*sin(y_rot)+x4s" y="y4t" z="510.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.762386326794896"/> + <module_placement name="TestRunModule" id="1" x="510*sin(y_rot)+x4s" y="y4b" z="510.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
</layer> <layer id="9">
- <module_placement name="TestRunModule" id="0" x="700*sin(y_rot)+x5s" y="y5" z="700.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> - <module_placement name="TestRunModule" id="1" x="700*sin(y_rot)+x5s" y="-y5" z="700.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6207963267948966"/>
+ <module_placement name="TestRunModule" id="0" x="700*sin(y_rot)+x5s" y="y5t" z="700.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.5707963267948966"/> + <module_placement name="TestRunModule" id="1" x="700*sin(y_rot)+x5s" y="y5b" z="700.0*cos(y_rot)" rx="0.0" ry="y_rot" rz="-1.6207963267948966"/>
</layer> <layer id="10">
- <module_placement name="TestRunModule" id="0" x="710*sin(y_rot)+x5s" y="y5" z="710.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.762386326794896"/> - <module_placement name="TestRunModule" id="1" x="710*sin(y_rot)+x5s" y="-y5" z="710.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
+ <module_placement name="TestRunModule" id="0" x="710*sin(y_rot)+x5s" y="y5t" z="710.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.762386326794896"/> + <module_placement name="TestRunModule" id="1" x="710*sin(y_rot)+x5s" y="y5b" z="710.0*cos(y_rot)" rx="0.0" ry="3.14159+y_rot" rz="-4.712386326794896"/>
</layer> </detector> <detector id="13" name="Ecal" type="HPSEcal3" insideTrackingVolume="false" readout="EcalHits" vis="ECALVis">
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1