Commit in hps-detectors/detectors/HPS-TestRun-v2 on MAIN
compact.xml+44-211.2 -> 1.3
Changed gap between Ecal top & bottom to 74mm from survey. Added extra length to the z-position of the Ecal from survey.
hps-detectors/detectors/HPS-TestRun-v2
compact.xml 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- compact.xml	8 May 2012 16:03:06 -0000	1.2
+++ compact.xml	11 May 2012 21:33:32 -0000	1.3
@@ -57,6 +57,27 @@

         <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" />
+    -->
+        <constant name="x1s" value="0.0" />
+        <constant name="x2s" value="0.0" />
+        <constant name="x3s" value="0.0" />
+        <constant name="x4s" value="0.0" />
+        <constant name="x5s" value="0.0" />

     
     </define>
     

@@ -91,51 +112,53 @@

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

-                <module_placement name="TestRunModule" id="0" x="100*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="2">

-                <module_placement name="TestRunModule" id="0" x="110*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="3">

-                <module_placement name="TestRunModule" id="0" x="200*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="4">

-                <module_placement name="TestRunModule" id="0" x="210*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="5">

-                <module_placement name="TestRunModule" id="0" x="300*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="6">

-                <module_placement name="TestRunModule" id="0" x="310*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="7">

-                <module_placement name="TestRunModule" id="0" x="500*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="8">

-                <module_placement name="TestRunModule" id="0" x="510*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="9">

-                <module_placement name="TestRunModule" id="0" x="700*sin(y_rot)" 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)" 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="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"/>

             </layer>
             <layer id="10">

-                <module_placement name="TestRunModule" id="0" x="710*sin(y_rot)" 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)" 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="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"/>

             </layer> 
         </detector>     
         <detector id="13" name="Ecal" type="HPSEcal3" insideTrackingVolume="false" readout="EcalHits" vis="ECALVis">
             <comment>The crystal ECal</comment>
             <material name="LeadTungstate" />
             <dimensions x1="ecal_front" y1="ecal_front" x2="ecal_back" y2="ecal_back" z="ecal_z" />

-            <layout beamgap="20.0*mm" nx="46" ny="5" dface="137.0*cm">

+          <!--  <layout beamgap="20.0*mm" nx="46" ny="5" dface="137.0*cm">-->
+          <!-- Measurements as found in installation by Stepan -->
+            <layout beamgap="37.0*mm" nx="46" ny="5" dface="152.4*cm">

                 <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" />
             </layout>
         </detector>
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