Print

Print


Commit in hps-detectors/detectors/HPS-TestRun-v5 on MAIN
compact.xml+619added 1.1
detector.properties+2added 1.1
SamplingFractions/Ecal.properties+1added 1.1
+622
3 added files
new testrun detector

hps-detectors/detectors/HPS-TestRun-v5
compact.xml added at 1.1
diff -N compact.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ compact.xml	3 Oct 2013 05:32:22 -0000	1.1
@@ -0,0 +1,619 @@
+
+<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
+       xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
+    
+    <info name="HPS-TestRun-v5">
+        <comment>HPS JLab Test Run detector</comment>
+    </info>
+
+    <define>
+    
+        <!-- world -->
+        <constant name="world_side" value="500.0*cm" />
+        <constant name="world_x" value="world_side" />
+        <constant name="world_y" value="world_side" />
+        <constant name="world_z" value="world_side" />
+        
+        <!-- tracking region -->
+        <constant name="tracking_region_radius" value="200.0*cm"/>
+        <constant name="tracking_region_min" value="5.0*cm"/>
+        <constant name="tracking_region_zmax" value="100.0*cm"/>
+         
+        <!--  dipole magnet and  B-field -->
+        <constant name="dipoleMagnetHeight" value="17.78*cm"/>
+        <constant name="dipoleMagnetWidth" value="41.6052*cm"/>
+        <constant name="startOfFieldZ" value="0"/>
+        <constant name="endOfFieldZ" value="99.5*cm"/>
+        <constant name="constBFieldY" value="-0.491"/>
+        
+        <!-- ECAL -->
+        <constant name="ecal_front" value="13.3/2*mm" />
+        <constant name="ecal_back" value="16/2*mm" />
+        <constant name="ecal_z" value="160/2*mm" />
+        <constant name="ecal_dx" value="41.27*mm" />
+                
+        <!-- SVT module dimensions -->
+        <constant name="moduleLength" value="100.0"/>
+        <constant name="moduleWidth" value="40.34"/>
+        
+        <!-- SVT sensor dimensions -->
+        <constant name="sensorLength" value="98.33"/>
+        
+        <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
+        <constant name="sensorWidth" value="38.3399"/>
+                
+        <!-- positions derived from drawing assuming 1.35/1.2 degress open on top/bottom -->
+
+        <constant name="x_rot_top" value="-0.0235619449" />  
+        <constant name="x_rot_bot" value="0.020943951" />    
+
+       <!--  monkey with the rotations  -->    
+      <constant name="x_rot_top_add" value="-0.002-0.000448" />  <!-- -ive means further closed -->
+      <constant name="x_rot_bot_add" value="0.002-0.000678" /> <!-- +ive means further closed -->
+      <!--  distance from target to pivot...this is from an email schematic from Tim on may 12, 2012 -->
+      <constant name="pivot" value="791" /> 
+      
+        <constant name="y_rot_top" value = "0.03"/> 
+        <constant name="y_rot_bot" value = "0.03"/> 
+        
+        <constant name="y_rot_top_pivot" value="-0.001369-0.000185"/>
+        <constant name="y_rot_bot_pivot" value="0.00336-0.000362"/>
+
+
+<!--        <constant name="x_off" value = "-15.0"/> -->
+        <constant name="x_off" value = "0.0"/> 
+
+        <!-- random alignment corrections -->
+        <constant name="y1t_misalign" value="0.0"/>
+        <constant name="y2t_misalign" value="0.0"/>
+        <constant name="y3t_misalign" value="0.0"/>
+        <constant name="y4t_misalign" value="0.0"/>
+        <constant name="y5t_misalign" value="0.0"/>
+        <constant name="y6t_misalign" value="0.0"/>
+        <constant name="y7t_misalign" value="0.0"/>
+        <constant name="y8t_misalign" value="0.0"/>
+        <constant name="y9t_misalign" value="0.0"/>
+        <constant name="y10t_misalign" value="0.0"/>
+        <constant name="y1b_misalign" value="0.0"/>
+        <constant name="y2b_misalign" value="0.0"/>
+        <constant name="y3b_misalign" value="0.0"/>
+        <constant name="y4b_misalign" value="0.0"/>
+        <constant name="y5b_misalign" value="0.0"/>
+        <constant name="y6b_misalign" value="0.0"/>
+        <constant name="y7b_misalign" value="0.0"/>
+        <constant name="y8b_misalign" value="0.0"/>
+        <constant name="y9b_misalign" value="0.0"/>
+        <constant name="y10b_misalign" value="0.0"/>
+
+        <!-- Positions of sensor centers above/below nominal beam -->
+        <constant name="y1t" value="36.894" />
+        <constant name="y2t" value="36.746" />
+        <constant name="y3t" value="35.833" />
+        <constant name="y4t" value="35.669" />
+        <constant name="y5t" value="34.984" />
+        <constant name="y6t" value="34.845" />
+        <constant name="y7t" value="33.359" />
+        <constant name="y8t" value="33.183" />
+        <constant name="y9t" value="31.764" />
+        <constant name="y10t" value="31.596" />
+        
+        <constant name="y1b" value="-34.787" />
+        <constant name="y2b" value="-34.633" />
+        <constant name="y3b" value="-34.346" />
+        <constant name="y4b" value="-34.179" />
+        <constant name="y5b" value="-33.842" />
+        <constant name="y6b" value="-33.700" />
+        <constant name="y7b" value="-32.766" />
+        <constant name="y8b" value="-32.595" />
+        <constant name="y9b" value="-31.217" />
+        <constant name="y10b" value="-31.052" />      
+ 
+        <!-- Positions of sensor centers along beam relative to nominal target position -->
+        <constant name="z1t" value="92.5-3.685-0.02" />
+        <constant name="z2t" value="92.5+3.685+0.083" />
+        <constant name="z3t" value="192.5-3.685+0.035" />
+        <constant name="z4t" value="192.5+3.685+0.049" />
+        <constant name="z5t" value="292.5-3.685-0.007" />
+        <constant name="z6t" value="292.5+3.685+0.032" />
+        <constant name="z7t" value="492.5-3.685-0.015" />
+        <constant name="z8t" value="492.5+3.685+0.009" />
+        <constant name="z9t" value="692.5-3.685-0.036" />
+        <constant name="z10t" value="692.5+3.685-0.063" />
+
+        <constant name="z1b" value="107.5-3.685-0.005" />
+        <constant name="z2b" value="107.5+3.685-0.018" />
+        <constant name="z3b" value="207.5-3.685+0.048" />
+        <constant name="z4b" value="207.5+3.685+0.028" />
+        <constant name="z5b" value="307.5-3.685-0.031" />
+        <constant name="z6b" value="307.5+3.685+0.032" />
+        <constant name="z7b" value="507.5-3.685+0.092" />
+        <constant name="z8b" value="507.5+3.685+0.009" />
+        <constant name="z9b" value="707.5-3.685-0.066" />
+        <constant name="z10b" value="707.5+3.685-0.043" />
+        
+        <!-- Lateral positions relative to nominal beamline -->
+        <constant name="x1t" value="-0.156" />
+        <constant name="x2t" value="-0.158" />
+        <constant name="x3t" value="-0.047" />
+        <constant name="x4t" value="-0.109" />
+        <constant name="x5t" value="-0.013" />
+        <constant name="x6t" value="-0.062" />
+        <constant name="x7t" value="-0.067" />
+        <constant name="x8t" value="-0.045" />
+        <constant name="x9t" value="-0.152" />
+        <constant name="x10t" value="0.020" />
+    
+        <constant name="x1b" value="-0.040" />
+        <constant name="x2b" value="0.054" />
+        <constant name="x3b" value="0.004" />
+        <constant name="x4b" value="0.081" />
+        <constant name="x5b" value="-0.087" />
+        <constant name="x6b" value="0.022" />
+        <constant name="x7b" value="-0.004" />
+        <constant name="x8b" value="-0.038" />
+        <constant name="x9b" value="-0.171" />
+        <constant name="x10b" value="-0.214" />
+    
+        <!-- Corrections to stereo angle -->
+        <constant name="a1t" value="-0.0000349065850398866" />
+        <constant name="a2t" value="-0.000122173047639603" />
+        <constant name="a3t" value="-0.000122173047639603" />
+        <constant name="a4t" value="-0.0000523598775598299" />
+        <constant name="a5t" value="0.000541052068118242" />
+        <constant name="a6t" value="0.000122173047639603" />
+        <constant name="a7t" value="-0.0000523598775598299" />
+        <constant name="a8t" value="-0.000261799387799149" />
+        <constant name="a9t" value="-0.000331612557878923" />
+        <constant name="a10t" value="-0.000401425727958696" />
+
+        <constant name="a1b" value="0.000174532925199433" />
+        <constant name="a2b" value="0.000296705972839036" />
+        <constant name="a3b" value="0.0000349065850398866" />
+        <constant name="a4b" value="0.000191986217719376" />
+        <constant name="a5b" value="-0.000349065850398866" />
+        <constant name="a6b" value="0.000314159265358979" />
+        <constant name="a7b" value="0.000523598775598299" />
+        <constant name="a8b" value="0.000471238898038469" />
+        <constant name="a9b" value="0.000541052068118242" />
+        <constant name="a10b" value="0.0000349065850398866" />
+
+        <!-- stereo angle -->
+        <constant name="st1t" value="-1.5707963267948966-a1t" />
+        <constant name="st1b" value="-1.6707963267948966-a1b" />
+        <constant name="st3t" value="-1.5707963267948966-a3t" />
+        <constant name="st3b" value="-1.6707963267948966-a3b" />
+        <constant name="st5t" value="-1.5707963267948966-a5t" />
+        <constant name="st5b" value="-1.6707963267948966-a5b" />
+        <constant name="st7t" value="-1.5707963267948966-a7t" />
+        <constant name="st7b" value="-1.6207963267948966-a7b" />
+        <constant name="st9t" value="-1.5707963267948966-a9t" />
+        <constant name="st9b" value="-1.6207963267948966-a9b" />        
+        <constant name="st2t" value="-4.812386326794897-a2t" />
+        <constant name="st2b" value="-4.712386326794896-a2b" />
+        <constant name="st4t" value="-4.812386326794897-a4t" />
+        <constant name="st4b" value="-4.712386326794896-a4b" />
+        <constant name="st6t" value="-4.812386326794897-a6t" />
+        <constant name="st6b" value="-4.712386326794896-a6b" />
+        <constant name="st8t" value="-4.762386326794896-a8t" />
+        <constant name="st8b" value="-4.712386326794896-a8b" />
+        <constant name="st10t" value="-4.762386326794896-a10t" />
+        <constant name="st10b" value="-4.712386326794896-a10b" />
+        
+        
+        <!-- Sensor positions and rotations-->
+        <constant name="mod_x1t" value="z1t*sin(y_rot_top)+(x1t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y1t" value="y1t+y1t_misalign+(pivot-z1t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z1t" value="z1t*cos(y_rot_top)-(x1t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx1t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry1t" value="-y_rot_top"/>
+        <constant name="mod_rz1t" value="st1t"/>
+            
+        <constant name="mod_x1b" value="z1b*sin(y_rot_bot)+(x1b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y1b" value="y1b+y1b_misalign+(pivot-z1b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z1b" value="z1b*cos(y_rot_bot)-(x1b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx1b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry1b" value="-y_rot_bot"/>
+        <constant name="mod_rz1b" value="st1b"/>
+        
+        <constant name="mod_x2t" value="z2t*sin(y_rot_top)+(x2t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y2t" value="y2t+y2t_misalign+(pivot-z2t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z2t" value="z2t*cos(y_rot_top)-(x2t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx2t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry2t" value="3.14159-y_rot_top"/>
+        <constant name="mod_rz2t" value="st2t"/>
+        
+        <constant name="mod_x2b" value="z2b*sin(y_rot_bot)+(x2b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y2b" value="y2b+y2b_misalign+(pivot-z2b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z2b" value="z2b*cos(y_rot_bot)-(x2b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx2b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry2b" value="3.14159-y_rot_bot"/>
+        <constant name="mod_rz2b" value="st2b"/>
+
+
+        <constant name="mod_x3t" value="z3t*sin(y_rot_top)+(x3t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y3t" value="y3t+y3t_misalign+(pivot-z3t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z3t" value="z3t*cos(y_rot_top)-(x3t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx3t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry3t" value="-y_rot_top"/>
+        <constant name="mod_rz3t" value="st3t"/>
+            
+        <constant name="mod_x3b" value="z3b*sin(y_rot_bot)+(x3b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y3b" value="y3b+y3b_misalign+(pivot-z3b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z3b" value="z3b*cos(y_rot_bot)-(x3b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx3b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry3b" value="-y_rot_bot"/>
+        <constant name="mod_rz3b" value="st3b"/>
+
+
+        <constant name="mod_x4t" value="z4t*sin(y_rot_top)+(x4t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y4t" value="y4t+y4t_misalign+(pivot-z4t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z4t" value="z4t*cos(y_rot_top)-(x4t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx4t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry4t" value="3.14159-y_rot_top"/>
+        <constant name="mod_rz4t" value="st4t"/>
+        
+        <constant name="mod_x4b" value="z4b*sin(y_rot_bot)+(x4b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y4b" value="y4b+y4b_misalign+(pivot-z4b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z4b" value="z4b*cos(y_rot_bot)-(x4b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx4b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry4b" value="3.14159-y_rot_bot"/>
+        <constant name="mod_rz4b" value="st4b"/>
+
+        <constant name="mod_x5t" value="z5t*sin(y_rot_top)+(x5t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y5t" value="y5t+y5t_misalign+(pivot-z5t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z5t" value="z5t*cos(y_rot_top)-(x5t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx5t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry5t" value="-y_rot_top"/>
+        <constant name="mod_rz5t" value="st5t"/>
+            
+        <constant name="mod_x5b" value="z5b*sin(y_rot_bot)+(x5b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y5b" value="y5b+y5b_misalign+(pivot-z5b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z5b" value="z5b*cos(y_rot_bot)-(x5b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx5b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry5b" value="-y_rot_bot"/>
+        <constant name="mod_rz5b" value="st5b"/>
+
+        <constant name="mod_x6t" value="z6t*sin(y_rot_top)+(x6t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y6t" value="y6t+y6t_misalign+(pivot-z6t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z6t" value="z6t*cos(y_rot_top)-(x6t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx6t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry6t" value="3.14159-y_rot_top"/>
+        <constant name="mod_rz6t" value="st6t"/>
+        
+        <constant name="mod_x6b" value="z6b*sin(y_rot_bot)+(x6b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y6b" value="y6b+y6b_misalign+(pivot-z6b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z6b" value="z6b*cos(y_rot_bot)-(x6b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx6b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry6b" value="3.14159-y_rot_bot"/>
+        <constant name="mod_rz6b" value="st6b"/>
+
+        <constant name="mod_x7t" value="z7t*sin(y_rot_top)+(x7t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y7t" value="y7t+y7t_misalign+(pivot-z7t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z7t" value="z7t*cos(y_rot_top)-(x7t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx7t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry7t" value="-y_rot_top"/>
+        <constant name="mod_rz7t" value="st7t"/>
+            
+        <constant name="mod_x7b" value="z7b*sin(y_rot_bot)+(x7b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y7b" value="y7b+y7b_misalign+(pivot-z7b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z7b" value="z7b*cos(y_rot_bot)-(x7b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx7b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry7b" value="-y_rot_bot"/>
+        <constant name="mod_rz7b" value="st7b"/>
+
+        <constant name="mod_x8t" value="z8t*sin(y_rot_top)+(x8t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y8t" value="y8t+y8t_misalign+(pivot-z8t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z8t" value="z8t*cos(y_rot_top)-(x8t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx8t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry8t" value="3.14159-y_rot_top"/>
+        <constant name="mod_rz8t" value="st8t"/>
+        
+        <constant name="mod_x8b" value="z8b*sin(y_rot_bot)+(x8b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y8b" value="y8b+y8b_misalign+(pivot-z8b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z8b" value="z8b*cos(y_rot_bot)-(x8b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx8b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry8b" value="3.14159-y_rot_bot"/>
+        <constant name="mod_rz8b" value="st8b"/>
+
+        <constant name="mod_x9t" value="z9t*sin(y_rot_top)+(x9t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y9t" value="y9t+y9t_misalign+(pivot-z9t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z9t" value="z9t*cos(y_rot_top)-(x9t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx9t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry9t" value="-y_rot_top"/>
+        <constant name="mod_rz9t" value="st9t"/>
+            
+        <constant name="mod_x9b" value="z9b*sin(y_rot_bot)+(x9b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y9b" value="y9b+y9b_misalign+(pivot-z9b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z9b" value="z9b*cos(y_rot_bot)-(x9b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx9b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry9b" value="-y_rot_bot"/>
+        <constant name="mod_rz9b" value="st9b"/>
+
+        <constant name="mod_x10t" value="z10t*sin(y_rot_top)+(x10t+x_off)*cos(y_rot_top)"/>
+        <constant name="mod_y10t" value="y10t+y10t_misalign+(pivot-z10t)*sin(x_rot_top_add)"/>
+        <constant name="mod_z10t" value="z10t*cos(y_rot_top)-(x10t+x_off)*sin(y_rot_top)"/>
+        <constant name="mod_rx10t" value="x_rot_top+x_rot_top_add"/>
+        <constant name="mod_ry10t" value="3.14159-y_rot_top"/>
+        <constant name="mod_rz10t" value="st10t"/>
+        
+        <constant name="mod_x10b" value="z10b*sin(y_rot_bot)+(x10b+x_off)*cos(y_rot_bot)"/>
+        <constant name="mod_y10b" value="y10b+y10b_misalign+(pivot-z10b)*sin(x_rot_bot_add)"/>
+        <constant name="mod_z10b" value="z10b*cos(y_rot_bot)-(x10b+x_off)*sin(y_rot_bot)"/>
+        <constant name="mod_rx10b" value="x_rot_bot+x_rot_bot_add"/>
+        <constant name="mod_ry10b" value="3.14159-y_rot_bot"/>
+        <constant name="mod_rz10b" value="st10b"/>
+        
+        
+        <constant name="mod2_x1t" value="mod_x1t+(pivot-mod_z1t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y1t" value="mod_y1t"/>
+        <constant name="mod2_z1t" value="mod_z1t-(pivot-mod_z1t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx1t" value="mod_rx1t"/>
+        <constant name="mod2_ry1t" value="mod_ry1t+y_rot_top_pivot"/>
+        <constant name="mod2_rz1t" value="mod_rz1t"/>
+
+        <constant name="mod2_x1b" value="mod_x1b+(pivot-mod_z1b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y1b" value="mod_y1b"/>
+        <constant name="mod2_z1b" value="mod_z1b-(pivot-mod_z1b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx1b" value="mod_rx1b"/>
+        <constant name="mod2_ry1b" value="mod_ry1b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz1b" value="mod_rz1b"/>
+
+        <constant name="mod2_x2t" value="mod_x2t+(pivot-mod_z2t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y2t" value="mod_y2t"/>
+        <constant name="mod2_z2t" value="mod_z2t-(pivot-mod_z2t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx2t" value="mod_rx2t"/>
+        <constant name="mod2_ry2t" value="mod_ry2t+y_rot_top_pivot"/>
+        <constant name="mod2_rz2t" value="mod_rz2t"/>
+
+        <constant name="mod2_x2b" value="mod_x2b+(pivot-mod_z2b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y2b" value="mod_y2b"/>
+        <constant name="mod2_z2b" value="mod_z2b-(pivot-mod_z2b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx2b" value="mod_rx2b"/>
+        <constant name="mod2_ry2b" value="mod_ry2b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz2b" value="mod_rz2b"/>
+
+        <constant name="mod2_x3t" value="mod_x3t+(pivot-mod_z3t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y3t" value="mod_y3t"/>
+        <constant name="mod2_z3t" value="mod_z3t-(pivot-mod_z3t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx3t" value="mod_rx3t"/>
+        <constant name="mod2_ry3t" value="mod_ry3t+y_rot_top_pivot"/>
+        <constant name="mod2_rz3t" value="mod_rz3t"/>
+
+        <constant name="mod2_x3b" value="mod_x3b+(pivot-mod_z3b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y3b" value="mod_y3b"/>
+        <constant name="mod2_z3b" value="mod_z3b-(pivot-mod_z3b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx3b" value="mod_rx3b"/>
+        <constant name="mod2_ry3b" value="mod_ry3b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz3b" value="mod_rz3b"/>
+
+        <constant name="mod2_x4t" value="mod_x4t+(pivot-mod_z4t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y4t" value="mod_y4t"/>
+        <constant name="mod2_z4t" value="mod_z4t-(pivot-mod_z4t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx4t" value="mod_rx4t"/>
+        <constant name="mod2_ry4t" value="mod_ry4t+y_rot_top_pivot"/>
+        <constant name="mod2_rz4t" value="mod_rz4t"/>
+
+        <constant name="mod2_x4b" value="mod_x4b+(pivot-mod_z4b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y4b" value="mod_y4b"/>
+        <constant name="mod2_z4b" value="mod_z4b-(pivot-mod_z4b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx4b" value="mod_rx4b"/>
+        <constant name="mod2_ry4b" value="mod_ry4b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz4b" value="mod_rz4b"/>
+
+        <constant name="mod2_x5t" value="mod_x5t+(pivot-mod_z5t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y5t" value="mod_y5t"/>
+        <constant name="mod2_z5t" value="mod_z5t-(pivot-mod_z5t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx5t" value="mod_rx5t"/>
+        <constant name="mod2_ry5t" value="mod_ry5t+y_rot_top_pivot"/>
+        <constant name="mod2_rz5t" value="mod_rz5t"/>
+
+        <constant name="mod2_x5b" value="mod_x5b+(pivot-mod_z5b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y5b" value="mod_y5b"/>
+        <constant name="mod2_z5b" value="mod_z5b-(pivot-mod_z5b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx5b" value="mod_rx5b"/>
+        <constant name="mod2_ry5b" value="mod_ry5b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz5b" value="mod_rz5b"/>
+
+        <constant name="mod2_x6t" value="mod_x6t+(pivot-mod_z6t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y6t" value="mod_y6t"/>
+        <constant name="mod2_z6t" value="mod_z6t-(pivot-mod_z6t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx6t" value="mod_rx6t"/>
+        <constant name="mod2_ry6t" value="mod_ry6t+y_rot_top_pivot"/>
+        <constant name="mod2_rz6t" value="mod_rz6t"/>
+
+        <constant name="mod2_x6b" value="mod_x6b+(pivot-mod_z6b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y6b" value="mod_y6b"/>
+        <constant name="mod2_z6b" value="mod_z6b-(pivot-mod_z6b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx6b" value="mod_rx6b"/>
+        <constant name="mod2_ry6b" value="mod_ry6b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz6b" value="mod_rz6b"/>
+    
+        <constant name="mod2_x7t" value="mod_x7t+(pivot-mod_z7t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y7t" value="mod_y7t"/>
+        <constant name="mod2_z7t" value="mod_z7t-(pivot-mod_z7t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx7t" value="mod_rx7t"/>
+        <constant name="mod2_ry7t" value="mod_ry7t+y_rot_top_pivot"/>
+        <constant name="mod2_rz7t" value="mod_rz7t"/>
+
+        <constant name="mod2_x7b" value="mod_x7b+(pivot-mod_z7b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y7b" value="mod_y7b"/>
+        <constant name="mod2_z7b" value="mod_z7b-(pivot-mod_z7b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx7b" value="mod_rx7b"/>
+        <constant name="mod2_ry7b" value="mod_ry7b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz7b" value="mod_rz7b"/>
+
+        <constant name="mod2_x8t" value="mod_x8t+(pivot-mod_z8t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y8t" value="mod_y8t"/>
+        <constant name="mod2_z8t" value="mod_z8t-(pivot-mod_z8t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx8t" value="mod_rx8t"/>
+        <constant name="mod2_ry8t" value="mod_ry8t+y_rot_top_pivot"/>
+        <constant name="mod2_rz8t" value="mod_rz8t"/>
+
+        <constant name="mod2_x8b" value="mod_x8b+(pivot-mod_z8b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y8b" value="mod_y8b"/>
+        <constant name="mod2_z8b" value="mod_z8b-(pivot-mod_z8b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx8b" value="mod_rx8b"/>
+        <constant name="mod2_ry8b" value="mod_ry8b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz8b" value="mod_rz8b"/>
+
+        <constant name="mod2_x9t" value="mod_x9t+(pivot-mod_z9t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y9t" value="mod_y9t"/>
+        <constant name="mod2_z9t" value="mod_z9t-(pivot-mod_z9t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx9t" value="mod_rx9t"/>
+        <constant name="mod2_ry9t" value="mod_ry9t+y_rot_top_pivot"/>
+        <constant name="mod2_rz9t" value="mod_rz9t"/>
+
+        <constant name="mod2_x9b" value="mod_x9b+(pivot-mod_z9b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y9b" value="mod_y9b"/>
+        <constant name="mod2_z9b" value="mod_z9b-(pivot-mod_z9b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx9b" value="mod_rx9b"/>
+        <constant name="mod2_ry9b" value="mod_ry9b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz9b" value="mod_rz9b"/>
+
+        <constant name="mod2_x10t" value="mod_x10t+(pivot-mod_z10t)*sin(y_rot_top_pivot)"/>
+        <constant name="mod2_y10t" value="mod_y10t"/>
+        <constant name="mod2_z10t" value="mod_z10t-(pivot-mod_z10t)*(cos(y_rot_top_pivot)-1)"/>
+        <constant name="mod2_rx10t" value="mod_rx10t"/>
+        <constant name="mod2_ry10t" value="mod_ry10t+y_rot_top_pivot"/>
+        <constant name="mod2_rz10t" value="mod_rz10t"/>
+
+        <constant name="mod2_x10b" value="mod_x10b+(pivot-mod_z10b)*sin(y_rot_bot_pivot)"/>
+        <constant name="mod2_y10b" value="mod_y10b"/>
+        <constant name="mod2_z10b" value="mod_z10b-(pivot-mod_z10b)*(cos(y_rot_bot_pivot)-1)"/>
+        <constant name="mod2_rx10b" value="mod_rx10b"/>
+        <constant name="mod2_ry10b" value="mod_ry10b+y_rot_bot_pivot"/>
+        <constant name="mod2_rz10b" value="mod_rz10b"/>
+    
+    </define>
+    
+    <materials>      
+    	<!-- Set the world material to vacuum. -->
+        <material name="WorldMaterial">
+            <D type="density" unit="g/cm3" value="0.0000000000000001"/>
+            <fraction n="1.0" ref="Vacuum" />
+        </material>
+        <!-- Set tracking material to vacuum. -->
+        <material name="TrackingMaterial">
+            <D type="density" unit="g/cm3" value="0.0000000000000001"/>
+            <fraction n="1.0" ref="Vacuum" />
+        </material>
+        <!-- ECal crystal material. -->
+        <material name="LeadTungstate">
+            <D value="8.28" unit="g/cm3"/>
+            <composite n="1" ref="Pb"/>
+            <composite n="1" ref="W"/>
+            <composite n="4" ref="O"/>
+        </material>
+    </materials>
+
+    <display>
+        <vis name="ECALVis" r="0.8" g="0.5" b="0.1" />
+    </display>
+      
+    <detectors>
+        <detector id="1" name="Tracker" type="HPSTracker2" readout="TrackerHits" combineHits="true">
+            <comment>The Silicon Vertex Tracker</comment>
+            <module name="TestRunModule">
+                <box x="moduleLength" y="moduleWidth" />
+                <module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
+                    <dimensions x="sensorLength" y="sensorWidth" /> 
+                </module_component>
+                <module_component thickness="0.02*cm" material = "Carbon" sensitive="false"/> 
+            </module>       
+            
+            <layer id="1">
+                <module_placement name="TestRunModule" id="0" x="mod2_x1t" y="mod2_y1t" z="mod2_z1t" rx="mod2_rx1t" ry="mod2_ry1t" rz="mod2_rz1t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x1b" y="mod2_y1b" z="mod2_z1b" rx="mod2_rx1b" ry="mod2_ry1b" rz="mod2_rz1b"/>
+            </layer>
+            <layer id="2">
+                <module_placement name="TestRunModule" id="0" x="mod2_x2t" y="mod2_y2t" z="mod2_z2t" rx="mod2_rx2t" ry="mod2_ry2t" rz="mod2_rz2t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x2b" y="mod2_y2b" z="mod2_z2b" rx="mod2_rx2b" ry="mod2_ry2b" rz="mod2_rz2b"/>
+            </layer>
+            <layer id="3">
+                <module_placement name="TestRunModule" id="0" x="mod2_x3t" y="mod2_y3t" z="mod2_z3t" rx="mod2_rx3t" ry="mod2_ry3t" rz="mod2_rz3t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x3b" y="mod2_y3b" z="mod2_z3b" rx="mod2_rx3b" ry="mod2_ry3b" rz="mod2_rz3b"/>
+            </layer>
+            <layer id="4">
+                <module_placement name="TestRunModule" id="0" x="mod2_x4t" y="mod2_y4t" z="mod2_z4t" rx="mod2_rx4t" ry="mod2_ry4t" rz="mod2_rz4t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x4b" y="mod2_y4b" z="mod2_z4b" rx="mod2_rx4b" ry="mod2_ry4b" rz="mod2_rz4b"/>
+            </layer>
+            <layer id="5">
+                <module_placement name="TestRunModule" id="0" x="mod2_x5t" y="mod2_y5t" z="mod2_z5t" rx="mod2_rx5t" ry="mod2_ry5t" rz="mod2_rz5t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x5b" y="mod2_y5b" z="mod2_z5b" rx="mod2_rx5b" ry="mod2_ry5b" rz="mod2_rz5b"/>
+            </layer>
+            <layer id="6">
+                <module_placement name="TestRunModule" id="0" x="mod2_x6t" y="mod2_y6t" z="mod2_z6t" rx="mod2_rx6t" ry="mod2_ry6t" rz="mod2_rz6t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x6b" y="mod2_y6b" z="mod2_z6b" rx="mod2_rx6b" ry="mod2_ry6b" rz="mod2_rz6b"/>
+            </layer>
+            <layer id="7">
+                <module_placement name="TestRunModule" id="0" x="mod2_x7t" y="mod2_y7t" z="mod2_z7t" rx="mod2_rx7t" ry="mod2_ry7t" rz="mod2_rz7t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x7b" y="mod2_y7b" z="mod2_z7b" rx="mod2_rx7b" ry="mod2_ry7b" rz="mod2_rz7b"/>
+            </layer>
+            <layer id="8">
+                <module_placement name="TestRunModule" id="0" x="mod2_x8t" y="mod2_y8t" z="mod2_z8t" rx="mod2_rx8t" ry="mod2_ry8t" rz="mod2_rz8t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x8b" y="mod2_y8b" z="mod2_z8b" rx="mod2_rx8b" ry="mod2_ry8b" rz="mod2_rz8b"/>
+            </layer>
+            <layer id="9">
+                <module_placement name="TestRunModule" id="0" x="mod2_x9t" y="mod2_y9t" z="mod2_z9t" rx="mod2_rx9t" ry="mod2_ry9t" rz="mod2_rz9t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x9b" y="mod2_y9b" z="mod2_z9b" rx="mod2_rx9b" ry="mod2_ry9b" rz="mod2_rz9b"/>
+            </layer>
+            <layer id="10">
+                <module_placement name="TestRunModule" id="0" x="mod2_x10t" y="mod2_y10t" z="mod2_z10t" rx="mod2_rx10t" ry="mod2_ry10t" rz="mod2_rz10t"/>
+                <module_placement name="TestRunModule" id="1" x="mod2_x10b" y="mod2_y10b" z="mod2_z10b" rx="mod2_rx10b" ry="mod2_ry10b" rz="mod2_rz10b"/>
+            </layer> 
+        </detector>     
+        
+        <detector id="99" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsThin" >
+            <comment>The Silicon Vertex Tracker</comment>
+            <module name="TestRunModuleFieldDef">
+                <box x="dipoleMagnetWidth*4+1" y="dipoleMagnetHeight*4+1" />
+                <module_component thickness="0.000000001*cm" material = "Vacuum" sensitive="false">
+                    <dimensions x="dipoleMagnetWidth*4" y="dipoleMagnetHeight*4" /> 
+                </module_component>
+                <module_component thickness="0.000000001*cm" material = "Vacuum" sensitive="false"/> 
+            </module>            
+            <layer id="1">
+                <module_placement name="TestRunModuleFieldDef" id="0" x="0" y="0" z="startOfFieldZ" rx="0" ry="0" rz="-PI/2"/>
+            </layer>
+            <layer id="2">
+                <module_placement name="TestRunModuleFieldDef" id="0" x="0" y="0" z="endOfFieldZ" rx="0" ry="0" rz="-PI/2"/>
+			</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" />
+            <!-- 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" />
+                <top dx="ecal_dx" dy="0." dz="0."/>
+                <bottom dx="ecal_dx" dy="0." dz="0."/>
+            </layout>
+        </detector>
+    </detectors>
+    
+    <readouts>   
+        <readout name="TrackerHits">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+        </readout>
+        <readout name="TrackerHitsThin">
+            <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id> 
+        </readout>
+        
+        <readout name="EcalHits">
+            <segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
+            <id>system:6,layer:2,ix:-8,iy:-6</id>
+        </readout>
+    </readouts>
+
+    <fields>
+        <field type="BoxDipole" name="AnalyzingDipole" x="0*cm" y="0*cm" z="endOfFieldZ/2.0" dx="dipoleMagnetWidth/2.0" dy="dipoleMagnetHeight/2.0" dz="endOfFieldZ/2.0" bx="0.0" by="constBFieldY" bz="0.0" />
+    </fields>
+ 
+    <includes>
+        <gdmlFile ref="http://www.lcsim.org/test/gdml/testRunDownstreamVacuumFlange.gdml" />
+    </includes>
+
+</lccdd>

hps-detectors/detectors/HPS-TestRun-v5
detector.properties added at 1.1
diff -N detector.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ detector.properties	3 Oct 2013 05:32:22 -0000	1.1
@@ -0,0 +1,2 @@
+name: HPS-TestRun-v5
+ConditionsReader: org.lcsim.hps.conditions.TestRunConditionsReader
\ No newline at end of file

hps-detectors/detectors/HPS-TestRun-v5/SamplingFractions
Ecal.properties added at 1.1
diff -N Ecal.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Ecal.properties	3 Oct 2013 05:32:22 -0000	1.1
@@ -0,0 +1 @@
+samplingFraction: 1.0
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