Merge branch 'main' of https://github.com/bmad-sim/bmad-ecosystem

bmad-sim · May 4, 2024 · 419b306 · 419b306
2 parents d9c6bba + 54c4727
commit 419b306
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/tao/code/tao_set_mod.f90 b/tao/code/tao_set_mod.f90
@@ -1211,6 +1211,9 @@ subroutine tao_set_beam_init_cmd (who, value_str, branch_str)
   case ('position_file')
     write (iu, '(2a)') ' beam_init%' // trim(who2) // ' = ', quote(value_str)
 
+  case ('center_jitter', 'center', 'spin')
+    write (iu, '(2a)') ' beam_init%' // trim(who2) // ' = ', value_str
+
   case default
     ! If tao_evaluate_expression fails then the root cause may be that the User is trying
     ! something like "set beam_init beam_saved_at = END" so the basic problem is that beam_saved_at

diff --git a/tao/code/tao_show_this.f90 b/tao/code/tao_show_this.f90
@@ -463,7 +463,10 @@ subroutine tao_show_this (what, result_id, lines, nl)
     nl=nl+1; lines(nl) = 'beam_init components (set by "set beam_init ..."):'
     nl=nl+1; write(lines(nl), amt) '  %position_file          = ', quote(beam_init%position_file)
     nl=nl+1; write(lines(nl), amt) '  %distribution_type      = ', quoten(beam_init%distribution_type)
+    nl=nl+1; write(lines(nl), lmt) '  %full_6D_coupling_calc  = ', beam_init%full_6d_coupling_calc
     nl=nl+1; write(lines(nl), lmt) '  %use_particle_start     = ', beam_init%use_particle_start
+    nl=nl+1; write(lines(nl), lmt) '  %use_t_coords           = ', beam_init%use_t_coords
+    nl=nl+1; write(lines(nl), lmt) '  %use_z_as_t             = ', beam_init%use_z_as_t
     if (beam_init%use_particle_start) then
       nl=nl+1; write(lines(nl), '(a, 6es16.8, 3x, a)') '  %center                 = ', beam_init%center, '! Note: Will use particle_start instead'
       nl=nl+1; write(lines(nl), '(a, 3es16.8, 3x, a)') '  %spin                   = ', beam_init%spin,   '! Note: Will use particle_start instead'
@@ -474,11 +477,13 @@ subroutine tao_show_this (what, result_id, lines, nl)
       nl=nl+1; write(lines(nl), '(a, 6es16.8, 3x, a)') '  particle_start[z]       = ', u%model%lat%particle_start%vec(5)
       nl=nl+1; write(lines(nl), '(a, 6es16.8, 3x, a)') '  particle_start[pz]      = ', u%model%lat%particle_start%vec(6)
     else
-      nl=nl+1; write(lines(nl), rmt) '  %center                 = ', beam_init%center
       nl=nl+1; write(lines(nl), rmt) '  %spin                   = ', beam_init%spin
+      nl=nl+1; write(lines(nl), rmt) '  %center                 = ', beam_init%center
+      nl=nl+1; write(lines(nl), rmt) '  %center_jitter          = ', beam_init%center_jitter
     endif
-    nl=nl+1; write(lines(nl), rmt)  '  %center_jitter          = ', beam_init%center_jitter
+    nl=nl+1; write(lines(nl), rmt)  '  %t_offset               = ', beam_init%t_offset
     nl=nl+1; write(lines(nl), imt)  '  %n_particle             = ', beam_init%n_particle
+    nl=nl+1; write(lines(nl), imt)  '  %ix_turn                = ', beam_init%ix_turn
     nl=nl+1; write(lines(nl), imt2) '  %n_bunch                = ', beam_init%n_bunch, '! Note: 0 => Create one bunch if not reading from a file'
     nl=nl+1; write(lines(nl), rmt)  '  %bunch_charge           = ', beam_init%bunch_charge
     if (u%model%lat%branch(0)%param%particle == photon$) then

diff --git 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/04/27 17:18:02"
+character(*), parameter :: tao_version_date = "2024/05/04 12:47:15"
 end module