Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Zhiwen Zhao
athena
Commits
ae18f57d
Commit
ae18f57d
authored
3 years ago
by
Alex Jentsch
Committed by
Sylvester Joosten
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "FF hadron magnet vacuum"
parent
1a826561
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
athena.xml
+3
-0
3 additions, 0 deletions
athena.xml
compact/definitions.xml
+1
-0
1 addition, 0 deletions
compact/definitions.xml
with
4 additions
and
0 deletions
athena.xml
+
3
−
0
View file @
ae18f57d
...
@@ -90,6 +90,9 @@
...
@@ -90,6 +90,9 @@
<include
ref=
"ip6/forward_ion_beamline.xml"
/>
<include
ref=
"ip6/forward_ion_beamline.xml"
/>
<include
ref=
"ip6/beampipe_hadron_B0.xml"
/>
<include
ref=
"ip6/beampipe_hadron_B0.xml"
/>
<include
ref=
"ip6/beampipe.xml"
/>
<include
ref=
"ip6/beampipe.xml"
/>
<include
ref=
"ip6/inner_vacuum_FF_magnets.xml"
/>
<documentation
level=
"5"
>
<documentation
level=
"5"
>
## Main magnet
## Main magnet
...
...
This diff is collapsed.
Click to expand it.
compact/definitions.xml
+
1
−
0
View file @
ae18f57d
...
@@ -243,6 +243,7 @@ The unused IDs below are saved for future use.
...
@@ -243,6 +243,7 @@ The unused IDs below are saved for future use.
<comment>
TODO naming consistency
</comment>
<comment>
TODO naming consistency
</comment>
<constant
name=
"ffi_ZDC_ECAL_ID"
value=
"163"
/>
<constant
name=
"ffi_ZDC_ECAL_ID"
value=
"163"
/>
<constant
name=
"ffi_ZDC_HCAL_ID"
value=
"164"
/>
<constant
name=
"ffi_ZDC_HCAL_ID"
value=
"164"
/>
<constant
name=
"VacuumMagnetElement_1_ID"
value=
"165"
/>
<documentation>
<documentation>
#### (170-189) Forward Beamline Magnets
#### (170-189) Forward Beamline Magnets
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment