Skip to content

Commit

Permalink
Fix type_ele with ramper slave.
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidSagan committed Aug 1, 2024
1 parent 7d9d718 commit cfd7e62
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bmad-doc/tutorial_bmad_tao/doc/tutorial_bmad_tao.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
%----------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion bmad/output/type_ele.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bsim/bbu/python/bbu/bbu_main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import subprocess
from bbu import find_threshold, drscan, phase_scan
Expand Down
2 changes: 1 addition & 1 deletion bsim/bbu/python/bbu/drscan.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import subprocess
import pylab
Expand Down
2 changes: 1 addition & 1 deletion bsim/bbu/python/bbu/find_threshold.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import subprocess, os, tempfile, shutil
import glob, math, random

Expand Down
2 changes: 1 addition & 1 deletion bsim/bbu/python/bbu/phase_scan.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import subprocess
import pylab
Expand Down
2 changes: 1 addition & 1 deletion tao/version/tao_version_mod.f90
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/07/30 17:00:42"
character(*), parameter :: tao_version_date = "2024/08/01 10:20:03"
end module

0 comments on commit cfd7e62

Please sign in to comment.