Skip to content

New far forward beampipe and cryostat model v2025 implementation #893

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

Open
wants to merge 85 commits into
base: main
Choose a base branch
from
Open

New far forward beampipe and cryostat model v2025 implementation #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
bfcfd93
First implementation of the B0 yoke
Jun 5, 2025
6385d7b
Added coils, support tubes, manifold(endplates).
Jun 5, 2025
c9b99ed
Added heatshield and cryo
Jun 6, 2025
8f3ad14
Added Q0eF tubes and coils
Jun 6, 2025
9896e00
Polished XML, define common variables
Jun 6, 2025
bb49969
Added B0ApF
Jun 6, 2025
a8c8d66
Added Q1ApF
Jun 6, 2025
7859010
Added Q1BpF
Jun 6, 2025
c795049
Added Q1eF
Jun 6, 2025
59e4777
Added Q2pF yoke
Jun 6, 2025
eefdc4b
Added Q2pF yoke (more holes)
Jun 6, 2025
694d574
Added Q2pF
Jun 7, 2025
af2148a
Added B1pF
Jun 7, 2025
2666862
Fixed rotation around Y
Jun 7, 2025
eb8f9c1
Added B1ApF (full) and Q1ApR (yoke)
Jun 9, 2025
9a550c2
Added Q1ApR coils
Jun 10, 2025
2007a5e
Added Q1ApR
Jun 16, 2025
86e54bd
Added Q1BpR
Jun 16, 2025
8ba0128
Added Q2pR
Jun 16, 2025
615130b
Added Q1eR and Q2eR
Jun 16, 2025
a734fbb
Corrected visualization in XML files
Jun 16, 2025
e459add
Minor corrections
Jun 17, 2025
76e2f65
build a single beam pipe + vacuum for the electron ring on the fwd si…
Jun 17, 2025
ed5ddb6
Switched from Cone to ConeSegment for the vacuum volume between the I…
Jun 17, 2025
019dad3
Enlarged a hole in the non-IP heat shield of the B0 cryo to avoid ove…
Jun 17, 2025
e75bb1e
Reduced inner radius for the fwd hadron beam pipe to avoid overlaps w…
Jun 17, 2025
c2c07c9
Adjusted far-fwd hadron beam pipe to avoid overlaps with the fwd cryo…
Jun 18, 2025
adc08f3
Adjusted far-bwd electron beam pipe to avoid overlaps with the bwd cr…
Jun 18, 2025
eef9e75
Enlarged hole opening in the B0 exit window to avoid overlaps with Q0…
Jun 18, 2025
05fec7e
Reduced small tracker outer radius in B0 to avoid overlaps with Q0eF
Jun 18, 2025
81da693
First implementation of the B0 yoke
Jun 5, 2025
2413455
Added coils, support tubes, manifold(endplates).
Jun 5, 2025
ffd0d87
Added heatshield and cryo
Jun 6, 2025
8fbafab
Added Q0eF tubes and coils
Jun 6, 2025
dbcffde
Polished XML, define common variables
Jun 6, 2025
5326433
Added B0ApF
Jun 6, 2025
44b7fff
Added Q1ApF
Jun 6, 2025
10d7534
Added Q1BpF
Jun 6, 2025
29dc093
Added Q1eF
Jun 6, 2025
3fa32da
Added Q2pF yoke
Jun 6, 2025
dbf38c1
Added Q2pF yoke (more holes)
Jun 6, 2025
2d9e648
Added Q2pF
Jun 7, 2025
8db9609
Added B1pF
Jun 7, 2025
f515ddf
Fixed rotation around Y
Jun 7, 2025
2137085
Added B1ApF (full) and Q1ApR (yoke)
Jun 9, 2025
25b02d3
Added Q1ApR coils
Jun 10, 2025
bc8e45f
Added Q1ApR
Jun 16, 2025
094b61e
Added Q1BpR
Jun 16, 2025
78d9fe1
Added Q2pR
Jun 16, 2025
a250322
Added Q1eR and Q2eR
Jun 16, 2025
64b10d0
Corrected visualization in XML files
Jun 16, 2025
86b413b
Minor corrections
Jun 17, 2025
934d2ef
build a single beam pipe + vacuum for the electron ring on the fwd si…
Jun 17, 2025
d911cdb
Switched from Cone to ConeSegment for the vacuum volume between the I…
Jun 17, 2025
96ba2fc
Enlarged a hole in the non-IP heat shield of the B0 cryo to avoid ove…
Jun 17, 2025
5f246ed
Reduced inner radius for the fwd hadron beam pipe to avoid overlaps w…
Jun 17, 2025
d047a5a
Adjusted far-fwd hadron beam pipe to avoid overlaps with the fwd cryo…
Jun 18, 2025
806582b
Adjusted far-bwd electron beam pipe to avoid overlaps with the bwd cr…
Jun 18, 2025
3fd579c
Enlarged hole opening in the B0 exit window to avoid overlaps with Q0…
Jun 18, 2025
7c72887
Reduced small tracker outer radius in B0 to avoid overlaps with Q0eF
Jun 18, 2025
f9bee8d
Rebased
Jun 18, 2025
858e94e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 19, 2025
fce4702
Removed unnecessary magnet IDs
Jun 19, 2025
2b9b4c3
Fixed conflicts
Jun 19, 2025
0cafea9
Renamed CylindricalDipoleMagnet to CryostatMagnet class for cryostat …
Jun 19, 2025
33f35a5
enlarged BWD cryostat hole openening to avoid overlaps with outdated …
Jun 20, 2025
f7df771
Added instructions on how to define cryostat magnet coordinates
Jun 23, 2025
8758ea2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 23, 2025
b7154b3
Minor corrections to the XML comments
Jun 23, 2025
8451f98
Minor corrections to the XML comments
Jun 23, 2025
56410ad
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 23, 2025
6bef784
Merge branch 'main' into new_far_forward_beampipe_and_cryostat_model_…
wdconinc Jun 24, 2025
ba21e2d
Restored previous electron outgoing beam pipe sizes (to avoid any imp…
Jun 25, 2025
edcbc95
Merge branch 'new_far_forward_beampipe_and_cryostat_model_v2025_imple…
Jun 25, 2025
26727a7
Updated the copyright statements to include 'Andrii Natochii'
Jun 30, 2025
79ffe1f
Removed the white space between the numbers, units and operators in t…
Jun 30, 2025
5daaae8
Moved cryo magnets from far_backwardbeamline_extension_e/h.xml to far…
Jun 30, 2025
9264576
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 30, 2025
4fc2de9
Enlarged radius for hadron ring endplates to avoid overlaps with a be…
Jul 3, 2025
0613861
add some missing units in the HSR beamline
Jul 3, 2025
795b58e
shift OMD in x-direction to account for shift in z
Jul 3, 2025
0f6ab12
Added missing units and fixed old typos
Jul 4, 2025
50b65d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 4, 2025
090fe4e
adjust x positions of OMD to properly center on OMD protons
Jul 7, 2025
24d2b23
Merge branch 'main' into new_far_forward_beampipe_and_cryostat_model_…
veprbl Jul 9, 2025
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
1 change: 1 addition & 0 deletions compact/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<vis name="AnlProcess_Blue" alpha="1" r="0/256" g="100/256" b="202/256"/>
<vis name="AnlOrange" alpha="1" r="255/256" g="121/256" b="0"/>
<vis name="AnlRed" alpha="1" r="205/256" g="45/256 " b="45/256"/>
<vis name="AnlCyan" alpha="1" r="0/256" g="255/256 " b="255/256"/>
<vis name="AnlGold" alpha="1" r="248/256" g="188/256" b="0/256"/>
<vis name="AnlBlue" alpha="1" r="0/256" g="96/256" b="156/256"/>
<vis name="AnlTeal" alpha="1" r="0/256" g="161/256" b="156/256"/>
Expand Down
10 changes: 7 additions & 3 deletions compact/display.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,13 @@
<comment>
Beam line with magnets
</comment>
<vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
<vis name="FFMagnetVis" ref="AnlGreen" showDaughters="true" visible="true"/>
<vis name="FFMagnetCoilVis" ref="AnlRed" showDaughters="true" visible="true"/>
<vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
<vis name="MagnetVis" ref="AnlBlue" showDaughters="true" visible="true"/>
<vis name="MagnetCoilVis" ref="AnlGreen" showDaughters="true" visible="true"/>
<vis name="MagnetSupportTubeVis" ref="AnlCyan" showDaughters="true" visible="true"/>
<vis name="MagnetEndPlateVis" ref="AnlRed" showDaughters="true" visible="true"/>
<vis name="MagnetHeatShieldVis" ref="AnlGray" showDaughters="true" visible="true"/>
<vis name="MagnetCryoVis" ref="AnlOrange" showDaughters="true" visible="true"/>

<comment>
ZDC visualization
Expand Down
7 changes: 0 additions & 7 deletions compact/display_detailed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,6 @@
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>

<comment>
Beam line with magnets
</comment>
<vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
<vis name="FFMagnetVis" ref="AnlGreen" showDaughters="true" visible="true"/>
<vis name="FFMagnetCoilVis" ref="AnlRed" showDaughters="true" visible="true"/>

<comment>
ZDC visualization
</comment>
Expand Down
7 changes: 0 additions & 7 deletions compact/display_geoviewer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,6 @@
<vis name="DIRCFrameVis" ref="AnlOrange" showDaughters="true" visible="true"/>
<vis name="DIRCBarVis" ref="AnlTeal" showDaughters="true" visible="true"/>

<comment>
Beam line with magnets
</comment>
<vis name="BeamPipeVis" ref="AnlLightGray" showDaughters="true" visible="true"/>
<vis name="FFMagnetVis" ref="AnlGreen" showDaughters="true" visible="true"/>
<vis name="FFMagnetCoilVis" ref="AnlRed" showDaughters="true" visible="true"/>

<comment>
ZDC visualization
</comment>
Expand Down
3 changes: 1 addition & 2 deletions compact/far_backward/beamline_extension_electron.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
<!-- Copyright (C) 2022 Dhevan Gangadharan, Simon Gardner -->
<!-- Copyright (C) 2022 Dhevan Gangadharan, Simon Gardner, Andrii Natochii -->

<lccdd>

Expand All @@ -9,7 +9,6 @@
</comment>

<detectors>

<comment> Electron side extended beam pipe volumes </comment>
<!-- Beam pipe going from Q3eR to B7eR -->
<detector
Expand Down
23 changes: 7 additions & 16 deletions compact/far_backward/beamline_extension_hadron.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- SPDX-License-Identifier: LGPL-3.0-or-later -->
<!-- Copyright (C) 2022 Simon Gardner, Dhevan Gangadharan -->
<!-- Copyright (C) 2022 Simon Gardner, Dhevan Gangadharan, Andrii Natochii -->

<lccdd>

Expand All @@ -10,20 +10,12 @@

<detectors>


<comment> Hadron side beam magnet volumes </comment>

<detector name="Magnet_Q2PR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
<placement x="(Q2PR_StartX+Q2PR_EndX)/2" y="0" z="(Q2PR_StartZ+Q2PR_EndZ)/2" theta="Q1BPR_Theta"/>
<dimensions x="Q2PR_InnerRadius*4" y="Q2PR_InnerRadius*4" z="Q2PR_Length" r="2.0*Q2PR_InnerRadius"/>
<apperture x="Q2PR_InnerRadius*2" y="Q2PR_InnerRadius*2" r="Q2PR_InnerRadius"/>
<coil dx="2*cm" dy="1.5*cm" />
</detector>

<detector
name="Magnets_Q3PR_to_B1PR"
type="CylindricalMagnetChain"
vis="FFMagnetVis">
vis="MagnetVis">
<magnet id="0" name="Magnet_Q3PR"
x="(Q3PR_StartX+Q3PR_EndX)/2" y="0" z="(Q3PR_StartZ+Q3PR_EndZ)/2" theta="Q3PR_Theta"
length="Q3PR_Length" rin="Q3PR_InnerRadius" rout="Q3PR_OuterRadius">
Expand All @@ -50,32 +42,31 @@
</magnet>
</detector>


<comment> Hadron side beam pipe volumes </comment>

<detector
name="Pipe_Q1APR_to_B1PR"
type="BeamPipeChain"
wall_thickness="2*mm">
<pipe id="0" name="Pipe_to_Q1APR"
xcenter="(Hadron_Beampipe_End*sin(CrossingAngle) + Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End + Q1APR_StartZ)/2."
length="(Hadron_Beampipe_End - Q1APR_StartZ)/cos(CrossingAngle)" theta="CrossingAngle"
xcenter="(Hadron_Beampipe_End*sin(CrossingAngle)+Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End+Q1APR_StartZ)/2."
length="(Hadron_Beampipe_End-Q1APR_StartZ)/cos(CrossingAngle)" theta="CrossingAngle"
rout1="Hadron_Beampipe_Rad" rout2="Hadron_Beampipe_Rad">
</pipe>
<pipe id="1" name="Pipe_in_Q1APR"
xcenter="(Q1APR_StartX + Q1APR_EndX)/2." zcenter="(Q1APR_StartZ + Q1APR_EndZ)/2."
xcenter="(Q1APR_StartX+Q1APR_EndX)/2." zcenter="(Q1APR_StartZ+Q1APR_EndZ)/2."
length="Q1APR_Length" theta="Q1APR_Theta"
rout1="Q1APR_InnerRadius" rout2="Q1APR_InnerRadius">
</pipe>
<pipe id="2" name="Pipe_Q1APR_to_Q1BPR"/>
<pipe id="3" name="Pipe_in_Q1BPR"
xcenter="(Q1BPR_StartX + Q1BPR_EndX)/2." zcenter="(Q1BPR_StartZ + Q1BPR_EndZ)/2."
xcenter="(Q1BPR_StartX+Q1BPR_EndX)/2." zcenter="(Q1BPR_StartZ+Q1BPR_EndZ)/2."
length="Q1BPR_Length" theta="Q1BPR_Theta"
rout1="Q1BPR_InnerRadius" rout2="Q1BPR_InnerRadius">
</pipe>
<pipe id="4" name="Pipe_Q1BPR_to_Q2PR"/>
<pipe id="5" name="Pipe_in_Q2PR"
xcenter="(Q2PR_StartX + Q2PR_EndX)/2." zcenter="(Q2PR_StartZ + Q2PR_EndZ)/2."
xcenter="(Q2PR_StartX+Q2PR_EndX)/2." zcenter="(Q2PR_StartZ+Q2PR_EndZ)/2."
length="Q2PR_Length" theta="Q2PR_Theta"
rout1="Q2PR_InnerRadius" rout2="Q2PR_InnerRadius">
</pipe>
Expand Down
Loading
Loading