Skip to content

Commit 8408ec0

Browse files
authored
Merge pull request #199 from myliu-hub/master
Increase the diagonal wire version
2 parents f96e46f + c8d62f3 commit 8408ec0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+6055
-1381
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lccdd>
3+
4+
<info name="DriftChamber"
5+
title="Test with Drift Chamber"
6+
author="Tao Lin"
7+
url="http://github.com/cepc/CEPCSW"
8+
status="development"
9+
version="v0">
10+
<comment>Test with Drift Chamber</comment>
11+
</info>
12+
13+
<define>
14+
15+
<constant name="DC_layer_number" value="100"/>
16+
<constant name="Alpha" value="12*deg"/>
17+
<constant name="Gas_radius_min" value="DC_rbegin+DC_inner_wall_thickness+DC_safe_distance"/>
18+
<constant name="Gas_half_length" value="DC_half_length-DC_Endcap_dz-DC_safe_distance"/>
19+
<constant name="Gas_length" value="Gas_half_length*2"/>
20+
<constant name="DC_cell_width" value="10*mm"/>
21+
<constant name="DC_inner_wall_radius_min" value="DC_rbegin"/>
22+
<constant name="DC_inner_wall_radius_max" value="DC_rbegin+DC_inner_wall_thickness"/>
23+
<constant name="DC_Endcap_rmin" value="DC_rbegin"/>
24+
<constant name="DC_Endcap_rmax" value="DC_rend"/>
25+
26+
<constant name="DC_construct_wire" value="1"/>
27+
28+
<constant name="DC_layer_width" value="9.57687*mm"/>
29+
30+
</define>
31+
32+
<limits>
33+
<limitset name="DC_limits">
34+
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
35+
</limitset>
36+
</limits>
37+
38+
<regions>
39+
<region name="DriftChamberRegion">
40+
</region>
41+
</regions>
42+
43+
<detectors>
44+
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" region="DriftChamberRegion" limits="DC_limits">
45+
<material name="Air"/>
46+
<chamber id="0" material="GasHe_90Isob_10"/>
47+
<side material="CarbonFiber"/>
48+
<envelope vis="SeeThrough">
49+
<shape type="BooleanShape" operation="Union" material="Air">
50+
<shape type="Tube" rmin="DC_rbegin" rmax="DC_rend" dz="DC_half_length" />
51+
</shape>
52+
</envelope>
53+
54+
<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
55+
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
56+
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
57+
</module>
58+
59+
<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
60+
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
61+
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
62+
</module>
63+
64+
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
65+
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
66+
<sensitive type="SimpleDriftChamber"/>
67+
</detector>
68+
</detectors>
69+
70+
<readouts>
71+
<readout name="DriftChamberHitsCollection">
72+
<segmentation type="GridDriftChamber" cell_size="DC_cell_width" detector_length="Gas_length" identifier_phi="cellID" layerID="layer" DC_rbegin="DC_rbegin" DC_rend="DC_rend" layer_width="DC_layer_width"/>
73+
74+
75+
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
76+
</readout>
77+
</readouts>
78+
79+
</lccdd>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lccdd>
3+
4+
<info name="DriftChamber"
5+
title="Test with Drift Chamber"
6+
author="Tao Lin"
7+
url="http://github.com/cepc/CEPCSW"
8+
status="development"
9+
version="v0">
10+
<comment>Test with Drift Chamber</comment>
11+
</info>
12+
13+
<define>
14+
15+
<constant name="DC_layer_number" value="55"/>
16+
<constant name="Alpha" value="12*deg"/>
17+
<constant name="Gas_radius_min" value="DC_rbegin+DC_inner_wall_thickness+DC_safe_distance"/>
18+
<constant name="Gas_half_length" value="DC_half_length-DC_Endcap_dz-DC_safe_distance"/>
19+
<constant name="Gas_length" value="Gas_half_length*2"/>
20+
<constant name="DC_cell_width" value="18*mm"/>
21+
<constant name="DC_inner_wall_radius_min" value="DC_rbegin"/>
22+
<constant name="DC_inner_wall_radius_max" value="DC_rbegin+DC_inner_wall_thickness"/>
23+
<constant name="DC_Endcap_rmin" value="DC_rbegin"/>
24+
<constant name="DC_Endcap_rmax" value="DC_rend"/>
25+
26+
<constant name="DC_construct_wire" value="0"/>
27+
28+
<constant name="DC_layer_width" value="18*mm"/>
29+
30+
</define>
31+
32+
<limits>
33+
<limitset name="DC_limits">
34+
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
35+
</limitset>
36+
</limits>
37+
38+
<regions>
39+
<region name="DriftChamberRegion">
40+
</region>
41+
</regions>
42+
43+
<detectors>
44+
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" limits="DC_limits">
45+
<material name="Air"/>
46+
<chamber id="0" material="GasHe_90Isob_10"/>
47+
<side material="CarbonFiber"/>
48+
<envelope vis="SeeThrough">
49+
<shape type="BooleanShape" operation="Union" material="Air">
50+
<shape type="Tube" rmin="DC_rbegin" rmax="DC_rend" dz="DC_half_length" />
51+
</shape>
52+
</envelope>
53+
54+
<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
55+
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
56+
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
57+
</module>
58+
59+
<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
60+
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
61+
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
62+
</module>
63+
64+
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
65+
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
66+
<sensitive type="SimpleDriftChamber"/>
67+
</detector>
68+
</detectors>
69+
70+
<readouts>
71+
<readout name="DriftChamberHitsCollection">
72+
<segmentation type="GridDriftChamber" cell_size="DC_cell_width" detector_length="Gas_length" identifier_phi="cellID" layerID="layer" DC_rbegin="DC_rbegin" DC_rend="DC_rend" layer_width="DC_layer_width"/>
73+
74+
75+
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
76+
</readout>
77+
</readouts>
78+
79+
</lccdd>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lccdd>
3+
4+
<info name="DriftChamber"
5+
title="Test with Drift Chamber"
6+
author="Tao Lin"
7+
url="http://github.com/cepc/CEPCSW"
8+
status="development"
9+
version="v0">
10+
<comment>Test with Drift Chamber</comment>
11+
</info>
12+
13+
<define>
14+
15+
<!-- SDT -->
16+
<constant name="SDT_radius_min" value="DC_inner_radius"/>
17+
<constant name="SDT_radius_max" value="DC_outer_radius"/>
18+
19+
<constant name="SDT_half_length" value="MainTracker_half_length"/>
20+
<constant name="DC_length" value="DC_half_length*2"/>
21+
<constant name="SDT_length" value="SDT_half_length*2"/>
22+
23+
<constant name="SDT_chamber_radius_min" value="DC_chamber_layer_rbegin-DC_safe_distance"/>
24+
<constant name="SDT_chamber_radius_max" value="DC_chamber_layer_rend+DC_chamber_safe_distance+DC_safe_distance"/>
25+
<constant name="SDT_chamber_half_length" value="DC_half_length"/>
26+
27+
<constant name="SDT_chamber_layer_width" value="10*mm"/>
28+
<constant name="SDT_chamber_cell_width" value="10*mm"/>
29+
<constant name="Alpha" value="12*deg"/>
30+
31+
<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
32+
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
33+
<constant name="SDT_chamber_outer_wall_radius_min" value="SDT_chamber_radius_max"/>
34+
<constant name="SDT_chamber_outer_wall_radius_max" value="SDT_chamber_radius_max+SDT_outer_wall_thickness"/>
35+
36+
<constant name="DC_Endcap_rmin" value="SDT_radius_min"/>
37+
<constant name="DC_Endcap_rmax" value="SDT_radius_max"/>
38+
39+
</define>
40+
41+
<limits>
42+
<limitset name="DC_limits">
43+
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
44+
</limitset>
45+
</limits>
46+
47+
<regions>
48+
<region name="DriftChamberRegion">
49+
<limitsetref name="DC_limits"/>
50+
</region>
51+
</regions>
52+
53+
<detectors>
54+
<detector id="DetID_DC" name="DriftChamber_Stero" type="DriftChamber_Stero" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" insideTrackingVolume="true" limits="DC_limits">
55+
<material name="Air"/>
56+
<chamber id="0" material="GasHe_90Isob_10"/>
57+
<side material="CarbonFiber"/>
58+
<envelope vis="SeeThrough">
59+
<shape type="BooleanShape" operation="Union" material="Air">
60+
<shape type="Tube" rmin="SDT_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
61+
</shape>
62+
</envelope>
63+
64+
<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
65+
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
66+
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
67+
</module>
68+
69+
<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
70+
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
71+
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
72+
</module>
73+
74+
<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
75+
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
76+
<sensitive type="SimpleDriftChamber"/>
77+
</detector>
78+
</detectors>
79+
80+
<readouts>
81+
<readout name="DriftChamberHitsCollection">
82+
<segmentation type="GridDriftChamber" cell_size="SDT_chamber_cell_width" detector_length="DC_length" identifier_phi="cellID" DC_rbegin="DC_chamber_layer_rbegin" DC_rend="DC_chamber_layer_rend" DC_rmin="SDT_chamber_radius_min" DC_rmax="SDT_chamber_radius_max" safe_distance="DC_safe_distance" layerID="layer" layer_width="SDT_chamber_layer_width"/>
83+
84+
85+
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
86+
</readout>
87+
</readouts>
88+
89+
</lccdd>

Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_01.xml Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_01.xml

+7-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<constant name="SDT_chamber_layer_width" value="10*mm"/>
3030
<constant name="SDT_chamber_cell_width" value="10*mm"/>
31-
<constant name="Epsilon" value="0*deg"/>
31+
<constant name="Alpha" value="0*deg"/>
3232

3333
<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
3434
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
@@ -42,7 +42,7 @@
4242

4343
<limits>
4444
<limitset name="DC_limits">
45-
<limit name="step_length_max" particles="*" value="0.5" unit="mm" />
45+
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
4646
</limitset>
4747
</limits>
4848

@@ -53,8 +53,10 @@
5353

5454
<detectors>
5555
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" region="DriftChamberRegion" limits="DC_limits">
56-
<chamber id="0"/>
57-
<envelope>
56+
<material name="Air"/>
57+
<chamber id="0" material="GasHe_90Isob_10"/>
58+
<side material="CarbonFiber"/>
59+
<envelope vis="SeeThrough">
5860
<shape type="BooleanShape" operation="Union" material="Air">
5961
<shape type="Tube" rmin="SDT_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
6062
</shape>
@@ -78,7 +80,7 @@
7880

7981
<readouts>
8082
<readout name="DriftChamberHitsCollection">
81-
<segmentation type="GridDriftChamber" cell_size="SDT_chamber_cell_width" epsilon0="Epsilon" detector_length="DC_length" identifier_phi="cellID" DC_rbegin="DC_chamber_layer_rbegin" DC_rend="DC_chamber_layer_rend" DC_rmin="SDT_chamber_radius_min" DC_rmax="SDT_chamber_radius_max" safe_distance="DC_safe_distance" layerID="layer" layer_width="SDT_chamber_layer_width"/>
83+
<segmentation type="GridDriftChamber" cell_size="SDT_chamber_cell_width" detector_length="DC_length" identifier_phi="cellID" DC_rbegin="DC_chamber_layer_rbegin" DC_rend="DC_chamber_layer_rend" DC_rmin="SDT_chamber_radius_min" DC_rmax="SDT_chamber_radius_max" safe_distance="DC_safe_distance" layerID="layer" layer_width="SDT_chamber_layer_width"/>
8284

8385
<!-- <id>system:8,chamber:1,layer:8,cellID:16</id> -->
8486
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>

Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_02.xml Detector/DetCRD/compact/CRD_common_v01/DC_Straight_v01_02.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<constant name="SDT_chamber_layer_width" value="10*mm"/>
3030
<constant name="SDT_chamber_cell_width" value="10*mm"/>
31-
<constant name="Epsilon" value="0*deg"/>
31+
<constant name="Alpha" value="0*deg"/>
3232

3333
<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
3434
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
@@ -54,7 +54,9 @@
5454

5555
<detectors>
5656
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" insideTrackingVolume="true" limits="DC_limits">
57-
<chamber id="0"/>
57+
<material name="Air"/>
58+
<chamber id="0" material="GasHe_90Isob_10"/>
59+
<side material="CarbonFiber"/>
5860
<envelope>
5961
<shape type="BooleanShape" operation="Union" material="Air">
6062
<shape type="Tube" rmin="SDT_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
@@ -79,7 +81,7 @@
7981

8082
<readouts>
8183
<readout name="DriftChamberHitsCollection">
82-
<segmentation type="GridDriftChamber" cell_size="SDT_chamber_cell_width" epsilon0="Epsilon" detector_length="DC_length" identifier_phi="cellID" DC_rbegin="DC_chamber_layer_rbegin" DC_rend="DC_chamber_layer_rend" DC_rmin="SDT_chamber_radius_min" DC_rmax="SDT_chamber_radius_max" safe_distance="DC_safe_distance" layerID="layer" layer_width="SDT_chamber_layer_width"/>
84+
<segmentation type="GridDriftChamber" cell_size="SDT_chamber_cell_width" detector_length="DC_length" identifier_phi="cellID" DC_rbegin="DC_chamber_layer_rbegin" DC_rend="DC_chamber_layer_rend" DC_rmin="SDT_chamber_radius_min" DC_rmax="SDT_chamber_radius_max" safe_distance="DC_safe_distance" layerID="layer" layer_width="SDT_chamber_layer_width"/>
8385

8486
<!-- <id>system:8,chamber:1,layer:8,cellID:16</id> -->
8587
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>

Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml

+7-10
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,16 @@
8484
<constant name="Vertex_half_length" value="200*mm"/>
8585
<constant name="Vertex_Side_rmin" value="BeamPipe_VertexRegion_rmax"/>
8686

87+
<!-- Parameters of single drift chamber -->
88+
<constant name="DC_rbegin" value="800*mm"/>
89+
<constant name="DC_rend" value="1800*mm"/>
90+
8791
<constant name="DC_Endcap_dz" value="0.1*mm"/>
8892
<constant name="DC_half_length" value="2980*mm" />
8993
<constant name="DC_safe_distance" value="0.02*mm"/>
90-
<constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
91-
<constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
92-
<constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_dz" />
94+
<constant name="DC_inner_wall_thickness" value="0.2*mm"/>
95+
<constant name="DC_outer_wall_thickness" value="2.8*mm"/>
96+
<constant name="MainTracker_half_length" value="DC_half_length"/>
9397

9498
<!--obselete for single drift chamber-->
9599
<constant name="InnerTracker_half_length" value="DC_half_length" />
@@ -99,13 +103,6 @@
99103
<constant name="OuterTracker_inner_radius" value="1082.18*mm"/>
100104
<constant name="OuterTracker_outer_radius" value="1723*mm"/>
101105

102-
<!-- Parameters of single drift chamber -->
103-
<constant name="DC_chamber_layer_rbegin" value="800*mm"/>
104-
<constant name="DC_chamber_layer_rend" value="1800*mm"/>
105-
106-
<constant name="DC_inner_radius" value="DC_chamber_layer_rbegin-SDT_inner_wall_thickness-DC_safe_distance"/>
107-
<constant name="DC_outer_radius" value="DC_chamber_layer_rend+SDT_outer_wall_thickness+DC_safe_distance"/>
108-
109106
<constant name="SIT1_inner_radius" value="230*mm"/>
110107
<constant name="SIT2_inner_radius" value="410*mm"/>
111108
<constant name="SIT3_inner_radius" value="590*mm"/>

Detector/DetCRD/compact/CRD_o1_v01/CRD_o1_v01-onlyTracker.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
3232
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
3333
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
34-
<include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
34+
<include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
3535
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>
3636

3737
<fields>

Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml

+7-10
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,16 @@
8484
<constant name="Vertex_half_length" value="200*mm"/>
8585
<constant name="Vertex_Side_rmin" value="BeamPipe_VertexRegion_rmax"/>
8686

87+
<!-- Parameters of single drift chamber -->
88+
<constant name="DC_rbegin" value="800*mm"/>
89+
<constant name="DC_rend" value="1800*mm"/>
90+
8791
<constant name="DC_Endcap_dz" value="0.1*mm"/>
8892
<constant name="DC_half_length" value="2980*mm" />
8993
<constant name="DC_safe_distance" value="0.02*mm"/>
90-
<constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
91-
<constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
92-
<constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_dz" />
94+
<constant name="DC_inner_wall_thickness" value="0.2*mm"/>
95+
<constant name="DC_outer_wall_thickness" value="2.8*mm"/>
96+
<constant name="MainTracker_half_length" value="DC_half_length"/>
9397

9498
<!--obselete for single drift chamber-->
9599
<constant name="InnerTracker_half_length" value="DC_half_length" />
@@ -99,13 +103,6 @@
99103
<constant name="OuterTracker_inner_radius" value="1082.18*mm"/>
100104
<constant name="OuterTracker_outer_radius" value="1723*mm"/>
101105

102-
<!-- Parameters of single drift chamber -->
103-
<constant name="DC_chamber_layer_rbegin" value="800*mm"/>
104-
<constant name="DC_chamber_layer_rend" value="1800*mm"/>
105-
106-
<constant name="DC_inner_radius" value="DC_chamber_layer_rbegin-SDT_inner_wall_thickness-DC_safe_distance"/>
107-
<constant name="DC_outer_radius" value="DC_chamber_layer_rend+SDT_outer_wall_thickness+DC_safe_distance"/>
108-
109106
<constant name="SIT1_inner_radius" value="230*mm"/>
110107
<constant name="SIT2_inner_radius" value="410*mm"/>
111108
<constant name="SIT3_inner_radius" value="590*mm"/>

0 commit comments

Comments
 (0)