Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ip6
Manage
Activity
Members
Labels
Plan
Issues
13
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
detectors
ip6
Merge requests
!55
Resolve "50cm shift of lattice and FF detectors"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "50cm shift of lattice and FF detectors"
35-50cm-shift-of-lattice-and-ff-detectors
into
master
Overview
0
Commits
20
Pipelines
21
Changes
2
Merged
Alex Jentsch
requested to merge
35-50cm-shift-of-lattice-and-ff-detectors
into
master
3 years ago
Overview
0
Commits
20
Pipelines
21
Changes
2
Expand
Closes
#35 (closed)
Edited
3 years ago
by
Alex Jentsch
👍
0
👎
0
Merge request reports
Compare
master
version 19
3bbf7dfa
3 years ago
version 18
cab990a3
3 years ago
version 17
77813bf5
3 years ago
version 16
e4bd9f4a
3 years ago
version 15
74aae263
3 years ago
version 14
56d2705a
3 years ago
version 13
f134e30c
3 years ago
version 12
412fd7e6
3 years ago
version 11
e0c2b658
3 years ago
version 10
01750e99
3 years ago
version 9
5c85f69f
3 years ago
version 8
dcd77615
3 years ago
version 7
aea3ca87
3 years ago
version 6
e27fe2b8
3 years ago
version 5
1a016e50
3 years ago
version 4
ac2cc22f
3 years ago
version 3
7ccb8746
3 years ago
version 2
aad1500d
3 years ago
version 1
b3377106
3 years ago
master (base)
and
version 2
latest version
2a3f26fc
20 commits,
3 years ago
version 19
3bbf7dfa
19 commits,
3 years ago
version 18
cab990a3
18 commits,
3 years ago
version 17
77813bf5
17 commits,
3 years ago
version 16
e4bd9f4a
16 commits,
3 years ago
version 15
74aae263
15 commits,
3 years ago
version 14
56d2705a
14 commits,
3 years ago
version 13
f134e30c
13 commits,
3 years ago
version 12
412fd7e6
12 commits,
3 years ago
version 11
e0c2b658
11 commits,
3 years ago
version 10
01750e99
10 commits,
3 years ago
version 9
5c85f69f
9 commits,
3 years ago
version 8
dcd77615
8 commits,
3 years ago
version 7
aea3ca87
7 commits,
3 years ago
version 6
e27fe2b8
6 commits,
3 years ago
version 5
1a016e50
5 commits,
3 years ago
version 4
ac2cc22f
4 commits,
3 years ago
version 3
7ccb8746
3 commits,
3 years ago
version 2
aad1500d
2 commits,
3 years ago
version 1
b3377106
1 commit,
3 years ago
2 files
+
52
−
33
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
ip6/ip6_defs.xml
+
47
−
29
Options
@@ -25,31 +25,49 @@
B1APF 0.600444 0.0 20.8159 0.1680 0.1680 0.4360 1.500 25.0 -2.700 0.000
B2PF 1.522232 0.0 41.9092 0.2 0.2 0.5 5.76 25.0 5.94 0.000
Hadron magnets -- with BIG FLIP
&
50cm shift
##
## name center_x center_y center_z rin(z-in) rin(z-out) dout length angle B gradient
## [m] [m] [m] [m] [m] [m] [m] [mrad] [T] [T/m]
##
B0PF -0.145779265 0.0 6.400000000 0.2000 0.2000 0.5000 1.200 0.00 1.1840539 0.000
B0PFq -0.145779265 0.0 6.400000000 0.2000 0.2000 0.5000 1.200 0.00 0.0000000 -8.12238283
B0APF -0.210480535 0.0 8.198946015 0.0430 0.0430 0.1860 0.600 -25.0 3.4314469 0.000
Q1APF -0.254342857 0.0 9.628296939 0.0560 0.0560 0.2120 1.460 -19.5 0.0000000 -72.608
Q1BPF -0.312840809 0.0 11.56243847 0.0780 0.0780 0.2560 1.610 -15.0 0.0000000 -63.24525402
Q2PF -0.407362293 0.0 14.66604545 0.1315 0.1315 0.3620 3.800 -14.8 0.0000000 36.88301623
B1PF -0.503165042 0.0 18.56486896 0.1350 0.1350 0.3700 3.000 -34.0 3.4479890 0.000
B1APF -0.612903791 0.0 21.31298439 0.1680 0.1680 0.4360 1.500 -25.0 2.7000000 0.000
B2APF -1.491239596 0.0 40.74293743 0.2 0.2 0.5 4.4 -28.22 -4.7890142 0.000
</comment>
<comment>
All magnet values are input by hand and represent the implementation in EICRoot used for the Yellow Report.
</comment>
<constant
name=
"B0PF_GradientMax"
value=
"
0.0
*tesla/m"
/>
<constant
name=
"B0PF_GradientMax"
value=
"
-8.12238283
*tesla/m"
/>
<constant
name=
"B0APF_GradientMax"
value=
"0.0*tesla/m"
/>
<constant
name=
"Q1APF_GradientMax"
value=
"-72.608*tesla/m"
/>
<constant
name=
"Q1BPF_GradientMax"
value=
"-66.
180
*tesla/m"
/>
<constant
name=
"Q2PF_GradientMax"
value=
"
40.737
*tesla/m"
/>
<constant
name=
"Q1BPF_GradientMax"
value=
"-66.
24525402
*tesla/m"
/>
<constant
name=
"Q2PF_GradientMax"
value=
"
36.88301623
*tesla/m"
/>
<constant
name=
"B1PF_GradientMax"
value=
"0.0*tesla/m"
/>
<constant
name=
"B1APF_GradientMax"
value=
"0.0*tesla/m"
/>
<constant
name=
"B2PF_GradientMax"
value=
"0.0*tesla/m"
/>
<constant
name=
"Q0EF_GradientMax"
value=
"-
9.55
*tesla/m"
/>
<constant
name=
"Q1EF_GradientMax"
value=
"
4.363
*tesla/m"
/>
<constant
name=
"Q0EF_GradientMax"
value=
"-
13.12887
*tesla/m"
/>
<constant
name=
"Q1EF_GradientMax"
value=
"
5.85089
*tesla/m"
/>
<!-- big flip - dipole fields change sign, quads stay the same -->
<constant
name=
"B0PF_Bmax"
value=
"1.
3
*tesla"
/>
<constant
name=
"B0APF_Bmax"
value=
"3.4
74
*tesla"
/>
<constant
name=
"B0PF_Bmax"
value=
"1.
1840539
*tesla"
/>
<constant
name=
"B0APF_Bmax"
value=
"3.4
314469
*tesla"
/>
<constant
name=
"Q1APF_Bmax"
value=
"0.0*tesla"
/>
<constant
name=
"Q1BPF_Bmax"
value=
"0.0*tesla"
/>
<constant
name=
"Q2PF_Bmax"
value=
"0.0*tesla"
/>
<constant
name=
"B1PF_Bmax"
value=
"3.4*tesla"
/>
<constant
name=
"B1PF_Bmax"
value=
"3.4
47989
*tesla"
/>
<constant
name=
"B1APF_Bmax"
value=
"2.7*tesla"
/>
<constant
name=
"B2PF_Bmax"
value=
"-
5.94
*tesla"
/>
<constant
name=
"B2PF_Bmax"
value=
"-
4.7890142
*tesla"
/>
<constant
name=
"Q0EF_BMax"
value=
"0.0*tesla"
/>
<constant
name=
"Q1EF_BMax"
value=
"0.0*tesla"
/>
@@ -77,29 +95,29 @@
<constant
name=
"Q2PF_RotationAngle"
value=
"-14.8*0.001*rad"
/>
<constant
name=
"B1PF_RotationAngle"
value=
"-34.0*0.001*rad"
/>
<constant
name=
"B1APF_RotationAngle"
value=
"-25.0*0.001*rad"
/>
<constant
name=
"B2PF_RotationAngle"
value=
"-2
5.0
*0.001*rad"
/>
<constant
name=
"B2PF_RotationAngle"
value=
"-2
8.22
*0.001*rad"
/>
<constant
name=
"Q0EF_RotationAngle"
value=
"-0.0*rad"
/>
<constant
name=
"Q1EF_RotationAngle"
value=
"-0.0*rad"
/>
<constant
name=
"B0PF_CenterPosition"
value=
"
5.89913
*m"
/>
<constant
name=
"B0APF_CenterPosition"
value=
"
7.69866
*m"
/>
<constant
name=
"Q1APF_CenterPosition"
value=
"9.
2
28
34
*m"
/>
<constant
name=
"Q1BPF_CenterPosition"
value=
"11.
0
62
9
*m"
/>
<constant
name=
"Q2PF_CenterPosition"
value=
"14.
1673
*m"
/>
<constant
name=
"B1PF_CenterPosition"
value=
"18.
0667
*m"
/>
<constant
name=
"B1APF_CenterPosition"
value=
"2
0.815
9*m"
/>
<constant
name=
"B2PF_CenterPosition"
value=
"4
1.9092
*m"
/>
<constant
name=
"Q0EF_CenterPosition"
value=
"5.
2995
*m"
/>
<constant
name=
"Q1EF_CenterPosition"
value=
"10.
259
*m"
/>
<constant
name=
"B0PF_XPosition"
value=
"-0.1
32497
*m"
/>
<constant
name=
"B0APF_XPosition"
value=
"-0.
19799
5*m"
/>
<constant
name=
"Q1APF_XPosition"
value=
"-0.2
44734
*m"
/>
<constant
name=
"Q1BPF_XPosition"
value=
"-0.3
00512
*m"
/>
<constant
name=
"Q2PF_XPosition"
value=
"-0.
39495
*m"
/>
<constant
name=
"B1PF_XPosition"
value=
"-0.
490747
*m"
/>
<constant
name=
"B1APF_XPosition"
value=
"-0.6
00444
*m"
/>
<constant
name=
"B2PF_XPosition"
value=
"-1.
522232
*m"
/>
<constant
name=
"B0PF_CenterPosition"
value=
"
6.4
*m"
/>
<constant
name=
"B0APF_CenterPosition"
value=
"
8.198946015
*m"
/>
<constant
name=
"Q1APF_CenterPosition"
value=
"9.
6
28
296939
*m"
/>
<constant
name=
"Q1BPF_CenterPosition"
value=
"11.
5
62
43847
*m"
/>
<constant
name=
"Q2PF_CenterPosition"
value=
"14.
66604545
*m"
/>
<constant
name=
"B1PF_CenterPosition"
value=
"18.
56486896
*m"
/>
<constant
name=
"B1APF_CenterPosition"
value=
"2
1.3129843
9*m"
/>
<constant
name=
"B2PF_CenterPosition"
value=
"4
0.74293743
*m"
/>
<constant
name=
"Q0EF_CenterPosition"
value=
"5.
8
*m"
/>
<constant
name=
"Q1EF_CenterPosition"
value=
"10.
76
*m"
/>
<constant
name=
"B0PF_XPosition"
value=
"-0.1
45779265
*m"
/>
<constant
name=
"B0APF_XPosition"
value=
"-0.
21048053
5*m"
/>
<constant
name=
"Q1APF_XPosition"
value=
"-0.2
54342857
*m"
/>
<constant
name=
"Q1BPF_XPosition"
value=
"-0.3
12840809
*m"
/>
<constant
name=
"Q2PF_XPosition"
value=
"-0.
407362293
*m"
/>
<constant
name=
"B1PF_XPosition"
value=
"-0.
503165042
*m"
/>
<constant
name=
"B1APF_XPosition"
value=
"-0.6
12903791
*m"
/>
<constant
name=
"B2PF_XPosition"
value=
"-1.
491239596
*m"
/>
<constant
name=
"Q0EF_XPosition"
value=
"-0.0*m"
/>
<constant
name=
"Q1EF_XPosition"
value=
"-0.0*m"
/>
Loading