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

Jump to bottom

More ring design tutorial devel. #1116

Merged
merged 1 commit into from
Aug 2, 2024
Merged

More ring design tutorial devel. #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 bmad-doc/tutorial_ring_design/doc/tutorial_ring_design.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
\date{
\parbox{2in}{\today \\
\rule[3pt]{1.8in}{2pt} \\
Joe Devlin \\
Georg Hoffstaetter de Torquat \\
Daria Kuzovkova \\
David Sagan \\
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.2_AddingSextupoles/ring.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ D2S2: Drift, L = 0.156
FODOSSF: line = ( QFSS, D1, DB, D2S1, SDSS, D2S2, QDSS, D1, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SFSS, D2S1, DB, D1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SDSS, D2S1, DB, D1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1, B, D2S1, SD1_1, D2S2, QD, D1, B, D2S1, SF1_1, D2S2, QF, D1, B, D2S1, SD2_1, D2S2, QD, D1, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion ...oc/tutorial_ring_design/lattices/12_DynamicAperture/12.3_ChromaticityCorrection/ring.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ OSD: overlay = {SD%_*[k2]: x}, var = {x}
FODOSSF: line = ( QFSS, D1, DB, D2S1, SDSS, D2S2, QDSS, D1, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SFSS, D2S1, DB, D1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SDSS, D2S1, DB, D1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1, B, D2S1, SD1_1, D2S2, QD, D1, B, D2S1, SF1_1, D2S2, QF, D1, B, D2S1, SD2_1, D2S2, QD, D1, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.4_AdvancedDA/ring.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ END_7: marker
FODOSSF: line = ( QFSS, D1, DB, D2S1, SDSS, D2S2, QDSS, D1, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SFSS, D2S1, DB, D1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SDSS, D2S1, DB, D1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1, B, D2S1, SD1_1, D2S2, QD, D1, B, D2S1, SF1_1, D2S2, QF, D1, B, D2S1, SD2_1, D2S2, QD, D1, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion ...cAperture/solution/ring_w_correction.bmad → ...amicAperture/solution/ring_w_correct.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ END_5: marker
FODOSSF: line = ( QFSS, D1, DB, D2S1, SDSS, D2S2, QDSS, D1, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SFSS, D2S1, DB, D1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SDSS, D2S1, DB, D1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1, B, D2S1, SD1_1, D2S2, QD, D1, B, D2S1, SF1_1, D2S2, QF, D1, B, D2S1, SD2_1, D2S2, QD, D1, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/13_LatticeTypes/ring.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ CV: vkicker, L = 0.2
FODOSSF: line = ( QFSS, D1C1, CH, D1C2, DB, D2S1, SDSS, D2S2, QDSS, D1C1, CV, D1C2, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SFSS, D2S1, DB, D1C2, CH, D1C1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SDSS, D2S1, DB, D1C2, CH, D1C1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1C1, CH, D1C2, B, D2S1, SD1_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF1_1, D2S2, QF, D1C1, CH, D1C2, B, D2S1, SD2_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ BPM: marker
FODOSSF: line = ( QFSS, D1C1, CH, D1C2, DB, D2S1, SDSS, D2S2, QDSS, D1C1, CV, D1C2, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SFSS, D2S1, DB, D1C2, CH, D1C1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SDSS, D2S1, DB, D1C2, CH, D1C1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1C1, CH, D1C2, B, D2S1, SD1_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF1_1, D2S2, QF, D1C1, CH, D1C2, B, D2S1, SD2_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring0.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ BPM: marker
FODOSSF: line = ( QFSS, D1, DB, D2S1, SDSS, D2S2, QDSS, D1, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SFSS, D2S1, DB, D1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1, QDSS, D2S2, SDSS, D2S1, DB, D1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1, B, D2S1, SD1_1, D2S2, QD, D1, B, D2S1, SF1_1, D2S2, QF, D1, B, D2S1, SD2_1, D2S2, QD, D1, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/b_sawtooth/ring0.bmad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ BPM: marker
FODOSSF: line = ( QFSS, D1C1, CH, D1C2, DB, D2S1, SDSS, D2S2, QDSS, D1C1, CV, D1C2, DB, D2S1, SFSS, D2S2)

! Straight section reverse FoDo:
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SFSS, D2S1, DB, D1C2, CH, D1C1)
FODOSSR: line = ( QFSS, D2S2, SFSS, D2S1, DB, D1C2, CV, D1C1, QDSS, D2S2, SDSS, D2S1, DB, D1C2, CH, D1C1)

! 1 o'clock arc forward 2*FoDo:
FODOAF_1: line = (QF, D1C1, CH, D1C2, B, D2S1, SD1_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF1_1, D2S2, QF, D1C1, CH, D1C2, B, D2S1, SD2_1, D2S2, QD, D1C1, CV, D1C2, B, D2S1, SF2_1, D2S2)
Expand Down
2 changes: 1 addition & 1 deletion tao/version/tao_version_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
!-

module tao_version_mod
character(*), parameter :: tao_version_date = "2024/08/01 13:23:42"
character(*), parameter :: tao_version_date = "2024/08/02 00:46:53"
end module