diff --git a/bmad/low_level/track_a_bend.f90 b/bmad/low_level/track_a_bend.f90 index 660fe66f7d..fe95071081 100644 --- a/bmad/low_level/track_a_bend.f90 +++ b/bmad/low_level/track_a_bend.f90 @@ -355,7 +355,7 @@ subroutine apply_multipole_kicks (coef, step_len, r_step, ix_mag_max, an, bn, ix else field = em_field_struct() - f_p0c = ele%value(p0c$) / (c_light * charge_of(param%particle)) + f_p0c = r_step * ele%value(p0c$) / (step_len * c_light * charge_of(param%particle)) do i = 0, ix_mag_max if (an(i) == 0 .and. bn(i) == 0) cycle @@ -389,12 +389,12 @@ subroutine apply_multipole_kicks (coef, step_len, r_step, ix_mag_max, an, bn, ix if (ix_mag_max > -1) then orb0 = orbit - f_coef = r_step * coef * c_dir * (1 + ele%value(g$) * orbit%vec(1)) * c_light / orb0%p0c + f_coef = step_len * coef * c_dir * (1 + ele%value(g$) * orbit%vec(1)) * c_light / orb0%p0c orbit%vec(2) = orbit%vec(2) - f_coef * field%B(2) orbit%vec(4) = orbit%vec(4) + f_coef * field%B(1) if (logic_option(.false., make_matrix)) then - df_coef_dx = r_step * coef * c_dir * ele%value(g$) * c_light / orb0%p0c + df_coef_dx = step_len * coef * c_dir * ele%value(g$) * c_light / orb0%p0c mat6(2,:) = mat6(2,:) - (f_coef * field%dB(2,1) + df_coef_dx * field%B(2)) * mat6(1,:) - & (f_coef * field%dB(2,2)) * mat6(3,:) diff --git a/tao/doc/command-list.tex b/tao/doc/command-list.tex index 272ed2ddf9..16465188b2 100644 --- a/tao/doc/command-list.tex +++ b/tao/doc/command-list.tex @@ -3113,10 +3113,10 @@ \subsection{show taylor_map} Shows the Taylor transfer map for the \vn{model} lattice of the default universe (set by \vn{set default universe}). See also \vn{show matrix}. -If the \vn{-elements} switch is present, other switches are ignored and the individual element -transfer matrices (along with the zeroth order part of the map) are printed for each element -specified by \vn{}. Element list format (\sref{s:ele.list.format}), without any -embedded blanks, is used for the \vn{} list of elements. +If the \vn{-elements} switch is present, other switches are ignored except \vn{-order} and the +individual element transfer maps are printed for each element specified by \vn{}. The +default order is one. Element list format (\sref{s:ele.list.format}), without any embedded blanks, +is used for the \vn{} list of elements. If neither \vn{loc1} nor \vn{loc2} are present, the transfer map is computed for the entire lattice. diff --git a/tao/doc/cover-page.tex b/tao/doc/cover-page.tex index 37163ce313..8458d2d1f0 100644 --- a/tao/doc/cover-page.tex +++ b/tao/doc/cover-page.tex @@ -2,7 +2,7 @@ \begin{flushright} \large -Revision: August 31, 2023 \\ +Revision: October 28, 2023 \\ \end{flushright} \vfill diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index 2346f96e08..78399c3e94 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 = "2023/10/27 01:26:49" +character(*), parameter :: tao_version_date = "2023/10/27 23:43:51" end module