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.

Sign up for GitHub

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

fix: update tracker support and services cones per project CAD info #661

Merged
merged 21 commits into from
Apr 29, 2024
Merged

fix: update tracker support and services cones per project CAD info #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
90a06e7
fix: update tracker support and services cones per project CAD info
wdconinc Mar 11, 2024
b6585e7
feat: allow for Tube/Cylinder/Disk/Cone with phimin/phimax
wdconinc Mar 13, 2024
9347143
fix: supports/services as of Services Material Budget 24.03.13.stp
wdconinc Mar 13, 2024
25d85ae
fix: nudge TrackerSupportCylEndcapN_rmin2 to avoid EcalEndcapN overlap
wdconinc Mar 14, 2024
fb07286
fix: updates per Services Material Budget 24.03.13.stp
wdconinc Mar 14, 2024
65d0125
fix: inner detector barrel support cylinder has length of DIRC
wdconinc Mar 14, 2024
ab63f3e
fix: inherit phimin/phimax from support parent
wdconinc Mar 18, 2024
38e7dac
fix: add services routing around DRICH
wdconinc Mar 18, 2024
7d24089
feat: support cone rmin/rmax with priority over rmin1/2, rmax1/2
wdconinc Mar 18, 2024
14a5525
fix: use TGeoShape::Tolerance() = 1e-10 instead of std::numeric_limit…
wdconinc Apr 5, 2024
db74e9a
fix: spacing
wdconinc Apr 8, 2024
a67ee95
fix: consistent polycone z-plane ordering
wdconinc Apr 8, 2024
58d20a6
fix: correct zmax determination when rmax is given
wdconinc Apr 8, 2024
77c95ac
fix: DRICH sensorbox rmin to 108 cm per https://indico.bnl.gov/event/…
wdconinc Apr 8, 2024
c662362
fix: route services around DRICH without overlaps
wdconinc Apr 8, 2024
d382b24
fix: InnerSupportCone Al thickness =-0.5 mm for OuterSiBarrel overlap
wdconinc Apr 8, 2024
3f5225d
fix: clang-format
wdconinc Apr 16, 2024
f2f9317
Merge remote-tracking branch 'origin/main' into services_effective_al…
wdconinc Apr 16, 2024
e0e10fe
Merge branch 'main' into services_effective_aluminum_thickness
veprbl Apr 26, 2024
c882cde
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 26, 2024
601c652
support_service_craterlake.xml: remove the fudge
veprbl Apr 26, 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
2 changes: 1 addition & 1 deletion compact/pid/drich.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<constant name="DRICH_rmax2" value="ForwardPIDRegion_rmax"/> <!-- cylinder radius -->
<!-- sensor boxes: extrusions of the tank, to hold the sensors and their services -->
<constant name="DRICH_sensorbox_length" value="50.0*cm"/> <!-- z-length of the extrusion -->
<constant name="DRICH_sensorbox_rmin" value="DRICH_rmax1 + 2*cm"/> <!-- lower radial limit of the extrusion -->
<constant name="DRICH_sensorbox_rmin" value="108*cm"/> <!-- lower radial limit of the extrusion -->
<constant name="DRICH_sensorbox_rmax" value="DRICH_rmax2 + 5*cm"/> <!-- upper radial limit of the extrusion -->
<constant name="DRICH_sensorbox_dphi" value="42*degree"/> <!-- azimuthal width of the extrusion -->
<!-- aerogel+filter geometry -->
Expand Down
5 changes: 3 additions & 2 deletions compact/tracking/definitions_craterlake.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@
<constant name="ForwardTOF_zmin" value="ForwardTOFRegion_zmin + ForwardTOFRegion_length - ForwardTOF_length - 1*cm"/>

<comment> Service/Support setup </comment>
<constant name="TrackerSupportCyl_rmin1" value="TrackerEndcapDisk_rmax + 0.2*cm"/>
<constant name="TrackerSupportCyl_rmin2" value="InnerMPGDBarrel_rmin - 1.2*cm"/>
<constant name="TrackerSupportCyl_rmin1" value="TrackerEndcapDisk_rmax + 2*cm"/> <comment> Ref: Services Material Budget 24.03.04..stp -- 450.00 mm </comment>
<constant name="TrackerSupportCylEndcapN_rmin2" value="BackwardPIDRegion_rmax + 4.5*cm"/> <comment> Ref: Services Material Budget 24.03.13.stp -- 670.00 mm, nudged 5 mm </comment>
<constant name="TrackerSupportCylEndcapP_rmin2" value="ForwardTOFRegion_maxR + 2*cm"/> <comment> Ref: Services Material Budget 24.03.04..stp -- 520.00 mm </comment>
<comment> These may belong in definitions.xml </comment>
<constant name="InnerTrackerEndcapP_zmax" value="CentralTrackingRegionP_zmax"/>
<constant name="InnerTrackerEndcapN_zmax" value="CentralTrackingRegionN_zmax"/>
Expand Down
Loading