-
Notifications
You must be signed in to change notification settings - Fork 71
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
Changes from 18 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
eb7a141
Increase the diagonal wire version
5b7f124
Remove unimportant output information
6a46894
Slanted version of the XML file
7ce1444
The diagonal wire version of the drift chamber in SDT
bee3359
Modify the name of the DC's xml file
a466721
Add a layer of protection to variables
b0baa33
fix simulation issues
0315c55
Merge branch 'master' into master
myliu-hub 2a2999b
delete blank lines
82ff8ae
Merge branch 'master' of github.com:myliu-hub/CEPCSW
a80dc6f
update 101
f0fd625
update 101 -2
712b6bb
update 101 -3
62b60c7
merge cepcsw/master
2f734f7
Add TrackHelper head file and PlanarMeasurementSDT and WireMeasurementDC
3598e9e
Merge branch 'master' into master
myliu-hub 23666a4
TrackState add time
b71b000
Fix Compile Error
c71bd59
Add DC_Simple_v01_03.xml
9a4b474
Resolve conflicts
658f043
Add a script to run the RecGenfitAlgSDT
0c9a931
fixed script
5664a31
Fixed some insecure bugs
65ab1b6
Merge branch 'master' into master
myliu-hub 62a8769
Updata 103.0.2
77e839a
Merge branch 'master' of github.com:myliu-hub/CEPCSW
220144f
Set the alpha of sense wire
6bfda1a
Update DriftChamber construct
06de55e
Merge remote-tracking branch 'cepcsw/master'
8f74aea
Test CI
f1a0232
Update RecGenfitAlgSDT
cd085c3
XML file for oblique geometry
5f0879c
Add some description
c8d62f3
Update version of th DC constructor
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
Detector/DetCRD/compact/CRD_common_v01/DC_Simple_v01_05.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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="0"/> | ||
|
||
<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" 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
89
Detector/DetCRD/compact/CRD_common_v01/DC_Stero_v01_01.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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_01.xml"/> | ||
<include ref="../CRD_common_v01/DC_Simple_v01_03.xml"/> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. DC_Simple_v01_03.xml is missing? |
||
<include ref="../CRD_common_v01/SET_SimplePlanar_v01_01.xml"/> | ||
|
||
<fields> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't find DC_Simple_v01_03.xml. Could you please double check?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @myliu-hub , could you reply Yao's comment?