Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase the diagonal wire version #199

Merged
merged 34 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
eb7a141
Increase the diagonal wire version
Oct 28, 2021
5b7f124
Remove unimportant output information
Oct 28, 2021
6a46894
Slanted version of the XML file
Oct 28, 2021
7ce1444
The diagonal wire version of the drift chamber in SDT
Oct 28, 2021
bee3359
Modify the name of the DC's xml file
Oct 31, 2021
a466721
Add a layer of protection to variables
Oct 31, 2021
b0baa33
fix simulation issues
Feb 23, 2022
0315c55
Merge branch 'master' into master
myliu-hub Feb 23, 2022
2a2999b
delete blank lines
Feb 24, 2022
82ff8ae
Merge branch 'master' of github.com:myliu-hub/CEPCSW
Jun 5, 2022
a80dc6f
update 101
Jun 5, 2022
f0fd625
update 101 -2
Jun 5, 2022
712b6bb
update 101 -3
Jun 5, 2022
62b60c7
merge cepcsw/master
Jun 5, 2022
2f734f7
Add TrackHelper head file and PlanarMeasurementSDT and WireMeasurementDC
Jun 6, 2022
3598e9e
Merge branch 'master' into master
myliu-hub Jun 29, 2022
23666a4
TrackState add time
Jul 5, 2022
b71b000
Fix Compile Error
Jul 5, 2022
c71bd59
Add DC_Simple_v01_03.xml
Jan 4, 2023
9a4b474
Resolve conflicts
Jan 4, 2023
658f043
Add a script to run the RecGenfitAlgSDT
Jan 5, 2023
0c9a931
fixed script
Jan 5, 2023
5664a31
Fixed some insecure bugs
Jan 6, 2023
65ab1b6
Merge branch 'master' into master
myliu-hub Mar 11, 2024
62a8769
Updata 103.0.2
Mar 11, 2024
77e839a
Merge branch 'master' of github.com:myliu-hub/CEPCSW
Mar 11, 2024
220144f
Set the alpha of sense wire
Mar 11, 2024
6bfda1a
Update DriftChamber construct
Mar 11, 2024
06de55e
Merge remote-tracking branch 'cepcsw/master'
Mar 13, 2024
8f74aea
Test CI
Mar 13, 2024
f1a0232
Update RecGenfitAlgSDT
Mar 13, 2024
cd085c3
XML file for oblique geometry
Mar 13, 2024
5f0879c
Add some description
Mar 15, 2024
c8d62f3
Update version of th DC constructor
Mar 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_03.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<lccdd>

<info name="DriftChamber"
title="Test with Drift Chamber"
author="Tao Lin"
url="http://github.com/cepc/CEPCSW"
status="development"
version="v0">
<comment>Test with Drift Chamber</comment>
</info>

<define>

<constant name="DC_layer_number" value="100"/>
<constant name="Alpha" value="12*deg"/>
<constant name="Gas_radius_min" value="DC_rbegin+DC_inner_wall_thickness+DC_safe_distance"/>
<constant name="Gas_half_length" value="DC_half_length-DC_Endcap_dz-DC_safe_distance"/>
<constant name="Gas_length" value="Gas_half_length*2"/>
<constant name="DC_cell_width" value="10*mm"/>
<constant name="DC_inner_wall_radius_min" value="DC_rbegin"/>
<constant name="DC_inner_wall_radius_max" value="DC_rbegin+DC_inner_wall_thickness"/>
<constant name="DC_Endcap_rmin" value="DC_rbegin"/>
<constant name="DC_Endcap_rmax" value="DC_rend"/>

<constant name="DC_construct_wire" value="1"/>

<constant name="DC_layer_width" value="9.57687*mm"/>

</define>

<limits>
<limitset name="DC_limits">
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
</limitset>
</limits>

<regions>
<region name="DriftChamberRegion">
</region>
</regions>

<detectors>
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" region="DriftChamberRegion" limits="DC_limits">
<material name="Air"/>
<chamber id="0" material="GasHe_90Isob_10"/>
<side material="CarbonFiber"/>
<envelope vis="SeeThrough">
<shape type="BooleanShape" operation="Union" material="Air">
<shape type="Tube" rmin="DC_rbegin" rmax="DC_rend" dz="DC_half_length" />
</shape>
</envelope>

<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
</module>

<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
</module>

<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
<sensitive type="SimpleDriftChamber"/>
</detector>
</detectors>

<readouts>
<readout name="DriftChamberHitsCollection">
<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"/>


<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
</readout>
</readouts>

</lccdd>
79 changes: 79 additions & 0 deletions Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_05.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<lccdd>

<info name="DriftChamber"
title="Test with Drift Chamber"
author="Tao Lin"
url="http://github.com/cepc/CEPCSW"
status="development"
version="v0">
<comment>Test with Drift Chamber</comment>
</info>

<define>

<constant name="DC_layer_number" value="55"/>
<constant name="Alpha" value="12*deg"/>
<constant name="Gas_radius_min" value="DC_rbegin+DC_inner_wall_thickness+DC_safe_distance"/>
<constant name="Gas_half_length" value="DC_half_length-DC_Endcap_dz-DC_safe_distance"/>
<constant name="Gas_length" value="Gas_half_length*2"/>
<constant name="DC_cell_width" value="18*mm"/>
<constant name="DC_inner_wall_radius_min" value="DC_rbegin"/>
<constant name="DC_inner_wall_radius_max" value="DC_rbegin+DC_inner_wall_thickness"/>
<constant name="DC_Endcap_rmin" value="DC_rbegin"/>
<constant name="DC_Endcap_rmax" value="DC_rend"/>

<constant name="DC_construct_wire" value="0"/>

<constant name="DC_layer_width" value="18*mm"/>

</define>

<limits>
<limitset name="DC_limits">
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
</limitset>
</limits>

<regions>
<region name="DriftChamberRegion">
</region>
</regions>

<detectors>
<detector id="DetID_DC" name="DriftChamber" type="DriftChamber" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" limits="DC_limits">
<material name="Air"/>
<chamber id="0" material="GasHe_90Isob_10"/>
<side material="CarbonFiber"/>
<envelope vis="SeeThrough">
<shape type="BooleanShape" operation="Union" material="Air">
<shape type="Tube" rmin="DC_rbegin" rmax="DC_rend" dz="DC_half_length" />
</shape>
</envelope>

<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
</module>

<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
</module>

<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
<sensitive type="SimpleDriftChamber"/>
</detector>
</detectors>

<readouts>
<readout name="DriftChamberHitsCollection">
<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"/>


<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
</readout>
</readouts>

</lccdd>
89 changes: 89 additions & 0 deletions Detector/DetCRD/compact/CRD_common_v01/DC_Stero_v01_01.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<lccdd>

<info name="DriftChamber"
title="Test with Drift Chamber"
author="Tao Lin"
url="http://github.com/cepc/CEPCSW"
status="development"
version="v0">
<comment>Test with Drift Chamber</comment>
</info>

<define>

<!-- SDT -->
<constant name="SDT_radius_min" value="DC_inner_radius"/>
<constant name="SDT_radius_max" value="DC_outer_radius"/>

<constant name="SDT_half_length" value="MainTracker_half_length"/>
<constant name="DC_length" value="DC_half_length*2"/>
<constant name="SDT_length" value="SDT_half_length*2"/>

<constant name="SDT_chamber_radius_min" value="DC_chamber_layer_rbegin-DC_safe_distance"/>
<constant name="SDT_chamber_radius_max" value="DC_chamber_layer_rend+DC_chamber_safe_distance+DC_safe_distance"/>
<constant name="SDT_chamber_half_length" value="DC_half_length"/>

<constant name="SDT_chamber_layer_width" value="10*mm"/>
<constant name="SDT_chamber_cell_width" value="10*mm"/>
<constant name="Alpha" value="12*deg"/>

<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
<constant name="SDT_chamber_outer_wall_radius_min" value="SDT_chamber_radius_max"/>
<constant name="SDT_chamber_outer_wall_radius_max" value="SDT_chamber_radius_max+SDT_outer_wall_thickness"/>

<constant name="DC_Endcap_rmin" value="SDT_radius_min"/>
<constant name="DC_Endcap_rmax" value="SDT_radius_max"/>

</define>

<limits>
<limitset name="DC_limits">
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
</limitset>
</limits>

<regions>
<region name="DriftChamberRegion">
<limitsetref name="DC_limits"/>
</region>
</regions>

<detectors>
<detector id="DetID_DC" name="DriftChamber_Stero" type="DriftChamber_Stero" readout="DriftChamberHitsCollection" vis="DCVis" sensitive="true" insideTrackingVolume="true" limits="DC_limits">
<material name="Air"/>
<chamber id="0" material="GasHe_90Isob_10"/>
<side material="CarbonFiber"/>
<envelope vis="SeeThrough">
<shape type="BooleanShape" operation="Union" material="Air">
<shape type="Tube" rmin="SDT_radius_min" rmax="SDT_radius_max" dz="SDT_half_length" />
</shape>
</envelope>

<module id="0" name="SignalWire" type="Tube" rmin="0*mm" rmax="0.01*mm" vis="RedVis">
<tubs name="W" type="Tube" rmin="0*mm" rmax="0.007*mm" material="Tungsten"/>
<tubs name="Au" type="Tube" rmin="0.007*mm" rmax="0.01*mm" material="Gold"/>
</module>

<module id="1" name="FieldWire" type="Tube" rmin="0*mm" rmax="0.02*mm" vis="GreenVis">
<tubs name="Al" type="Tube" rmin="0*mm" rmax="0.017*mm" material="Aluminum"/>
<tubs name="Ag" type="Tube" rmin="0.017*mm" rmax="0.02*mm" material="Silver"/>
</module>

<type_flags type="DetType_TRACKER + DetType_BARREL + DetType_GASEOUS + DetType_WIRE"/>
<!-- Use cm as unit if you want to use Pandora for reconstruction -->
<sensitive type="SimpleDriftChamber"/>
</detector>
</detectors>

<readouts>
<readout name="DriftChamberHitsCollection">
<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"/>


<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
</readout>
</readouts>

</lccdd>
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<constant name="SDT_chamber_layer_width" value="10*mm"/>
<constant name="SDT_chamber_cell_width" value="10*mm"/>
<constant name="Epsilon" value="0*deg"/>
<constant name="Alpha" value="0*deg"/>

<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
Expand All @@ -42,7 +42,7 @@

<limits>
<limitset name="DC_limits">
<limit name="step_length_max" particles="*" value="0.5" unit="mm" />
<limit name="step_length_max" particles="*" value="0.1" unit="mm" />
</limitset>
</limits>

Expand All @@ -53,8 +53,10 @@

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

<readouts>
<readout name="DriftChamberHitsCollection">
<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"/>
<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"/>

<!-- <id>system:8,chamber:1,layer:8,cellID:16</id> -->
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<constant name="SDT_chamber_layer_width" value="10*mm"/>
<constant name="SDT_chamber_cell_width" value="10*mm"/>
<constant name="Epsilon" value="0*deg"/>
<constant name="Alpha" value="0*deg"/>

<constant name="SDT_chamber_inner_wall_radius_min" value="SDT_chamber_radius_min-SDT_inner_wall_thickness"/>
<constant name="SDT_chamber_inner_wall_radius_max" value="SDT_chamber_radius_min"/>
Expand All @@ -54,7 +54,9 @@

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

<readouts>
<readout name="DriftChamberHitsCollection">
<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"/>
<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"/>

<!-- <id>system:8,chamber:1,layer:8,cellID:16</id> -->
<id>system:5,layer:7:9,chamber:8,cellID:32:16</id>
Expand Down
17 changes: 7 additions & 10 deletions Detector/DetCRD/compact/CRD_o1_v01/CRD_Dimensions_v01_01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,16 @@
<constant name="Vertex_half_length" value="200*mm"/>
<constant name="Vertex_Side_rmin" value="BeamPipe_VertexRegion_rmax"/>

<!-- Parameters of single drift chamber -->
<constant name="DC_rbegin" value="800*mm"/>
<constant name="DC_rend" value="1800*mm"/>

<constant name="DC_Endcap_dz" value="0.1*mm"/>
<constant name="DC_half_length" value="2980*mm" />
<constant name="DC_safe_distance" value="0.02*mm"/>
<constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
<constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
<constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_dz" />
<constant name="DC_inner_wall_thickness" value="0.2*mm"/>
<constant name="DC_outer_wall_thickness" value="2.8*mm"/>
<constant name="MainTracker_half_length" value="DC_half_length"/>

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

<!-- Parameters of single drift chamber -->
<constant name="DC_chamber_layer_rbegin" value="800*mm"/>
<constant name="DC_chamber_layer_rend" value="1800*mm"/>

<constant name="DC_inner_radius" value="DC_chamber_layer_rbegin-SDT_inner_wall_thickness-DC_safe_distance"/>
<constant name="DC_outer_radius" value="DC_chamber_layer_rend+SDT_outer_wall_thickness+DC_safe_distance"/>

<constant name="SIT1_inner_radius" value="230*mm"/>
<constant name="SIT2_inner_radius" value="410*mm"/>
<constant name="SIT3_inner_radius" value="590*mm"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<include ref="../CRD_common_v01/VXD_v01_01.xml"/>
<include ref="../CRD_common_v01/FTD_SkewRing_v01_01.xml"/>
<include ref="../CRD_common_v01/SIT_SimplePixel_v01_01.xml"/>
<include ref="../CRD_common_v01/DC_Simple_v01_02.xml"/>
<include ref="../CRD_common_v01/DC_Simple_v01_05.xml"/>
<include ref="../CRD_common_v01/SET_SimplePixel_v01_01.xml"/>

<fields>
Expand Down
17 changes: 7 additions & 10 deletions Detector/DetCRD/compact/CRD_o1_v02/CRD_Dimensions_v01_02.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,16 @@
<constant name="Vertex_half_length" value="200*mm"/>
<constant name="Vertex_Side_rmin" value="BeamPipe_VertexRegion_rmax"/>

<!-- Parameters of single drift chamber -->
<constant name="DC_rbegin" value="800*mm"/>
<constant name="DC_rend" value="1800*mm"/>

<constant name="DC_Endcap_dz" value="0.1*mm"/>
<constant name="DC_half_length" value="2980*mm" />
<constant name="DC_safe_distance" value="0.02*mm"/>
<constant name="SDT_inner_wall_thickness" value="0.2*mm"/>
<constant name="SDT_outer_wall_thickness" value="2.8*mm"/>
<constant name="MainTracker_half_length" value="DC_half_length+DC_Endcap_dz" />
<constant name="DC_inner_wall_thickness" value="0.2*mm"/>
<constant name="DC_outer_wall_thickness" value="2.8*mm"/>
<constant name="MainTracker_half_length" value="DC_half_length"/>

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

<!-- Parameters of single drift chamber -->
<constant name="DC_chamber_layer_rbegin" value="800*mm"/>
<constant name="DC_chamber_layer_rend" value="1800*mm"/>

<constant name="DC_inner_radius" value="DC_chamber_layer_rbegin-SDT_inner_wall_thickness-DC_safe_distance"/>
<constant name="DC_outer_radius" value="DC_chamber_layer_rend+SDT_outer_wall_thickness+DC_safe_distance"/>

<constant name="SIT1_inner_radius" value="230*mm"/>
<constant name="SIT2_inner_radius" value="410*mm"/>
<constant name="SIT3_inner_radius" value="590*mm"/>
Expand Down
Loading
Loading