diff --git a/bmad-doc/tutorial_ring_design/doc/tutorial_ring_design.tex b/bmad-doc/tutorial_ring_design/doc/tutorial_ring_design.tex index 3e6d7fad43..e30a7fb911 100644 --- a/bmad-doc/tutorial_ring_design/doc/tutorial_ring_design.tex +++ b/bmad-doc/tutorial_ring_design/doc/tutorial_ring_design.tex @@ -78,6 +78,7 @@ \date{ \parbox{2in}{\today \\ \rule[3pt]{1.8in}{2pt} \\ +Joe Devlin \\ Georg Hoffstaetter de Torquat \\ Daria Kuzovkova \\ David Sagan \\ diff --git a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.2_AddingSextupoles/ring.bmad b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.2_AddingSextupoles/ring.bmad index 4c32ac78d1..038633b4c8 100644 --- a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.2_AddingSextupoles/ring.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.2_AddingSextupoles/ring.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.3_ChromaticityCorrection/ring.bmad b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.3_ChromaticityCorrection/ring.bmad index 462ccdd295..a4116afb7f 100644 --- a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.3_ChromaticityCorrection/ring.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.3_ChromaticityCorrection/ring.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.4_AdvancedDA/ring.bmad b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.4_AdvancedDA/ring.bmad index 883ad3abd6..9d00ebca74 100644 --- a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.4_AdvancedDA/ring.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/12.4_AdvancedDA/ring.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correction.bmad b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correct.bmad similarity index 99% rename from bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correction.bmad rename to bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correct.bmad index 9c514a7af2..668a0e71d3 100644 --- a/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correction.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/12_DynamicAperture/solution/ring_w_correct.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/13_LatticeTypes/ring.bmad b/bmad-doc/tutorial_ring_design/lattices/13_LatticeTypes/ring.bmad index 5373691464..0dc3d326d6 100644 --- a/bmad-doc/tutorial_ring_design/lattices/13_LatticeTypes/ring.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/13_LatticeTypes/ring.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring.bmad b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring.bmad index 3eb452c9f6..767c81229c 100644 --- a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring0.bmad b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring0.bmad index 6ea724ad7b..f8284c4fcb 100644 --- a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring0.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/a_corrector_bpm/ring0.bmad @@ -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) diff --git a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/b_sawtooth/ring0.bmad b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/b_sawtooth/ring0.bmad index 3eb452c9f6..767c81229c 100644 --- a/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/b_sawtooth/ring0.bmad +++ b/bmad-doc/tutorial_ring_design/lattices/14_OrbitCorrection/b_sawtooth/ring0.bmad @@ -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) diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index 312d02709a..da1ce17260 100644 --- a/tao/version/tao_version_mod.f90 +++ b/tao/version/tao_version_mod.f90 @@ -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