Skip to content

6.3.1 Far-Backwards Lattice #838

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

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
+525 −314
Draft

6.3.1 Far-Backwards Lattice #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
083df21
Swapped small air gap for a proper pipe bend
simonge Feb 21, 2025
ccb43ff
Fix vacuum torus
simonge Feb 21, 2025
a909678
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 21, 2025
8512aa7
Changes for 6.3.1 lattice
simonge Mar 3, 2025
9ef68c9
Updated all configurations
simonge Mar 3, 2025
72ba381
Update some of the extension
simonge Mar 5, 2025
77ce7f7
Fruther extensions
simonge Mar 5, 2025
d74bc4e
Added and fixed remaining beamline extension
simonge Mar 5, 2025
7e79898
Fix visualization
simonge Mar 5, 2025
051ae3d
Add visualization of FF electron magnets
simonge Mar 5, 2025
c8846ea
Make beamline magnet calculation more transparent
simonge Mar 5, 2025
048a90b
Fix unit conversions
simonge Mar 5, 2025
6c30541
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Mar 10, 2025
e62b169
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Mar 11, 2025
d10f1e7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 11, 2025
5afbdb5
Updated new configurations
simonge Mar 11, 2025
a344779
Merge branch '6.3-Lattice' of github.com:eic/epic into 6.3-Lattice
simonge Mar 11, 2025
3dc587e
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Apr 29, 2025
ad49f2d
Fix new configuration
simonge Apr 29, 2025
0dd7b38
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Jun 17, 2025
aab8f79
Move lumi collimator out of beampipe
simonge Jun 18, 2025
9fa60fb
Put fields definitions after far detectors
simonge Jun 18, 2025
4bedb27
Fix merging error
simonge Jun 18, 2025
2f52378
Allow incoming rotation in tagger box
simonge Jun 18, 2025
e3be88a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 18, 2025
b36ecb6
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Jun 25, 2025
c719e3c
Merge remote-tracking branch 'origin/main' into 6.3-Lattice
simonge Jul 3, 2025
efce9a5
Fixes for stuck particles
simonge Jul 3, 2025
52afee9
Remove debugging cout
simonge Jul 3, 2025
7db751f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 3, 2025
de1b6d9
Actually rotate the magnetic field to match the magnet
simonge Jul 3, 2025
44952f9
Shrink to 5cm radius
simonge Jul 3, 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
156 changes: 111 additions & 45 deletions compact/far_backward/beamline_extension_electron.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,52 +11,93 @@
<detectors>

<comment> Electron side extended beam pipe volumes </comment>
<!-- Beam pipe going from Q3eR to B7eR -->
<!-- Beam pipe going from Q3eR to Q6eR -->
<detector
name="Pipe_Q3eR_to_B7eR"
name="Pipe_Q3eR_to_Q6eR"
type="BeamPipeChain"
wall_thickness="2*mm">
<pipe id="0" name="Pipe_in_Q3eR"
xcenter="Q3eR_XPosition" zcenter="Q3eR_CenterPosition"
<pipe id="0" name="Pipe_in_SQ3eR"
xcenter="SQ3eR_XPosition" zcenter="SQ3eR_CenterPosition"
length="SQ3eR_Length" theta="SQ3eR_Theta"
rout1="SQ3eR_InnerRadius" rout2="SQ3eR_InnerRadius">
</pipe>
<pipe id="1" name="Pipe_SQ3eR_to_Q3eR"/>
<pipe id="2" name="Pipe_in_Q3eR"
xcenter="Q3eR_CenterX" zcenter="Q3eR_CenterZ"
length="Q3eR_Length" theta="Q3eR_Theta"
rout1="Q3eR_InnerRadius" rout2="Q3eR_InnerRadius">
</pipe>
<pipe id="1" name="Pipe_Q3eR_to_Q4eR"/>
<pipe id="2" name="Pipe_in_Q4eR"
<pipe id="3" name="Pipe_Q3eR_to_SQ4eR"/>
<pipe id="4" name="Pipe_in_SQ4eR"
xcenter="SQ4eR_CenterX" zcenter="SQ4eR_CenterZ"
length="SQ4eR_Length" theta="SQ4eR_Theta"
rout1="SQ4eR_InnerRadius" rout2="SQ4eR_InnerRadius">
</pipe>
<pipe id="5" name="Pipe_SQ4eR_to_Q4eR"/>
<pipe id="6" name="Pipe_in_Q4eR"
xcenter="Q4eR_CenterX" zcenter="Q4eR_CenterZ"
length="Q4eR_Length" theta="Q4eR_Theta"
rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius"
limits="kill_limits">
rout1="Q4eR_InnerRadius" rout2="Q4eR_InnerRadius">
</pipe>
<pipe id="7" name="Pipe_Q4eR_to_SQ5eR"/>
<pipe id="8" name="Pipe_in_SQ5eR"
xcenter="SQ5eR_CenterX" zcenter="SQ5eR_CenterZ"
length="SQ5eR_Length" theta="SQ5eR_Theta"
rout1="SQ5eR_InnerRadius" rout2="SQ5eR_InnerRadius">
</pipe>
<pipe id="9" name="Pipe_SQ5eR_to_Q5eR"/>
<pipe id="10" name="Pipe_in_Q5eR"
xcenter="Q5eR_CenterX" zcenter="Q5eR_CenterZ"
length="Q5eR_Length" theta="Q5eR_Theta"
rout1="Q5eR_InnerRadius" rout2="Q5eR_InnerRadius">
</pipe>
<pipe id="3" name="Pipe_Q4eR_to_B3eR"/>
<pipe id="4" name="Pipe_in_B3eR"
<pipe id="11" name="Pipe_Q5eR_to_B3eR"/>
<pipe id="12" name="Pipe_in_B3eR"
xcenter="B3eR_CenterX" zcenter="B3eR_CenterZ"
length="B3eR_Length" theta="B3eR_Theta"
rout1="B3eR_InnerRadius" rout2="B3eR_InnerRadius">
</pipe>
<pipe id="5" name="Pipe_B3eR_to_B4eR"/>
<pipe id="6" name="Pipe_in_B4eR"
xcenter="B4eR_CenterX" zcenter="B4eR_CenterZ"
length="B4eR_Length" theta="B4eR_Theta"
rout1="B4eR_InnerRadius" rout2="B4eR_InnerRadius">
<pipe id="13" name="Pipe_B3eR_to_SQ6eR"/>
<pipe id="14" name="Pipe_in_SQ6eR"
xcenter="SQ6eR_CenterX" zcenter="SQ6eR_CenterZ"
length="SQ6eR_Length" theta="SQ6eR_Theta"
rout1="SQ6eR_InnerRadius" rout2="SQ6eR_InnerRadius">
</pipe>
<pipe id="15" name="Pipe_SQ6eR_to_Q6eR"/>
<pipe id="16" name="Pipe_in_Q6eR"
xcenter="Q6eR_CenterX" zcenter="Q6eR_CenterZ"
length="Q6eR_Length" theta="Q6eR_Theta"
rout1="Q6eR_InnerRadius" rout2="Q6eR_InnerRadius">
</pipe>
<pipe id="17" name="Pipe_Q6eR_to_SQ7eR"/>
<pipe id="18" name="Pipe_in_SQ7eR"
xcenter="SQ7eR_CenterX" zcenter="SQ7eR_CenterZ"
length="SQ7eR_Length" theta="SQ7eR_Theta"
rout1="SQ7eR_InnerRadius" rout2="SQ7eR_InnerRadius">
</pipe>
<pipe id="19" name="Pipe_SQ7eR_to_Q7eR"/>
<pipe id="20" name="Pipe_in_Q7eR"
xcenter="Q7eR_CenterX" zcenter="Q7eR_CenterZ"
length="Q7eR_Length" theta="Q7eR_Theta"
rout1="Q7eR_InnerRadius" rout2="Q7eR_InnerRadius">
</pipe>
<pipe id="7" name="Pipe_B4eR_to_B5eR"/>
<pipe id="8" name="Pipe_in_B5eR"
xcenter="B5eR_CenterX" zcenter="B5eR_CenterZ"
length="B5eR_Length" theta="B5eR_Theta"
rout1="B5eR_InnerRadius" rout2="B5eR_InnerRadius">
<pipe id="21" name="Pipe_Q7eR_to_SQ8eR"/>
<pipe id="22" name="Pipe_in_SQ8eR"
xcenter="SQ8eR_CenterX" zcenter="SQ8eR_CenterZ"
length="SQ8eR_Length" theta="SQ8eR_Theta"
rout1="SQ8eR_InnerRadius" rout2="SQ8eR_InnerRadius">
</pipe>
<pipe id="9" name="Pipe_B5eR_to_B6eR"/>
<pipe id="10" name="Pipe_in_B6eR"
xcenter="B6eR_CenterX" zcenter="B6eR_CenterZ"
length="B6eR_Length" theta="B6eR_Theta"
rout1="B6eR_InnerRadius" rout2="B6eR_InnerRadius">
<pipe id="23" name="Pipe_SQ8eR_to_Q8eR"/>
<pipe id="24" name="Pipe_in_Q8eR"
xcenter="Q8eR_CenterX" zcenter="Q8eR_CenterZ"
length="Q8eR_Length" theta="Q8eR_Theta"
rout1="Q8eR_InnerRadius" rout2="Q8eR_InnerRadius">
</pipe>
<pipe id="11" name="Pipe_B6eR_to_B7eR"/>
<pipe id="12" name="Pipe_in_B7eR"
xcenter="B7eR_CenterX" zcenter="B7eR_CenterZ"
length="B7eR_Length" theta="B7eR_Theta"
rout1="B7eR_InnerRadius" rout2="B7eR_InnerRadius">
<pipe id="25" name="Pipe_Q8eR_to_C1eR"/>
<pipe id="26" name="Pipe_in_C1eR"
xcenter="C1eR_CenterX" zcenter="C1eR_CenterZ"
length="C1eR_Length" theta="C1eR_Theta"
rout1="C1eR_InnerRadius" rout2="C1eR_InnerRadius">
</pipe>
</detector>

Expand All @@ -65,31 +106,56 @@
<detector
name="Magnets_Q4eR_to_B7eR"
type="CylindricalMagnetChain"
vis="RedVis">
<magnet id="0" name="Magnet_Q4eR"
vis="FFMagnetVis">
<magnet id="0" name="Magnet_SQ4eR"
x="SQ4eR_CenterX" y="0" z="SQ4eR_CenterZ" theta="SQ4eR_Theta"
length="SQ4eR_Length" rin="SQ4eR_InnerRadius" rout="SQ4eR_OuterRadius">
</magnet>
<magnet id="1" name="Magnet_Q4eR"
x="Q4eR_CenterX" y="0" z="Q4eR_CenterZ" theta="Q4eR_Theta"
length="Q4eR_Length" rin="Q4eR_InnerRadius" rout="Q4eR_OuterRadius">
</magnet>
<magnet id="1" name="Magnet_B3eR"
<magnet id="2" name="Magnet_SQ5eR"
x="SQ5eR_CenterX" y="0" z="SQ5eR_CenterZ" theta="SQ5eR_Theta"
length="SQ5eR_Length" rin="SQ5eR_InnerRadius" rout="SQ5eR_OuterRadius">
</magnet>
<magnet id="3" name="Magnet_Q5eR"
x="Q5eR_CenterX" y="0" z="Q5eR_CenterZ" theta="Q5eR_Theta"
length="Q5eR_Length" rin="Q5eR_InnerRadius" rout="Q5eR_OuterRadius">
</magnet>
<magnet id="4" name="Magnet_B3eR"
x="B3eR_CenterX" y="0" z="B3eR_CenterZ" theta="B3eR_Theta"
length="B3eR_Length" rin="B3eR_InnerRadius" rout="B3eR_OuterRadius">
</magnet>
<magnet id="2" name="Magnet_B4eR"
x="B4eR_CenterX" y="0" z="B4eR_CenterZ" theta="B4eR_Theta"
length="B4eR_Length" rin="B4eR_InnerRadius" rout="B4eR_OuterRadius">
<magnet id="5" name="Magnet_SQ6eR"
x="SQ6eR_CenterX" y="0" z="SQ6eR_CenterZ" theta="SQ6eR_Theta"
length="SQ6eR_Length" rin="SQ6eR_InnerRadius" rout="SQ6eR_OuterRadius">
</magnet>
<magnet id="6" name="Magnet_Q6eR"
x="Q6eR_CenterX" y="0" z="Q6eR_CenterZ" theta="Q6eR_Theta"
length="Q6eR_Length" rin="Q6eR_InnerRadius" rout="Q6eR_OuterRadius">
</magnet>
<magnet id="3" name="Magnet_B5eR"
x="B5eR_CenterX" y="0" z="B5eR_CenterZ" theta="B5eR_Theta"
length="B5eR_Length" rin="B5eR_InnerRadius" rout="B5eR_OuterRadius">
<magnet id="7" name="Magnet_SQ7eR"
x="SQ7eR_CenterX" y="0" z="SQ7eR_CenterZ" theta="SQ7eR_Theta"
length="SQ7eR_Length" rin="SQ7eR_InnerRadius" rout="SQ7eR_OuterRadius">
</magnet>
<magnet id="4" name="Magnet_B6eR"
x="B6eR_CenterX" y="0" z="B6eR_CenterZ" theta="B6eR_Theta"
length="B6eR_Length" rin="B6eR_InnerRadius" rout="B6eR_OuterRadius">
<magnet id="8" name="Magnet_Q7eR"
x="Q7eR_CenterX" y="0" z="Q7eR_CenterZ" theta="Q7eR_Theta"
length="Q7eR_Length" rin="Q7eR_InnerRadius" rout="Q7eR_OuterRadius">
</magnet>
<magnet id="5" name="Magnet_B7eR"
x="B7eR_CenterX" y="0" z="B7eR_CenterZ" theta="B7eR_Theta"
length="B7eR_Length" rin="B7eR_InnerRadius" rout="B7eR_OuterRadius">
<magnet id="9" name="Magnet_SQ8eR"
x="SQ8eR_CenterX" y="0" z="SQ8eR_CenterZ" theta="SQ8eR_Theta"
length="SQ8eR_Length" rin="SQ8eR_InnerRadius" rout="SQ8eR_OuterRadius">
</magnet>
<magnet id="10" name="Magnet_Q8eR"
x="Q8eR_CenterX" y="0" z="Q8eR_CenterZ" theta="Q8eR_Theta"
length="Q8eR_Length" rin="Q8eR_InnerRadius" rout="Q8eR_OuterRadius">
</magnet>
<magnet id="11" name="Magnet_C1eR"
x="C1eR_CenterX" y="0" z="C1eR_CenterZ" theta="C1eR_Theta"
length="C1eR_Length" rin="C1eR_InnerRadius" rout="C1eR_OuterRadius">
</magnet>

</detector>

</detectors>
Expand Down
6 changes: 3 additions & 3 deletions compact/far_backward/beamline_extension_hadron.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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

<detector name="Magnet_Q2PR" type="ip6_CylindricalDipoleMagnet" vis="RedVis">
<detector name="Magnet_Q2PR" type="ip6_CylindricalDipoleMagnet" vis="FFMagnetVis">
<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"/>
Expand Down Expand Up @@ -58,8 +58,8 @@
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*cos(CrossingAngle) + Q1APR_StartZ)/2."
length="sqrt((Hadron_Beampipe_End*sin(CrossingAngle) - Q1APR_StartX)^2 + (Hadron_Beampipe_End*cos(CrossingAngle) - Q1APR_StartZ)^2)" theta="CrossingAngle"
rout1="Hadron_Beampipe_Rad" rout2="Hadron_Beampipe_Rad">
</pipe>
<pipe id="1" name="Pipe_in_Q1APR"
Expand Down
10 changes: 5 additions & 5 deletions compact/far_backward/beamline_tracking.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@

<slice
pipe_id="5"
grandmother="Pipe_Q3eR_to_B7eR"
grandmother="Pipe_Q3eR_to_Q6eR"
mother="Pipe_in_Q3eR_vacuum"
name="Pipe_in_Q3eR_tracker_start"
end="false"/>

<slice
pipe_id="6"
grandmother="Pipe_Q3eR_to_B7eR"
grandmother="Pipe_Q3eR_to_Q6eR"
mother="Pipe_in_Q3eR_vacuum"
name="Pipe_in_Q3eR_tracker_end"/>

<slice
pipe_id="7"
grandmother="Pipe_Q3eR_to_B7eR"
grandmother="Pipe_Q3eR_to_Q6eR"
mother="Pipe_in_Q4eR_vacuum"
name="Pipe_in_Q4eR_tracker"/>

Expand All @@ -62,8 +62,8 @@
<detector
type="BeamPipeStop"
name="Backwards_Pipe_Stop"
grandmother="Pipe_Q3eR_to_B7eR"
mother="Pipe_Q4eR_to_B3eR_vacuum"
grandmother="Pipe_Q3eR_to_Q6eR"
mother="Pipe_in_Q6eR_vacuum"
/>

</detectors>
Expand Down
Loading
Loading