diff --git a/bmad/doc/cover-page.tex b/bmad/doc/cover-page.tex index 2f19efe073..276100828a 100644 --- a/bmad/doc/cover-page.tex +++ b/bmad/doc/cover-page.tex @@ -3,7 +3,7 @@ \begin{flushright} \large - Revision: June 19, 2024 \\ + Revision: July 7, 2024 \\ \end{flushright} \pdfbookmark[0]{Preamble}{Preamble} diff --git a/bsim/modules/lt_tracking_mod.f90 b/bsim/modules/lt_tracking_mod.f90 index 722acb808d..b5efbddb9f 100644 --- a/bsim/modules/lt_tracking_mod.f90 +++ b/bsim/modules/lt_tracking_mod.f90 @@ -524,6 +524,15 @@ subroutine ltt_init_tracking (lttp, ltt_com, beam) character(40) start_name, stop_name character(*), parameter :: r_name = 'ltt_init_tracking' +! + +if (lttp%split_bends_for_stochastic_rad .and. lttp%ramping_on) then + call out_io (s_fatal$, r_name, 'LTT%SPLIT_BENDS_FOR_STOCHASTIC_RAD NOT COMPATIBLE WITH RAMPING.') + stop +endif + + + ! Apply rampers and then turn off ramper use for twiss_and_track since rampers simulating ! noise (using random numbers) will drive the closed orbit calc crazy. diff --git a/tao/code/tao_python_cmd.f90 b/tao/code/tao_python_cmd.f90 index 741a1f5d78..552878f104 100644 --- a/tao/code/tao_python_cmd.f90 +++ b/tao/code/tao_python_cmd.f90 @@ -327,7 +327,7 @@ subroutine tao_python_cmd (input_str) ix_branch = parse_branch(line, u, .false., err); if (err) return nl=incr(nl); write (li(nl), lmt) 'always_reinit;LOGIC;T;', u%beam%always_reinit - nl=incr(nl); write (li(nl), lmt) 'track_beam_in_universe;LOGIC;T;', u%beam%track_beam_in_universe + nl=incr(nl); write (li(nl), lmt) 'track_beam_in_universe;LOGIC;F;', u%beam%track_beam_in_universe nl=incr(nl); write (li(nl), amt) 'saved_at;STR;T;', trim(u%beam%saved_at) nl=incr(nl); write (li(nl), amt) 'dump_at;STR;T;', trim(u%beam%dump_at) nl=incr(nl); write (li(nl), amt) 'dump_file;STR;T;', trim(u%beam%dump_file) diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index 44a56c4d88..f18379be57 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/07/05 00:54:19" +character(*), parameter :: tao_version_date = "2024/07/07 20:20:56" end module