Commit in hps-detectors/detectors/HPS-TestRun-v2 on MAIN
compact.xml+20-201.5 -> 1.6
HPS-TestRun-v2.lcdd+21-211.3 -> 1.4
+41-41
2 modified files
Change ry so that the sensors are rotated in the correct direction.
hps-detectors/detectors/HPS-TestRun-v2
compact.xml 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- compact.xml	15 May 2012 14:37:38 -0000	1.5
+++ compact.xml	24 May 2012 14:21:13 -0000	1.6
@@ -127,44 +127,44 @@

             </module>       
             
              <layer id="1">

-                <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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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="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"/>

+                <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">
hps-detectors/detectors/HPS-TestRun-v2
HPS-TestRun-v2.lcdd 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- HPS-TestRun-v2.lcdd	15 May 2012 21:56:39 -0000	1.3
+++ HPS-TestRun-v2.lcdd	24 May 2012 14:21:13 -0000	1.4
@@ -2,7 +2,7 @@

 <lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
   <header>
     <detector name="HPS-TestRun-v2" />

-    <generator name="GeomConverter" version="1.0" file="./compact.xml" checksum="2956687800" />

+    <generator name="GeomConverter" version="1.0" file="/Users/mgraham/NetBeansProjects/hps-detectors/detectors/HPS-TestRun-v2/compact.xml" checksum="1152467342" />

     <author name="NONE" />
     <comment>HPS Test Proposal detector explicit SVT module placements</comment>
   </header>

@@ -112,45 +112,45 @@

       <position name="TestRunModuleVolume_component1_position" x="0.0" y="0.0" z="0.16" unit="mm" />
       <rotation name="TestRunModuleVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
       <position name="Tracker_TestRunModule_layer1_module0_position" x="2.999550020249566" y="37.12" z="99.95500337489875" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer1_module0_rotation" x="0.0" y="0.03" z="-1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer1_module0_rotation" x="0.0" y="-0.03" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer1_module1_position" x="2.999550020249566" y="-34.92" z="99.95500337489875" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer1_module1_rotation" x="0.0" y="0.03" z="-1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer1_module1_rotation" x="0.0" y="-0.03" z="-1.6707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer2_module0_position" x="3.2995050222745226" y="37.12" z="109.95050371238862" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer2_module0_rotation" x="0.0" y="3.1715899999999997" z="-4.812386326794897" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer2_module0_rotation" x="0.0" y="3.11159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_TestRunModule_layer2_module1_position" x="3.2995050222745226" y="-34.92" z="109.95050371238862" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer2_module1_rotation" x="0.0" y="3.1715899999999997" z="-4.712386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer2_module1_rotation" x="0.0" y="3.11159" z="-4.712386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer3_module0_position" x="5.999100040499132" y="35.94" z="199.9100067497975" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer3_module0_rotation" x="0.0" y="0.03" z="-1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer3_module0_rotation" x="0.0" y="-0.03" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer3_module1_position" x="5.999100040499132" y="-34.37" z="199.9100067497975" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer3_module1_rotation" x="0.0" y="0.03" z="-1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer3_module1_rotation" x="0.0" y="-0.03" z="-1.6707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer4_module0_position" x="6.299055042524088" y="35.94" z="209.9055070872874" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer4_module0_rotation" x="0.0" y="3.1715899999999997" z="-4.812386326794897" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer4_module0_rotation" x="0.0" y="3.11159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_TestRunModule_layer4_module1_position" x="6.299055042524088" y="-34.37" z="209.9055070872874" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer4_module1_rotation" x="0.0" y="3.1715899999999997" z="-4.712386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer4_module1_rotation" x="0.0" y="3.11159" z="-4.712386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer5_module0_position" x="8.998650060748698" y="35.0" z="299.86501012469625" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer5_module0_rotation" x="0.0" y="0.03" z="-1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer5_module0_rotation" x="0.0" y="-0.03" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer5_module1_position" x="8.998650060748698" y="-33.54" z="299.86501012469625" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer5_module1_rotation" x="0.0" y="0.03" z="-1.6707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer5_module1_rotation" x="0.0" y="-0.03" z="-1.6707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer6_module0_position" x="9.298605062773655" y="35.0" z="309.86051046218614" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.1715899999999997" z="-4.812386326794897" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer6_module0_rotation" x="0.0" y="3.11159" z="-4.812386326794897" unit="radian" />

       <position name="Tracker_TestRunModule_layer6_module1_position" x="9.298605062773655" y="-33.54" z="309.86051046218614" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.1715899999999997" z="-4.712386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer6_module1_rotation" x="0.0" y="3.11159" z="-4.712386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer7_module0_position" x="14.99775010124783" y="33.15" z="499.77501687449376" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="0.03" z="-1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer7_module0_rotation" x="0.0" y="-0.03" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer7_module1_position" x="14.99775010124783" y="-32.54" z="499.77501687449376" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="0.03" z="-1.6207963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer7_module1_rotation" x="0.0" y="-0.03" z="-1.6207963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer8_module0_position" x="15.297705103272786" y="33.15" z="509.77051721198364" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="3.1715899999999997" z="-4.762386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer8_module0_rotation" x="0.0" y="3.11159" z="-4.762386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer8_module1_position" x="15.297705103272786" y="-32.54" z="509.77051721198364" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="3.1715899999999997" z="-4.712386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer8_module1_rotation" x="0.0" y="3.11159" z="-4.712386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer9_module0_position" x="20.99685014174696" y="31.35" z="699.6850236242913" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="0.03" z="-1.5707963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer9_module0_rotation" x="0.0" y="-0.03" z="-1.5707963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer9_module1_position" x="20.99685014174696" y="-30.83" z="699.6850236242913" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="0.03" z="-1.6207963267948966" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer9_module1_rotation" x="0.0" y="-0.03" z="-1.6207963267948966" unit="radian" />

       <position name="Tracker_TestRunModule_layer10_module0_position" x="21.29680514377192" y="31.35" z="709.6805239617812" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="3.1715899999999997" z="-4.762386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer10_module0_rotation" x="0.0" y="3.11159" z="-4.762386326794896" unit="radian" />

       <position name="Tracker_TestRunModule_layer10_module1_position" x="21.29680514377192" y="-30.83" z="709.6805239617812" unit="mm" />

-      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="3.1715899999999997" z="-4.712386326794896" unit="radian" />

+      <rotation name="Tracker_TestRunModule_layer10_module1_rotation" x="0.0" y="3.11159" z="-4.712386326794896" unit="radian" />

       <position name="crystal1-1_pos_pos_bot" x="7.4747392753955415" y="-44.47473927539554" z="1604.1626281236922" unit="mm" />
       <rotation name="crystal1-1_rot_pos_bot" x="-0.0084372997827221" y="-0.0084372997827221" z="0.0" unit="radian" />
       <position name="crystal1-1_pos_neg_bot" x="-7.4747392753955415" y="-44.47473927539554" z="1604.1626281236922" unit="mm" />
CVSspam 0.2.12

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