diff --git a/bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.tex b/bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.tex index 3ec5a2d94a..666a1dace1 100644 --- a/bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.tex +++ b/bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.tex @@ -2844,7 +2844,7 @@ \subsection{Example Lattice} is used, only one control variable (in this case \vn{hh}) may be used by the overlay. \item The initial values for control variables may be set when defining the control element. For example, -\vn{hh} of \vn{ov2} is set to 0.2. Control variables default to a value of zero. +\vn{hh} of \vn{ov2} is set to 0.01. Control variables default to a value of zero. \end{itemize} %---------------------------------------------------------- diff --git a/bmad-doc/tutorial_bmad_tao/lattice_files/wave_analysis/archive/phase_data_cesrv_to_tao.py b/bmad-doc/tutorial_bmad_tao/lattice_files/wave_analysis/archive/phase_data_cesrv_to_tao.py index fae0900255..ed6fd9023e 100755 --- a/bmad-doc/tutorial_bmad_tao/lattice_files/wave_analysis/archive/phase_data_cesrv_to_tao.py +++ b/bmad-doc/tutorial_bmad_tao/lattice_files/wave_analysis/archive/phase_data_cesrv_to_tao.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Script to convert phase data from Cesrv output "show phase" to Tao format. # Input to this script should be the output of "show phase" including the two header lines but diff --git a/bmad/output/type_ele.f90 b/bmad/output/type_ele.f90 index 256031227d..507ef1a85e 100644 --- a/bmad/output/type_ele.f90 +++ b/bmad/output/type_ele.f90 @@ -1130,7 +1130,8 @@ subroutine type_ele (ele, type_zero_attrib, type_mat6, type_taylor, twiss_out, t a_name(1:n_att), ' =', ele%control%var(im)%value, & 'OLD_', a_name(1:n_att), ' =', ele%control%var(im)%old_value enddo - else ! overlay_lord or ramper_lord + + elseif (allocated(ele%control%var)) then ! overlay_lord or ramper_lord. A ramper slave does not have this allocated. do im = 1, size(ele%control%var) nl=nl+1; write (li(nl), '(i5, 3x, 2a, es15.7)') im, ele%control%var(im)%name, ' =', ele%control%var(im)%value enddo diff --git a/bsim/bbu/python/bbu/bbu_main.py b/bsim/bbu/python/bbu/bbu_main.py index 6eb2da6648..03926a8678 100644 --- a/bsim/bbu/python/bbu/bbu_main.py +++ b/bsim/bbu/python/bbu/bbu_main.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess from bbu import find_threshold, drscan, phase_scan diff --git a/bsim/bbu/python/bbu/drscan.py b/bsim/bbu/python/bbu/drscan.py index 2ab9fe3d8e..0d14bb8f7b 100644 --- a/bsim/bbu/python/bbu/drscan.py +++ b/bsim/bbu/python/bbu/drscan.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess import pylab diff --git a/bsim/bbu/python/bbu/find_threshold.py b/bsim/bbu/python/bbu/find_threshold.py index a0d9799799..24a38fb540 100644 --- a/bsim/bbu/python/bbu/find_threshold.py +++ b/bsim/bbu/python/bbu/find_threshold.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess, os, tempfile, shutil import glob, math, random diff --git a/bsim/bbu/python/bbu/phase_scan.py b/bsim/bbu/python/bbu/phase_scan.py index 832098b6c7..64d8b6d346 100644 --- a/bsim/bbu/python/bbu/phase_scan.py +++ b/bsim/bbu/python/bbu/phase_scan.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess import pylab diff --git a/tao/version/tao_version_mod.f90 b/tao/version/tao_version_mod.f90 index b60aa2336a..46867d10ce 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/30 17:00:42" +character(*), parameter :: tao_version_date = "2024/08/01 10:20:03" end module