 |
 |
| Commit in hps-detectors/detectors on MAIN | |||
| HPS-Proposal2014-v5-2pt2/compact.xml | +356 | added 1.1 | |
| /detector.properties | +2 | added 1.1 | |
| HPS-Proposal2014-v5-2pt2/SamplingFractions/Ecal.properties | +1 | added 1.1 | |
| HPS-Proposal2014-v3-2pt2-0zOffset/HPS-Proposal2014-v3-2pt2-0zOffset.lcdd | +63 | -54 | 1.5 -> 1.6 |
| /compact.xml | +28 | -71 | 1.7 -> 1.8 |
| +450 | -125 | ||
Adding new detector with field def
diff -N compact.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ compact.xml 3 Oct 2013 04:33:09 -0000 1.1 @@ -0,0 +1,356 @@
+ +<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-Proposal2014-v5-2pt2"> + <comment>HPS detector for 2014 proposal @ 2.2GeV</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" /> + + <!-- beam --> + <constant name="beam_angle" value="0.03052"/> <!--30.52 mrad--> + + <!-- 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="131.8*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.5"/> + + + <!-- ECAL crystal dimensions --> + <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" /> + + <!-- ECal position --> + <constant name="ecal_dface" value="139.3*cm"/> + + <!-- 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"/> + <constant name="zst" value="1" /> + <constant name="SA1" value="0.1" /> + <constant name="SA2" value="0.05" /> + <constant name="PI" value="3.14159265359" /> + <!-- positions derived from drawing assuming 1.35/1.2 degress open on top/bottom --> + + <constant name="x_rot_top" value="0" /> + <constant name="x_rot_bot" value="0" /> + + <!-- monkey with the rotations --> + <constant name="x_rot_top_add" value="0.00" /> <!-- -ive means further closed --> + <constant name="x_rot_bot_add" value="0.00" /> <!-- +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" value = "beam_angle"/> + <!-- <constant name="x_off" value = "-15.0"/> --> + <constant name="x_off" value = "0.0"/> + + <constant name="xtar" value="0" /> + <constant name="ytar" value="0" /> + <constant name="ztar" value="0" /> + <!-- Positions of sensor centers above/below nominal beam --> + <!-- these are the nominal (15mrad) --> + <constant name="y1t" value="100*sin(0.015)+sensorWidth/2" /> + <constant name="y2t" value="100*sin(0.015)+sensorWidth/2" /> + <constant name="y3t" value="200*sin(0.015)+sensorWidth/2" /> + <constant name="y4t" value="200*sin(0.015)+sensorWidth/2" /> + <constant name="y5t" value="300*sin(0.015)+sensorWidth/2" /> + <constant name="y6t" value="300*sin(0.015)+sensorWidth/2" /> + <constant name="y7t" value="500*sin(0.015)+sensorWidth/2" /> + <constant name="y8t" value="500*sin(0.015)+sensorWidth/2" /> + <constant name="y9t" value="700*sin(0.015)+sensorWidth/2" /> + <constant name="y10t" value="700*sin(0.015)+sensorWidth/2" /> + <constant name="y11t" value="900*sin(0.015)+sensorWidth/2" /> + <constant name="y12t" value="900*sin(0.015)+sensorWidth/2" /> + + <constant name="y1b" value="-(100*sin(0.015)+sensorWidth/2)" /> + <constant name="y2b" value="-(100*sin(0.015)+sensorWidth/2)" /> + <constant name="y3b" value="-(200*sin(0.015)+sensorWidth/2)" /> + <constant name="y4b" value="-(200*sin(0.015)+sensorWidth/2)" /> + <constant name="y5b" value="-(300*sin(0.015)+sensorWidth/2)" /> + <constant name="y6b" value="-(300*sin(0.015)+sensorWidth/2)" /> + <constant name="y7b" value="-(500*sin(0.015)+sensorWidth/2)" /> + <constant name="y8b" value="-(500*sin(0.015)+sensorWidth/2)" /> + <constant name="y9b" value="-(700*sin(0.015)+sensorWidth/2)" /> + <constant name="y10b" value="-(700*sin(0.015)+sensorWidth/2)" /> + <constant name="y11b" value="-(900*sin(0.015)+sensorWidth/2)" /> + <constant name="y12b" value="-(900*sin(0.015)+sensorWidth/2)" /> + + <!-- Positions of sensor centers along beam relative to nominal target position --> + <constant name="z1t" value="0+92.5-3.685" /> + <constant name="z2t" value="0+92.5+3.685" /> + <constant name="z3t" value="0+192.5-3.685" /> + <constant name="z4t" value="0+192.5+3.685" /> + <constant name="z5t" value="0+292.5-3.685" /> + <constant name="z6t" value="0+292.5+3.685" /> + <constant name="z7t" value="0+492.5-3.685" /> + <constant name="z8t" value="0+492.5+3.685" /> + <constant name="z9t" value="0+692.5-3.685" /> + <constant name="z10t" value="0+692.5+3.685" /> + <constant name="z11t" value="0+892.5-3.685" /> + <constant name="z12t" value="0+892.5+3.685" /> + + <constant name="z1b" value="0+107.5-3.685" /> + <constant name="z2b" value="0+107.5+3.685" /> + <constant name="z3b" value="0+207.5-3.685" /> + <constant name="z4b" value="0+207.5+3.685" /> + <constant name="z5b" value="0+307.5-3.685" /> + <constant name="z6b" value="0+307.5+3.685" /> + <constant name="z7b" value="0+507.5-3.685" /> + <constant name="z8b" value="0+507.5+3.685" /> + <constant name="z9b" value="0+707.5-3.685" /> + <constant name="z10b" value="0+707.5+3.685" /> + <constant name="z11b" value="0+907.5-3.685" /> + <constant name="z12b" value="0+907.5+3.685" /> + + <!-- Lateral positions relative to nominal beamline --> + <constant name="x1t" value="0" /> + <constant name="x2t" value="0" /> + <constant name="x3t" value="0" /> + <constant name="x4t" value="0" /> + <constant name="x5t" value="0" /> + <constant name="x6t" value="0" /> + <constant name="x7t" value="0" /> + <constant name="x8t" value="0" /> + <constant name="x9t" value="0" /> + <constant name="x10t" value="0" /> + <constant name="x11t" value="0" /> + <constant name="x12t" value="0" /> + + <constant name="x1b" value="0" /> + <constant name="x2b" value="0" /> + <constant name="x3b" value="0" /> + <constant name="x4b" value="0" /> + <constant name="x5b" value="0" /> + <constant name="x6b" value="0" /> + <constant name="x7b" value="0" /> + <constant name="x8b" value="0" /> + <constant name="x9b" value="0" /> + <constant name="x10b" value="0" /> + <constant name="x11b" value="0" /> + <constant name="x12b" value="0" /> + + <!-- Corrections to stereo angle --> + <constant name="a1t" value="0" /> + <constant name="a2t" value="0" /> + <constant name="a3t" value="0" /> + <constant name="a4t" value="0" /> + <constant name="a5t" value="0" /> + <constant name="a6t" value="0" /> + <constant name="a7t" value="0" /> + <constant name="a8t" value="0" /> + <constant name="a9t" value="0" /> + <constant name="a10t" value="0" /> + <constant name="a11t" value="0" /> + <constant name="a12t" value="0" /> + + <constant name="a1b" value="0" /> + <constant name="a2b" value="0." /> + <constant name="a3b" value="0" /> + <constant name="a4b" value="0" /> + <constant name="a5b" value="0" /> + <constant name="a6b" value="0" /> + <constant name="a7b" value="0" /> + <constant name="a8b" value="0" /> + <constant name="a9b" value="0" /> + <constant name="a10b" value="0" /> + <constant name="a11b" value="0" /> + <constant name="a12b" value="0" /> + + </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="10" name="Target" type="HPSTracker2" reflect="false" combineHits="true" insideTrackingVolume="true"> + <comment>The HPS Target</comment> + <module name="TungstenTarget"> + <box x="10.0" y="10.0" /> + <module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/> + </module> + <layer id="99"> + <module_placement name="TungstenTarget" id="0" x="xtar" y="ytar" z="ztar" rx="0" ry="y_rot" rz="0"/> + </layer> + </detector> + --> + <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.0084*cm" material = "Carbon" sensitive="false"/> + </module> + <layer id="1"> + <module_placement name="TestRunModule" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" z="z1t*cos(y_rot)-(x1t+x_off)*sin(y_rot)" rx="x_rot_top+x_rot_top_add" ry="-y_rot" rz="-PI/2-a1t"/> + <module_placement name="TestRunModule" id="1" x="z1b*sin(y_rot)+(x1b+x_off)*cos(y_rot)" y="y1b" z="z1b*cos(y_rot)-(x1b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a1b"/> + </layer> + <layer id="2"> + <module_placement name="TestRunModule" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="z2t*cos(y_rot)-(x2t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a2t"/> + <module_placement name="TestRunModule" id="1" x="z2b*sin(y_rot)+(x2b+x_off)*cos(y_rot)" y="y2b" z="z2b*cos(y_rot)-(x2b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a2b"/> + </layer> + <layer id="3"> + <module_placement name="TestRunModule" id="0" x="z3t*sin(y_rot)+(x3t+x_off)*cos(y_rot)" y="y3t" z="z3t*cos(y_rot)-(x3t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a3t"/> + <module_placement name="TestRunModule" id="1" x="z3b*sin(y_rot)+(x3b+x_off)*cos(y_rot)" y="y3b" z="z3b*cos(y_rot)-(x3b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a3b"/> + </layer> + <layer id="4"> + <module_placement name="TestRunModule" id="0" x="z4t*sin(y_rot)+(x4t+x_off)*cos(y_rot)" y="y4t" z="z4t*cos(y_rot)-(x4t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a4t"/> + <module_placement name="TestRunModule" id="1" x="z4b*sin(y_rot)+(x4b+x_off)*cos(y_rot)" y="y4b" z="z4b*cos(y_rot)-(x4b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a4b"/> + </layer> + <layer id="5"> + <module_placement name="TestRunModule" id="0" x="z5t*sin(y_rot)+(x5t+x_off)*cos(y_rot)" y="y5t" z="z5t*cos(y_rot)-(x5t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a5t"/> + <module_placement name="TestRunModule" id="1" x="z5b*sin(y_rot)+(x5b+x_off)*cos(y_rot)" y="y5b" z="z5b*cos(y_rot)-(x5b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA1-a5b"/> + </layer> + <layer id="6"> + <module_placement name="TestRunModule" id="0" x="z6t*sin(y_rot)+(x6t+x_off)*cos(y_rot)" y="y6t" z="z6t*cos(y_rot)-(x6t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA1-a6t"/> + <module_placement name="TestRunModule" id="1" x="z6b*sin(y_rot)+(x6b+x_off)*cos(y_rot)" y="y6b" z="z6b*cos(y_rot)-(x6b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a6b"/> + </layer> + <layer id="7"> + <module_placement name="TestRunModule" id="0" x="z7t*sin(y_rot)+(x7t+x_off-moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t+zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/> + <module_placement name="TestRunModule" id="1" x="z7b*sin(y_rot)+(x7b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b-moduleLength/2*sin(SA2)" z="(z7b+zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/> + <module_placement name="TestRunModule" id="2" x="z7t*sin(y_rot)+(x7t+x_off+moduleLength/2)*cos(y_rot)" y="y7t" z="(z7t-zst)*cos(y_rot)-(x7t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a7t"/> + <module_placement name="TestRunModule" id="3" x="z7b*sin(y_rot)+(x7b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y7b+moduleLength/2*sin(SA2)" z="(z7b-zst)*cos(y_rot)-(x7b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a7b"/> + </layer> + <layer id="8"> + <module_placement name="TestRunModule" id="0" x="z8t*sin(y_rot)+(x8t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t+moduleLength/2*sin(SA2)" z="(z8t+zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/> + <module_placement name="TestRunModule" id="1" x="z8b*sin(y_rot)+(x8b+x_off-moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b+zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/> + <module_placement name="TestRunModule" id="2" x="z8t*sin(y_rot)+(x8t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y8t-moduleLength/2*sin(SA2)" z="(z8t-zst)*cos(y_rot)-(x8t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a8t"/> + <module_placement name="TestRunModule" id="3" x="z8b*sin(y_rot)+(x8b+x_off+moduleLength/2)*cos(y_rot)" y="y8b" z="(z8b-zst)*cos(y_rot)-(x8b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a8b"/> + </layer> + <layer id="9"> + <module_placement name="TestRunModule" id="0" x="z9t*sin(y_rot)+(x9t+x_off-moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t+zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/> + <module_placement name="TestRunModule" id="1" x="z9b*sin(y_rot)+(x9b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b-moduleLength/2*sin(SA2)" z="(z9b+zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/> + <module_placement name="TestRunModule" id="2" x="z9t*sin(y_rot)+(x9t+x_off+moduleLength/2)*cos(y_rot)" y="y9t" z="(z9t-zst)*cos(y_rot)-(x9t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a9t"/> + <module_placement name="TestRunModule" id="3" x="z9b*sin(y_rot)+(x9b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y9b+moduleLength/2*sin(SA2)" z="(z9b-zst)*cos(y_rot)-(x9b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a9b"/> + </layer> + <layer id="10"> + <module_placement name="TestRunModule" id="0" x="z10t*sin(y_rot)+(x10t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t+moduleLength/2*sin(SA2)" z="(z10t+zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/> + <module_placement name="TestRunModule" id="1" x="z10b*sin(y_rot)+(x10b+x_off-moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b+zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/> + <module_placement name="TestRunModule" id="2" x="z10t*sin(y_rot)+(x10t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y10t-moduleLength/2*sin(SA2)" z="(z10t-zst)*cos(y_rot)-(x10t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a10t"/> + <module_placement name="TestRunModule" id="3" x="z10b*sin(y_rot)+(x10b+x_off+moduleLength/2)*cos(y_rot)" y="y10b" z="(z10b-zst)*cos(y_rot)-(x10b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a10b"/> + </layer> + <layer id="11"> + <module_placement name="TestRunModule" id="0" x="z11t*sin(y_rot)+(x11t+x_off-moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t+zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/> + <module_placement name="TestRunModule" id="1" x="z11b*sin(y_rot)+(x11b+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b-moduleLength/2*sin(SA2)" z="(z11b+zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/> + <module_placement name="TestRunModule" id="2" x="z11t*sin(y_rot)+(x11t+x_off+moduleLength/2)*cos(y_rot)" y="y11t" z="(z11t-zst)*cos(y_rot)-(x11t+x_off)*sin(y_rot)" rx="x_rot_top" ry="-y_rot" rz="-PI/2-a11t"/> + <module_placement name="TestRunModule" id="3" x="z11b*sin(y_rot)+(x11b+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y11b+moduleLength/2*sin(SA2)" z="(z11b-zst)*cos(y_rot)-(x11b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="-y_rot" rz="-PI/2-SA2-a11b"/> + </layer> + <layer id="12"> + <module_placement name="TestRunModule" id="0" x="z12t*sin(y_rot)+(x12t+x_off-moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t+moduleLength/2*sin(SA2)" z="(z12t+zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/> + <module_placement name="TestRunModule" id="1" x="z12b*sin(y_rot)+(x12b+x_off-moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b+zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/> + <module_placement name="TestRunModule" id="2" x="z12t*sin(y_rot)+(x12t+x_off+moduleLength/2*cos(SA2))*cos(y_rot)" y="y12t-moduleLength/2*sin(SA2)" z="(z12t-zst)*cos(y_rot)-(x12t+x_off)*sin(y_rot)" rx="x_rot_top" ry="PI-y_rot" rz="-3*PI/2-SA2-a12t"/> + <module_placement name="TestRunModule" id="3" x="z12b*sin(y_rot)+(x12b+x_off+moduleLength/2)*cos(y_rot)" y="y12b" z="(z12b-zst)*cos(y_rot)-(x12b+x_off)*sin(y_rot)" rx="x_rot_bot" ry="PI-y_rot" rz="-3*PI/2-a12b"/> + </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" /> + <layout beamgap="20.0*mm" nx="46" ny="5" dface="ecal_dface"> + <remove ixmin="-10" ixmax="-2" iymin="-1" iymax="1" /> + <top dx="ecal_dface*tan(beam_angle)" dy="0." dz="0."/> + <bottom dx="ecal_dface*tan(beam_angle)" 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="TargetHits"> + <id>system:6,barrel:3,layer:4,wedge: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 file="gdml/ecal_vacuum_flange_simple_v2.gdml" /> + <gdmlFile file="gdml/svt_chamber.gdml" /> + </includes> +</lccdd>
diff -N detector.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ detector.properties 3 Oct 2013 04:33:09 -0000 1.1 @@ -0,0 +1,2 @@
+name: HPS-Proposal2014-v5-2pt2 +ConditionsReader: org.lcsim.hps.conditions.HpsConditionsReader
diff -N Ecal.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ Ecal.properties 3 Oct 2013 04:33:09 -0000 1.1 @@ -0,0 +1 @@
+samplingFraction: 1.0
diff -u -r1.5 -r1.6 --- HPS-Proposal2014-v3-2pt2-0zOffset.lcdd 18 Sep 2013 19:40:30 -0000 1.5 +++ HPS-Proposal2014-v3-2pt2-0zOffset.lcdd 3 Oct 2013 04:33:09 -0000 1.6 @@ -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-Proposal2014-v3-2pt2-0zOffset" />
- <generator name="GeomConverter" version="1.0" file="detectors/HPS-Proposal2014-v3-2pt2-0zOffset/compact.xml" checksum="1267009523" />
+ <generator name="GeomConverter" version="1.0" file="detectors/HPS-Proposal2014-v3-2pt2-0zOffset/compact.xml" checksum="2544240199" />
<author name="NONE" />
<comment>HPS detector for 2014 proposal @ 2.2GeV</comment>
</header>
@@ -16,6 +16,15 @@
<idfield signed="true" label="side" length="2" start="32" />
<idfield signed="false" label="strip" length="12" start="34" />
</idspec>
+ <idspec name="TrackerHitsThin" length="46"> + <idfield signed="false" label="system" length="6" start="0" /> + <idfield signed="false" label="barrel" length="3" start="6" /> + <idfield signed="false" label="layer" length="4" start="9" /> + <idfield signed="false" label="module" length="12" start="13" /> + <idfield signed="false" label="sensor" length="1" start="25" /> + <idfield signed="true" label="side" length="2" start="32" /> + <idfield signed="false" label="strip" length="12" start="34" /> + </idspec>
<idspec name="EcalHits" length="22">
<idfield signed="false" label="system" length="6" start="0" />
<idfield signed="false" label="layer" length="2" start="6" />
@@ -27,6 +36,9 @@
<tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
<idspecref ref="TrackerHits" />
</tracker>
+ <tracker name="TrackerFieldDef" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHitsThin"> + <idspecref ref="TrackerHitsThin" /> + </tracker>
<calorimeter name="Ecal" ecut="0.0" eunit="MeV" verbose="0" hits_collection="EcalHits">
<idspecref ref="EcalHits" />
<grid_xyz grid_size_x="0.0" grid_size_y="0.0" grid_size_z="0.0" />
@@ -70,6 +82,7 @@
<constant name="a10t" value="0.0" />
<constant name="a3t" value="0.0" />
<constant name="z4b" value="211.185" />
+ <constant name="endOfFieldZ" value="995.0" />
<constant name="x_rot_bot_add" value="0.0" />
<constant name="ecal_z" value="80.0" />
<constant name="x4t" value="0.0" />
@@ -80,8 +93,8 @@
<constant name="y8b" value="-26.669668753164046" />
<constant name="a5b" value="0.0" />
<constant name="SA2" value="0.05" />
- <constant name="tracking_region_min" value="50.0" />
<constant name="SA1" value="0.1" />
+ <constant name="tracking_region_min" value="50.0" />
<constant name="x4b" value="0.0" />
<constant name="a4t" value="0.0" />
<constant name="z3b" value="203.815" />
@@ -142,9 +155,11 @@
<constant name="a8t" value="0.0" />
<constant name="y12t" value="32.66944375569528" />
<constant name="z8t" value="496.185" />
+ <constant name="constBFieldY" value="-0.5" />
<constant name="x8t" value="0.0" />
<constant name="x11t" value="0.0" />
<constant name="a1b" value="0.0" />
+ <constant name="dipoleMagnetWidth" value="416.052" />
<constant name="z7b" value="503.815" />
<constant name="a9b" value="0.0" />
<constant name="y4b" value="-22.16983750126562" />
@@ -173,6 +188,7 @@
<constant name="y10t" value="29.669556254429665" />
<constant name="x1t" value="0.0" />
<constant name="y9b" value="-29.669556254429665" />
+ <constant name="dipoleMagnetHeight" value="177.8" />
<constant name="a6t" value="0.0" />
<constant name="z1t" value="88.815" />
<constant name="y2b" value="-20.66989375063281" />
@@ -180,6 +196,7 @@
<constant name="x2b" value="0.0" />
<constant name="y11b" value="-32.66944375569528" />
<constant name="a7b" value="0.0" />
+ <constant name="startOfFieldZ" value="0.0" />
<constant name="x_off" value="0.0" />
<constant name="z1b" value="103.815" />
<constant name="y2t" value="20.66989375063281" />
@@ -266,14 +283,14 @@
<rotation name="Tracker_TestRunModule_layer12_module2_rotation" x="0.0" y="3.11107265359" z="-4.762388980385" unit="radian" />
<position name="Tracker_TestRunModule_layer12_module3_position" x="77.78176418167736" y="-32.66944375569528" z="909.7611277105613" unit="mm" />
<rotation name="Tracker_TestRunModule_layer12_module3_rotation" x="0.0" y="3.11107265359" z="-4.7123889803850005" unit="radian" />
- <position name="TestRunModuleThinVolume_component0_position" x="0.0" y="0.0" z="-4.9999999999999996E-6" unit="mm" /> - <rotation name="TestRunModuleThinVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" /> - <position name="TestRunModuleThinVolume_component1_position" x="0.0" y="0.0" z="5.0E-5" unit="mm" /> - <rotation name="TestRunModuleThinVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" /> - <position name="TrackerThin_TestRunModuleThin_layer1_module0_position" x="2.7102130070732957" y="20.66989375063281" z="0.0" unit="mm" /> - <rotation name="TrackerThin_TestRunModuleThin_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" /> - <position name="TrackerThin_TestRunModuleThin_layer2_module0_position" x="2.935110489054157" y="20.66989375063281" z="0.0" unit="mm" /> - <rotation name="TrackerThin_TestRunModuleThin_layer2_module0_rotation" x="0.0" y="0.0" z="-4.7123889803850005" unit="radian" />
+ <position name="TestRunModuleFieldDefVolume_component0_position" x="0.0" y="0.0" z="-5.0E-9" unit="mm" /> + <rotation name="TestRunModuleFieldDefVolume_component0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" /> + <position name="TestRunModuleFieldDefVolume_component1_position" x="0.0" y="0.0" z="5.0E-9" unit="mm" /> + <rotation name="TestRunModuleFieldDefVolume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" /> + <position name="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_position" x="0.0" y="0.0" z="0.0" unit="mm" /> + <rotation name="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" /> + <position name="TrackerFieldDef_TestRunModuleFieldDef_layer2_module0_position" x="0.0" y="0.0" z="995.0" unit="mm" /> + <rotation name="TrackerFieldDef_TestRunModuleFieldDef_layer2_module0_rotation" x="0.0" y="0.0" z="-1.570796326795" unit="radian" />
<position name="crystal1-1_pos_pos_bot" x="50.052304484827026" y="-27.67473927539554" z="1473.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="35.00282593403595" y="-27.67473927539554" z="1473.1626281236922" unit="mm" />
@@ -2006,14 +2023,8 @@
<position name="v843" unit="mm" x="31.932" y="199.33" z="200" />
</define>
<materials>
- <element Z="7" formula="N" name="N"> - <atom type="A" unit="g/mol" value="14.0068" /> - </element> - <element Z="8" formula="O" name="O"> - <atom type="A" unit="g/mol" value="15.9994" /> - </element> - <element Z="18" formula="Ar" name="Ar"> - <atom type="A" unit="g/mol" value="39.9477" />
+ <element Z="1" formula="H" name="H"> + <atom type="A" unit="g/mol" value="1.00794" />
</element>
<element Z="82" formula="Pb" name="Pb">
<atom type="A" unit="g/mol" value="207.217" />
@@ -2021,15 +2032,20 @@
<element Z="74" formula="W" name="W">
<atom type="A" unit="g/mol" value="183.842" />
</element>
- <material name="Air"> - <D type="density" unit="g/cm3" value="0.0012" /> - <fraction n="0.754" ref="N" /> - <fraction n="0.234" ref="O" /> - <fraction n="0.012" ref="Ar" />
+ <element Z="8" formula="O" name="O"> + <atom type="A" unit="g/mol" value="15.9994" /> + </element> + <material name="Vacuum"> + <D type="density" unit="g/cm3" value="0.00000001" /> + <fraction n="1" ref="H" /> + </material> + <material name="WorldMaterial"> + <D type="density" unit="g/cm3" value="0.0000000000000001" /> + <fraction n="1.0" ref="Vacuum" />
</material>
<material name="TrackingMaterial">
<D type="density" unit="g/cm3" value="0.0000000000000001" />
- <fraction n="1.0" ref="Air" />
+ <fraction n="1.0" ref="Vacuum" />
</material>
<material name="LeadTungstate">
<D value="8.28" unit="g/cm3" type="density" />
@@ -2037,13 +2053,6 @@
<composite n="1" ref="W" />
<composite n="4" ref="O" />
</material>
- <element name="H" formula="H" Z="1"> - <atom type="A" unit="g/mol" value="1.00794" /> - </element> - <material name="Vacuum"> - <D type="density" unit="g/cm3" value="0.00000001" /> - <fraction n="1" ref="H" /> - </material>
<element name="Si" formula="Si" Z="14">
<atom type="A" unit="g/mol" value="28.0854" />
</element>
@@ -2089,9 +2098,9 @@
<box name="TestRunModuleVolume_component0Box" x="40.34" y="100.0" z="0.32" />
<box name="TestRunModuleVolume_component0Sensor0Box" x="38.3399" y="98.33" z="0.32" />
<box name="TestRunModuleVolume_component1Box" x="40.34" y="100.0" z="0.08399999999999999" />
- <box name="TestRunModuleThinBox" x="80.68" y="200.0" z="1.1E-4" /> - <box name="TestRunModuleThinVolume_component0Box" x="80.68" y="200.0" z="1.0E-4" /> - <box name="TestRunModuleThinVolume_component1Box" x="80.68" y="200.0" z="9.999999999999999E-6" />
+ <box name="TestRunModuleFieldDefBox" x="712.2" y="1665.208" z="2.0E-8" /> + <box name="TestRunModuleFieldDefVolume_component0Box" x="712.2" y="1665.208" z="1.0E-8" /> + <box name="TestRunModuleFieldDefVolume_component1Box" x="712.2" y="1665.208" z="1.0E-8" />
<trd name="crystal_trap" x1="13.3" x2="16.0" y1="13.3" y2="16.0" z="160.0" />
<box lunit="mm" name="WorldBox" x="1570.55" y="1250.62" z="884.4" />
<tessellated name="split_0" lunit="mm">
@@ -3825,27 +3834,27 @@
<physvolid field_name="component" value="1" />
</physvol>
</volume>
- <volume name="TestRunModuleThinVolume_component0">
+ <volume name="TestRunModuleFieldDefVolume_component0">
<materialref ref="Vacuum" />
- <solidref ref="TestRunModuleThinVolume_component0Box" />
+ <solidref ref="TestRunModuleFieldDefVolume_component0Box" />
</volume>
- <volume name="TestRunModuleThinVolume_component1">
+ <volume name="TestRunModuleFieldDefVolume_component1">
<materialref ref="Vacuum" />
- <solidref ref="TestRunModuleThinVolume_component1Box" />
+ <solidref ref="TestRunModuleFieldDefVolume_component1Box" />
</volume>
- <volume name="TestRunModuleThinVolume">
+ <volume name="TestRunModuleFieldDefVolume">
<materialref ref="Vacuum" />
- <solidref ref="TestRunModuleThinBox" />
+ <solidref ref="TestRunModuleFieldDefBox" />
<physvol>
- <volumeref ref="TestRunModuleThinVolume_component0" /> - <positionref ref="TestRunModuleThinVolume_component0_position" /> - <rotationref ref="TestRunModuleThinVolume_component0_rotation" />
+ <volumeref ref="TestRunModuleFieldDefVolume_component0" /> + <positionref ref="TestRunModuleFieldDefVolume_component0_position" /> + <rotationref ref="TestRunModuleFieldDefVolume_component0_rotation" />
<physvolid field_name="component" value="0" />
</physvol>
<physvol>
- <volumeref ref="TestRunModuleThinVolume_component1" /> - <positionref ref="TestRunModuleThinVolume_component1_position" /> - <rotationref ref="TestRunModuleThinVolume_component1_rotation" />
+ <volumeref ref="TestRunModuleFieldDefVolume_component1" /> + <positionref ref="TestRunModuleFieldDefVolume_component1_position" /> + <rotationref ref="TestRunModuleFieldDefVolume_component1_rotation" />
<physvolid field_name="component" value="1" />
</physvol>
</volume>
@@ -4187,18 +4196,18 @@
<physvolid field_name="module" value="3" />
</physvol>
<physvol>
- <volumeref ref="TestRunModuleThinVolume" /> - <positionref ref="TrackerThin_TestRunModuleThin_layer1_module0_position" /> - <rotationref ref="TrackerThin_TestRunModuleThin_layer1_module0_rotation" />
+ <volumeref ref="TestRunModuleFieldDefVolume" /> + <positionref ref="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_position" /> + <rotationref ref="TrackerFieldDef_TestRunModuleFieldDef_layer1_module0_rotation" />
<physvolid field_name="system" value="99" />
<physvolid field_name="barrel" value="0" />
<physvolid field_name="layer" value="1" />
<physvolid field_name="module" value="0" />
</physvol>
<physvol>
- <volumeref ref="TestRunModuleThinVolume" /> - <positionref ref="TrackerThin_TestRunModuleThin_layer2_module0_position" /> - <rotationref ref="TrackerThin_TestRunModuleThin_layer2_module0_rotation" />
+ <volumeref ref="TestRunModuleFieldDefVolume" /> + <positionref ref="TrackerFieldDef_TestRunModuleFieldDef_layer2_module0_position" /> + <rotationref ref="TrackerFieldDef_TestRunModuleFieldDef_layer2_module0_rotation" />
<physvolid field_name="system" value="99" />
<physvolid field_name="barrel" value="0" />
<physvolid field_name="layer" value="2" />
@@ -4208,7 +4217,7 @@
<visref ref="TrackingVis" />
</volume>
<volume name="world_volume">
- <materialref ref="Air" />
+ <materialref ref="WorldMaterial" />
<solidref ref="world_box" />
<physvol>
<volumeref ref="tracking_volume" />
@@ -7764,7 +7773,7 @@
</setup> </gdml> <fields>
- <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="21.17" y="0.0" z="457.2" dx="228.6" dy="76.2" dz="457.2" bx="0.0" by="-0.5" bz="0.0" />
+ <box_dipole name="AnalyzingDipole" lunit="mm" funit="tesla" x="0.0" y="0.0" z="497.5" dx="208.026" dy="88.9" dz="497.5" bx="0.0" by="-0.5" bz="0.0" />
</fields> </lcdd>
diff -u -r1.7 -r1.8 --- compact.xml 2 Oct 2013 05:13:25 -0000 1.7 +++ compact.xml 3 Oct 2013 04:33:09 -0000 1.8 @@ -49,17 +49,6 @@
<!-- Sensor width slightly less than 38.34 mm so sisim works. -->
<constant name="sensorWidth" value="38.3399"/>
- - - <!-- SVT module dimensions --> - <constant name="vertModLength" value="40.34"/> - <constant name="vertModWidth" value="40.34"/> - - - <!-- SVT sensor dimensions --> - <constant name="vertSensLength" value="38.3399"/> - <constant name="vertSensWidth" value="38.3399"/> - <!-- Sensor width slightly less than 38.34 mm so sisim works. -->
<constant name="zst" value="1" />
<constant name="SA1" value="0.1" />
<constant name="SA2" value="0.05" />
@@ -83,54 +72,32 @@
<constant name="ytar" value="0" />
<constant name="ztar" value="0" />
<!-- Positions of sensor centers above/below nominal beam -->
- <!-- ...these are from the test run survey --> -<!-- <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" /> -->
<!-- these are the nominal (15mrad) -->
- <constant name="y1t" value="100*sin(0.015)+38.3399/2" /> - <constant name="y2t" value="100*sin(0.015)+38.3399/2" /> - <constant name="y3t" value="200*sin(0.015)+38.3399/2" /> - <constant name="y4t" value="200*sin(0.015)+38.3399/2" /> - <constant name="y5t" value="300*sin(0.015)+38.3399/2" /> - <constant name="y6t" value="300*sin(0.015)+38.3399/2" /> - <constant name="y7t" value="500*sin(0.015)+38.3399/2" /> - <constant name="y8t" value="500*sin(0.015)+38.3399/2" /> - <constant name="y9t" value="700*sin(0.015)+38.3399/2" /> - <constant name="y10t" value="700*sin(0.015)+38.3399/2" /> - <constant name="y11t" value="900*sin(0.015)+38.3399/2" /> - <constant name="y12t" value="900*sin(0.015)+38.3399/2" />
+ <constant name="y1t" value="100*sin(0.015)+sensorWidth/2" /> + <constant name="y2t" value="100*sin(0.015)+sensorWidth/2" /> + <constant name="y3t" value="200*sin(0.015)+sensorWidth/2" /> + <constant name="y4t" value="200*sin(0.015)+sensorWidth/2" /> + <constant name="y5t" value="300*sin(0.015)+sensorWidth/2" /> + <constant name="y6t" value="300*sin(0.015)+sensorWidth/2" /> + <constant name="y7t" value="500*sin(0.015)+sensorWidth/2" /> + <constant name="y8t" value="500*sin(0.015)+sensorWidth/2" /> + <constant name="y9t" value="700*sin(0.015)+sensorWidth/2" /> + <constant name="y10t" value="700*sin(0.015)+sensorWidth/2" /> + <constant name="y11t" value="900*sin(0.015)+sensorWidth/2" /> + <constant name="y12t" value="900*sin(0.015)+sensorWidth/2" />
- <constant name="y1b" value="-(100*sin(0.015)+38.3399/2)" /> - <constant name="y2b" value="-(100*sin(0.015)+38.3399/2)" /> - <constant name="y3b" value="-(200*sin(0.015)+38.3399/2)" /> - <constant name="y4b" value="-(200*sin(0.015)+38.3399/2)" /> - <constant name="y5b" value="-(300*sin(0.015)+38.3399/2)" /> - <constant name="y6b" value="-(300*sin(0.015)+38.3399/2)" /> - <constant name="y7b" value="-(500*sin(0.015)+38.3399/2)" /> - <constant name="y8b" value="-(500*sin(0.015)+38.3399/2)" /> - <constant name="y9b" value="-(700*sin(0.015)+38.3399/2)" /> - <constant name="y10b" value="-(700*sin(0.015)+38.3399/2)" /> - <constant name="y11b" value="-(900*sin(0.015)+38.3399/2)" /> - <constant name="y12b" value="-(900*sin(0.015)+38.3399/2)" />
+ <constant name="y1b" value="-(100*sin(0.015)+sensorWidth/2)" /> + <constant name="y2b" value="-(100*sin(0.015)+sensorWidth/2)" /> + <constant name="y3b" value="-(200*sin(0.015)+sensorWidth/2)" /> + <constant name="y4b" value="-(200*sin(0.015)+sensorWidth/2)" /> + <constant name="y5b" value="-(300*sin(0.015)+sensorWidth/2)" /> + <constant name="y6b" value="-(300*sin(0.015)+sensorWidth/2)" /> + <constant name="y7b" value="-(500*sin(0.015)+sensorWidth/2)" /> + <constant name="y8b" value="-(500*sin(0.015)+sensorWidth/2)" /> + <constant name="y9b" value="-(700*sin(0.015)+sensorWidth/2)" /> + <constant name="y10b" value="-(700*sin(0.015)+sensorWidth/2)" /> + <constant name="y11b" value="-(900*sin(0.015)+sensorWidth/2)" /> + <constant name="y12b" value="-(900*sin(0.015)+sensorWidth/2)" />
<!-- Positions of sensor centers along beam relative to nominal target position -->
<constant name="z1t" value="0+92.5-3.685" />
@@ -327,24 +294,18 @@
<detector id="99" name="TrackerFieldDef" type="HPSTracker2" readout="TrackerHitsThin" >
<comment>The Silicon Vertex Tracker</comment>
<module name="TestRunModuleFieldDef">
- <box x="moduleLength*2" y="moduleWidth*2" />
+ <box x="dipoleMagnetWidth*4+1" y="dipoleMagnetHeight*4+1" />
<module_component thickness="0.000000001*cm" material = "Vacuum" sensitive="false">
- <dimensions x="dipoleMagnetWidth" y="dipoleMagnetHeight" />
+ <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"/>
- <!-- - <module_placement name="TestRunModuleThinFieldDefUp" id="0" x="z1t*sin(y_rot)+(x1t+x_off)*cos(y_rot)" y="y1t" z="0" 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"/>
- <!-- - <module_placement name="TestRunModuleThinFieldDefUp" id="0" x="z2t*sin(y_rot)+(x2t+x_off)*cos(y_rot)" y="y2t" z="0" rx="0" ry="0" rz="-3*PI/2"/> - --> - </layer>
+ </layer>
</detector>
@@ -385,11 +346,7 @@
</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" /> - <!-- - <field type="BoxDipole" name="AnalyzingDipole" x="2.117*cm" y="0*cm" z="45.72*cm" dx="22.86*cm" dy="7.62*cm" dz="45.72*cm" bx="0.0" by="-0.5" bz="0.0" > - </field> - -->
+ <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>
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