 |
 |
| Commit in hps-detectors/detectors/HPS-Test-JLAB-v4pt0 on MAIN | |||
| compact.xml | +16 | -8 | 1.4 -> 1.5 |
| HPS-Test-JLAB-v4pt0.lcdd | +28 | -42 | 1.4 -> 1.5 |
| +44 | -50 | ||
current version of test detector
diff -u -r1.4 -r1.5 --- compact.xml 1 Feb 2012 12:49:04 -0000 1.4 +++ compact.xml 16 Feb 2012 23:16:24 -0000 1.5 @@ -23,9 +23,16 @@
<constant name="moduleX" value="100.0"/>
<constant name="moduleY" value="40.34"/>
+<!-- + <constant name="moduleWidth" value="100.0"/> + <constant name="moduleLength" value="40.34"/> +--> +
<!-- SVT sensor dimensions -->
<constant name="sensorX" value="98.33"/>
- <constant name="sensorY" value="38.34"/>
+<!-- <constant name="sensorY" value="38.34"/>--> + <!-- Make this slightly under the real value so sisim doesn't break. --> + <constant name="sensorY" value="38.3399"/>
<!-- module tilt -->
<constant name="SA" value="0.10" />
@@ -86,6 +93,7 @@
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">
@@ -93,8 +101,9 @@
</layout>
</detector>
- <!-- Target --> - <detector id="10" name="Target" type="SiTrackerSpectrometer" readout="TargetHits" combineHits="true">
+ + <detector id="10" name="Target" type="SiTrackerSpectrometer"> + <comment>The Tungsten fixed target.</comment>
<module name="TungstenTarget">
<trd x1="5*cm" x2="5*cm" z="5*cm" />
<module_component thickness="0.3504*cm*0.00125" material="Tungsten" sensitive="false"/>
@@ -106,6 +115,7 @@
<!-- SVT -->
<detector id="1" name="Tracker" type="HPSTracker" readout="TrackerHits" combineHits="true" flipSA="true" reflect="true">
+ <comment> The Silicon Vertex Tracker.</comment>
<module name="Module1">
<box x="moduleX" y="moduleY" />
<module_component thickness="0.032*cm" material = "Silicon" sensitive="true">
@@ -120,9 +130,9 @@
yStart="(ygap1+moduleY)/2"
ny="1"
yStep="moduleY"
- phi0="0.035"
z="zCent1"
dz="0.0*cm"
+ phi0="0.035"
module="Module1"/>
</layer>
<layer id="2">
@@ -157,14 +167,12 @@
<readouts>
<readout name="EcalHits">
+ <!-- Setting grid sizes to all zero means the volume center is used. -->
<segmentation type="GridXYZ" gridSizeX="0.0" gridSizeY="0.0" gridSizeZ="0.0" />
<id>system:6,layer:2,ix:-8,iy:-6</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="TrackerHits">
- <id>system:6,barrel:3,layer:4,wedge:4,module:12,sensor:1,side:32:-2,strip:12</id>
+ <id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
</readout>
</readouts>
diff -u -r1.4 -r1.5 --- HPS-Test-JLAB-v4pt0.lcdd 1 Feb 2012 12:49:04 -0000 1.4 +++ HPS-Test-JLAB-v4pt0.lcdd 16 Feb 2012 23:16:24 -0000 1.5 @@ -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-Test-JLAB-v4pt0" />
- <generator name="GeomConverter" version="1.0" file="./compact.xml" checksum="2027829391" />
+ <generator name="GeomConverter" version="1.0" file="compact.xml" checksum="1685053753" />
<author name="NONE" />
<comment>HPS Test Proposal detector</comment>
</header>
@@ -11,19 +11,8 @@
<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="wedge" length="4" start="13" /> - <idfield signed="false" label="module" length="12" start="17" /> - <idfield signed="false" label="sensor" length="1" start="29" /> - <idfield signed="true" label="side" length="2" start="32" /> - <idfield signed="false" label="strip" length="12" start="34" /> - </idspec> - <idspec name="TargetHits" 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="wedge" length="4" start="13" /> - <idfield signed="false" label="module" length="12" start="17" /> - <idfield signed="false" label="sensor" length="1" start="29" />
+ <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>
@@ -35,9 +24,6 @@
</idspec> </iddict> <sensitive_detectors>
- <tracker name="Target" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TargetHits"> - <idspecref ref="TargetHits" /> - </tracker>
<tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
<idspecref ref="TrackerHits" />
</tracker>
@@ -79,7 +65,7 @@
<constant name="zCent2" value="200.0" />
<constant name="tracking_region_radius" value="2000.0" />
<constant name="zPlaneDist" value="10.0" />
- <constant name="sensorY" value="38.34" />
+ <constant name="sensorY" value="38.3399" />
<constant name="sensorX" value="98.33" />
<constant name="moduleX" value="100.0" />
<constant name="moduleY" value="40.34" />
@@ -112,45 +98,45 @@
<position name="Module1Volume_component1_position" x="0.0" y="0.0" z="0.16" unit="mm" />
<rotation name="Module1Volume_component1_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
<position name="Tracker_layer1_module0_position" x="0.0" y="21.67" z="100.0" unit="mm" />
- <rotation name="Tracker_layer1_module0_rotation" x="0.0" y="0.0" z="0.035" unit="radian" />
+ <rotation name="Tracker_layer1_module0_rotation" x="0.0" y="0.0" z="1.6057963267948965" unit="radian" />
<position name="Tracker_layer1_module0_reflect_position" x="0.0" y="-21.67" z="100.0" unit="mm" />
- <rotation name="Tracker_layer1_module0_reflect_rotation" x="0.0" y="0.0" z="-0.035" unit="radian" />
+ <rotation name="Tracker_layer1_module0_reflect_rotation" x="0.0" y="0.0" z="1.5357963267948966" unit="radian" />
<position name="Tracker_layer2_module0_position" x="0.0" y="21.67" z="110.0" unit="mm" />
- <rotation name="Tracker_layer2_module0_rotation" x="0.0" y="0.0" z="0.1" unit="radian" />
+ <rotation name="Tracker_layer2_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />
<position name="Tracker_layer2_module0_reflect_position" x="0.0" y="-21.67" z="110.0" unit="mm" />
- <rotation name="Tracker_layer2_module0_reflect_rotation" x="0.0" y="0.0" z="-0.1" unit="radian" />
+ <rotation name="Tracker_layer2_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />
<position name="Tracker_layer3_module0_position" x="0.0" y="23.17" z="200.0" unit="mm" />
- <rotation name="Tracker_layer3_module0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+ <rotation name="Tracker_layer3_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer3_module0_reflect_position" x="0.0" y="-23.17" z="200.0" unit="mm" />
- <rotation name="Tracker_layer3_module0_reflect_rotation" x="0.0" y="0.0" z="-0.0" unit="radian" />
+ <rotation name="Tracker_layer3_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer4_module0_position" x="0.0" y="23.17" z="210.0" unit="mm" />
- <rotation name="Tracker_layer4_module0_rotation" x="0.0" y="0.0" z="0.1" unit="radian" />
+ <rotation name="Tracker_layer4_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />
<position name="Tracker_layer4_module0_reflect_position" x="0.0" y="-23.17" z="210.0" unit="mm" />
- <rotation name="Tracker_layer4_module0_reflect_rotation" x="0.0" y="0.0" z="-0.1" unit="radian" />
+ <rotation name="Tracker_layer4_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />
<position name="Tracker_layer5_module0_position" x="0.0" y="24.67" z="300.0" unit="mm" />
- <rotation name="Tracker_layer5_module0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+ <rotation name="Tracker_layer5_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer5_module0_reflect_position" x="0.0" y="-24.67" z="300.0" unit="mm" />
- <rotation name="Tracker_layer5_module0_reflect_rotation" x="0.0" y="0.0" z="-0.0" unit="radian" />
+ <rotation name="Tracker_layer5_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer6_module0_position" x="0.0" y="24.67" z="310.0" unit="mm" />
- <rotation name="Tracker_layer6_module0_rotation" x="0.0" y="0.0" z="0.1" unit="radian" />
+ <rotation name="Tracker_layer6_module0_rotation" x="0.0" y="0.0" z="1.6707963267948966" unit="radian" />
<position name="Tracker_layer6_module0_reflect_position" x="0.0" y="-24.67" z="310.0" unit="mm" />
- <rotation name="Tracker_layer6_module0_reflect_rotation" x="0.0" y="0.0" z="-0.1" unit="radian" />
+ <rotation name="Tracker_layer6_module0_reflect_rotation" x="0.0" y="0.0" z="1.4707963267948965" unit="radian" />
<position name="Tracker_layer7_module0_position" x="0.0" y="27.67" z="500.0" unit="mm" />
- <rotation name="Tracker_layer7_module0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+ <rotation name="Tracker_layer7_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer7_module0_reflect_position" x="0.0" y="-27.67" z="500.0" unit="mm" />
- <rotation name="Tracker_layer7_module0_reflect_rotation" x="0.0" y="0.0" z="-0.0" unit="radian" />
+ <rotation name="Tracker_layer7_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer8_module0_position" x="0.0" y="27.67" z="510.0" unit="mm" />
- <rotation name="Tracker_layer8_module0_rotation" x="0.0" y="0.0" z="0.05" unit="radian" />
+ <rotation name="Tracker_layer8_module0_rotation" x="0.0" y="0.0" z="1.6207963267948966" unit="radian" />
<position name="Tracker_layer8_module0_reflect_position" x="0.0" y="-27.67" z="510.0" unit="mm" />
- <rotation name="Tracker_layer8_module0_reflect_rotation" x="0.0" y="0.0" z="-0.05" unit="radian" />
+ <rotation name="Tracker_layer8_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />
<position name="Tracker_layer9_module0_position" x="0.0" y="30.67" z="700.0" unit="mm" />
- <rotation name="Tracker_layer9_module0_rotation" x="0.0" y="0.0" z="0.0" unit="radian" />
+ <rotation name="Tracker_layer9_module0_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer9_module0_reflect_position" x="0.0" y="-30.67" z="700.0" unit="mm" />
- <rotation name="Tracker_layer9_module0_reflect_rotation" x="0.0" y="0.0" z="-0.0" unit="radian" />
+ <rotation name="Tracker_layer9_module0_reflect_rotation" x="0.0" y="0.0" z="1.5707963267948966" unit="radian" />
<position name="Tracker_layer10_module0_position" x="0.0" y="30.67" z="710.0" unit="mm" />
- <rotation name="Tracker_layer10_module0_rotation" x="0.0" y="0.0" z="0.05" unit="radian" />
+ <rotation name="Tracker_layer10_module0_rotation" x="0.0" y="0.0" z="1.6207963267948966" unit="radian" />
<position name="Tracker_layer10_module0_reflect_position" x="0.0" y="-30.67" z="710.0" unit="mm" />
- <rotation name="Tracker_layer10_module0_reflect_rotation" x="0.0" y="0.0" z="-0.05" unit="radian" />
+ <rotation name="Tracker_layer10_module0_reflect_rotation" x="0.0" y="0.0" z="1.5207963267948965" unit="radian" />
<position name="crystal1-1_pos_pos_bot" x="7.4747392753955415" y="-27.474739275395542" z="1450.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="-27.474739275395542" z="1450.1626281236922" unit="mm" />
@@ -1970,10 +1956,10 @@
<tube name="tracking_cylinder" deltaphi="6.283185307179586" rmin="0.0" rmax="tracking_region_radius" z="2*tracking_region_zmax" />
<trd name="TungstenTargetTrd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />
<trd name="TungstenTargetVolume_component0_trd" x1="100.0" x2="100.0" y1="0.00438" y2="0.00438" z="100.0" />
- <box name="Module1Box" x="100.0" y="40.34" z="0.52" /> - <box name="Module1Volume_component0Box" x="100.0" y="40.34" z="0.32" /> - <box name="Module1Volume_component0Sensor0Box" x="98.33" y="38.34" z="0.32" /> - <box name="Module1Volume_component1Box" x="100.0" y="40.34" z="0.2" />
+ <box name="Module1Box" x="40.34" y="100.0" z="0.52" /> + <box name="Module1Volume_component0Box" x="40.34" y="100.0" z="0.32" /> + <box name="Module1Volume_component0Sensor0Box" x="38.3399" y="98.33" z="0.32" /> + <box name="Module1Volume_component1Box" x="40.34" y="100.0" z="0.2" />
<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">
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