Minor bug fixes. (#934)

* Minor bug fixes.

bmad/doc/introduction.tex

@@ -41,19 +41,20 @@ \section*{Introduction}
 \tao manual pages and there will be a link for the tutorial.
 
 It is my pleasure to express appreciation to people who have contributed to this effort, and without
-whom, \bmad would only be a shadow of what it is today: To David Rubin for his support all these
-years, to \'Etienne Forest (aka Patrice Nishikawa) for use of his remarkable PTC/FPP library (not to
-mention his patience in explaining everything to me), to Desmond Barber for very useful discussions
-on how to simulate spin, to Mark Palmer, Matt Rendina, and Attilio De~Falco for all their work
-maintaining the build system and for porting \bmad to different platforms, to Frank Schmidt and CERN
-for permission to use the \mad tracking code. To Hans Grote and CERN for granting permission to
-adapt figures from the \mad manual for use in this one, to Martin Berz for his DA package, and to
-Dan Abell, Jacob Asimow, Ivan Bazarov, Moritz Beckmann, Scott Berg, Oleksii Beznosov, Joel Brock,
-Sarah Buchan, Avishek Chatterjee, Jing Yee Chee, Christie Chiu, Joseph Choi, Robert Cope, Jim
-Crittenden, Laurent Deniau, Bhawin Dhital, Gerry Dugan, Michael Ehrlichman, Jim Ellison, Ken
-Finkelstein, Mike Forster, Thomas Gl{\"a}{\ss}le, Juan Pablo Gonzalez-Aguilera, Sam Grant, Colwyn
-Gulliford, Klaus Heinemann, Richard Helms, Georg Hoffstaetter, Henry Lovelace III, Chris Mayes,
-Karthik Narayan, Katsunobu Oide, Tia Plautz, Matt Randazzo, Michael Saelim, Jim Shanks, Matthew
-Signorelli, Hugo Slepicka, Jeff Smith, Jeremy Urban, Ningdong Wang, Suntao Wang, Mark Woodley, and
-Demin Zhou for their help.
+whom, \bmad would only be a shadow of what it is today: To David Rubin and Georg Hoffstaetter for
+their support all these years, to \'Etienne Forest (aka Patrice Nishikawa) for use of his remarkable
+PTC/FPP library (not to mention his patience in explaining everything to me), to Desmond Barber for
+very useful discussions on how to simulate spin, to Jonathan Laster, Mark Palmer, Matt Rendina, and
+Attilio De~Falco for all their work maintaining the build system and for porting \bmad to different
+platforms, to Frank Schmidt and CERN for permission to use the \mad tracking code. To Hans Grote and
+CERN for granting permission to adapt figures from the \mad manual for use in this one, to Martin
+Berz for his DA package, and to Dan Abell, Jacob Asimow, Ivan Bazarov, Moritz Beckmann, Scott Berg,
+Oleksii Beznosov, Kevin Brown, Joel Brock, Sarah Buchan, Avishek Chatterjee, Jing Yee Chee, Christie
+Chiu, Joseph Choi, Robert Cope, Jim Crittenden, Laurent Deniau, Bhawin Dhital, Gerry Dugan, Michael
+Ehrlichman, Jim Ellison, Ken Finkelstein, Mike Forster, Thomas Gl{\"a}{\ss}le, Juan Pablo
+Gonzalez-Aguilera, Sam Grant, Colwyn Gulliford, Eiad Hamwi, Klaus Heinemann, Richard Helms, Lucy
+Lin, Henry Lovelace III, Chris Mayes, Vasiliy Morozov, Karthik Narayan, Katsunobu Oide, Tia Plautz,
+Matt Randazzo, Robert Ryne, Michael Saelim, Jim Shanks, Matthew Signorelli, Hugo Slepicka, Jeff
+Smith, Jonathan Unger, Jeremy Urban, Ningdong Wang, Suntao Wang, Mark Woodley, and Demin Zhou for
+their help.
 

bmad/low_level/track_a_beambeam.f90

@@ -62,7 +62,7 @@ subroutine track_a_beambeam (orbit, ele, param, track, mat6, make_matrix)
 
 if (logic_option(.false., make_matrix)) call mat_make_unit(mat6)
 
-if (ele%value(sig_x$) == 0 .or. ele%value(sig_x$) == 0) then
+if (ele%value(sig_x$) == 0 .or. ele%value(sig_y$) == 0) then
   if (strong_beam_strength(ele) == 0) return
   call out_io (s_error$, r_name, 'STRONG BEAM SIGMAS NOT SET FOR BEAMBEAM ELEMENT: ' // ele%name, &
                                  'PARTICLE WILL BE MARKED AS LOST.')

bmad/modules/bmad_struct.f90

@@ -522,7 +522,7 @@ module bmad_struct
 ! encopassing lord element.
 
 type coord_struct                 ! Particle coordinates at a single point
-  real(rp) :: vec(6) = 0          ! (x, px, y, py, z, pz)
+  real(rp) :: vec(6) = 0          ! (x, px, y, py, z, pz). Generally phase space for charged particles. See Bmad manual.
   real(rp) :: s = 0               ! Longitudinal position 
   real(rp) :: t = 0               ! Absolute time (not relative to reference). If bmad_private%rf_clock_frequency is
                                   ! set, %t will be the RF clock time in the range [0, 1/rf_clock_freq] 

changelog.md

@@ -10,6 +10,8 @@ Types of entries:
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+- 2024-04-24 Removed: srdt_lsq_soln program since it is not supported and Tao has this functionality.
+
 - 2024-04-24 Fixed: Foil tracking when there is an offset.
 
 - 2024-04-23 Changed: HomeBrew and MacPorts now automatically detected.

tao/code/tao_init.f90

@@ -317,7 +317,7 @@ subroutine tao_init (err_flag)
     call tao_inject_particle (u, tao_lat, ib)
     call tao_single_track (tao_lat, this_calc_ok, ib)
 
-    if (branch%param%particle /= photon$) then
+    if (branch%param%particle /= photon$ .and. this_calc_ok) then
       call radiation_integrals (tao_lat%lat, tao_branch%orbit, &
                                   tao_branch%modes_ri, tao_branch%ix_rad_int_cache, ib, tao_lat%rad_int)
 

tao/version/tao_version_mod.f90

@@ -6,5 +6,5 @@
 !-
 
 module tao_version_mod
-character(*), parameter :: tao_version_date = "2024/04/21 20:27:51"
+character(*), parameter :: tao_version_date = "2024/04/25 21:10:53"
 end module

util_programs/elegant_to_bmad/elegant_to_bmad.py

@@ -623,7 +623,6 @@ def parse_element(dlist):
       bparam = bmad_param(eparam, ele.name)
       if bparam == '?': continue
       if ele.bmad_type == 'drift' and bparam != 'l': continue
-    endif
 
     #