More fixer devel. (bmad-sim#1686)

* More fixer devel.

Author: DavidSagan

bmad/modules/attribute_mod.f90

@@ -936,6 +936,7 @@ subroutine init_attribute_name_array ()
 call init_attribute_name1 (beginning_ele$, ref_time$,                    'REF_TIME')
 call init_attribute_name1 (beginning_ele$, inherit_from_fork$,           'INHERIT_FROM_FORK')
 call init_attribute_name1 (beginning_ele$, deta_ds_master$,              'deta_ds_master', private$)
+call init_attribute_name1 (beginning_ele$, ix_fixer$,                    'ix_fixer', private$)
 
 attrib_array(def_line$, :) = attrib_array(beginning_ele$, :)
 call init_attribute_name1 (def_line$, particle$,                    'PARTICLE')
@@ -1004,6 +1005,7 @@ subroutine init_attribute_name_array ()
 call init_attribute_name1 (fixer$, cmat_21_stored$,                     'CMAT_21_STORED')
 call init_attribute_name1 (fixer$, cmat_22_stored$,                     'CMAT_22_STORED')
 call init_attribute_name1 (fixer$, mode_flip_stored$,                   'MODE_FLIP_STORED')
+call init_attribute_name1 (fixer$, ix_fixer$,                           'ix_fixer', private$)
 
 call init_attribute_name1 (feedback$, input_ele$,                        'INPUT_ELE')
 call init_attribute_name1 (feedback$, output_ele$,                       'OUTPUT_ELE')

bmad/modules/bmad_struct.f90

@@ -1774,7 +1774,7 @@ module bmad_struct
 integer, parameter :: ref_tilt$ = 3, direction$ = 3, repetition_frequency$ = 3, deta_ds_master$ = 3, &
                       kick$ = 3, x_gain_err$ = 3, taylor_order$ = 3, r_solenoid$ = 3, final_charge$ = 3
 integer, parameter :: k1$ = 4, kx$ = 4, harmon$ = 4, h_displace$ = 4, y_gain_err$ = 4, s_twiss_ref$ = 4, &
-                      critical_angle_factor$ = 4, tilt_corr$ = 4, ref_coords$ = 4, dt_max$ = 4
+                      critical_angle_factor$ = 4, tilt_corr$ = 4, ref_coords$ = 4, dt_max$ = 4, ix_fixer$ = 4
 integer, parameter :: graze_angle$ = 5, k2$ = 5, b_max$ = 5, v_displace$ = 5, gradient_tot$ = 5, harmon_master$ = 5, &
                       flexible$ = 5, crunch$ = 5, ref_orbit_follows$ = 5, pc_out_min$ = 5
 integer, parameter :: gradient$ = 6, k3$ = 6, noise$ = 6, new_branch$ = 6, ix_branch$ = 6, g_max$ = 6, &

bmad/modules/fixer_mod.f90

@@ -50,7 +50,7 @@ subroutine set_active_fixer(fixer, is_on)
 branch => fixer%branch
 on = logic_option(.true., is_on)
 
-if (.not. is_on .and. .not. fixer%is_on) return
+if (.not. on .and. .not. fixer%is_on) return
 
 do ie = 0, branch%n_ele_track
   ele => branch%ele(ie)

bmad/parsing/bmad_parser.f90

@@ -36,6 +36,7 @@ subroutine bmad_parser (lat_file, lat, make_mats6, digested_read_ok, use_line, e
 use wall3d_mod, dummy3 => bmad_parser
 use photon_target_mod, dummy4 => bmad_parser
 use ptc_interface_mod, only: set_ptc_com_pointers
+use fixer_mod, only: set_active_fixer
 use random_mod
 
 implicit none
@@ -60,8 +61,8 @@ subroutine bmad_parser (lat_file, lat, make_mats6, digested_read_ok, use_line, e
 integer, allocatable :: seq_indexx(:)
 
 integer :: ix_param_ele, ix_mad_beam_ele
-integer ix_word, i_use, i, j, k, k2, n, ix, ix1, ix2, n_track
-integer n_ele_use, digested_version, key, loop_counter, n_ic, n_con
+integer ix_word, i_use, i, j, k, k2, n, ix, ix1, ix2, n_track, ix_ele_fix
+integer n_ele_use, digested_version, key, loop_counter, n_ic, n_con, ix_set
 integer iseq_tot, iyy, n_ele_max, n_multi, n0, n_ele, ixc, n_slave, n_loc
 integer ib, ie, ib2, ie2, flip, n_branch, n_forks, i_loop, n_branch_max
 integer, pointer :: n_max
@@ -95,6 +96,7 @@ subroutine bmad_parser (lat_file, lat, make_mats6, digested_read_ok, use_line, e
 bp_com = bp_common_struct()
 allocate(bp_com%lat_file_names(1))       !! To get around an ifort bug in Versions 18+
 bp_com%parser_name = 'bmad_parser'       ! Used for error messages.
+bp_com%ix_fixer = 0                      ! Used to indicate last fixer set on.
 debug_line = ''
 err = .false.
 
@@ -1158,6 +1160,22 @@ subroutine bmad_parser (lat_file, lat, make_mats6, digested_read_ok, use_line, e
   return
 endif
 
+! Make sure there is only one active fixer
+
+do n = 0, ubound(lat%branch, 1)
+  branch => lat%branch(n)
+  ix_ele_fix = 0
+  ix_set = 0
+  do i = 0, branch%n_ele_max
+    ele => branch%ele(i)
+    if (ele%key /= beginning_ele$ .and. ele%key /= fixer$) cycle
+    if (.not. ele%is_on .or. ele%value(ix_fixer$) < ix_set) cycle
+    ix_set = nint(ele%value(ix_fixer$))
+    ix_ele_fix = i
+  enddo
+  call set_active_fixer(branch%ele(ix_ele_fix))
+enddo
+
 ! Bookkeeping...
 ! Must do this before calling bmad_parser2 since after an expand_lattice command the lattice 
 ! file may contain references to dependent element parameters that are computed in lattice_bookkeeper.

bmad/parsing/bmad_parser2.f90

@@ -56,11 +56,11 @@ subroutine bmad_parser2 (lat_file, lat, orbit, make_mats6, err_flag, parse_lat)
 
 character(*) lat_file
 character(1) delim 
-character(16) :: r_name = 'bmad_parser2'
 character(40) word_1, slice_start, slice_end, temp_ele_name
 character(40) word_2, name, this_name, old_parser_name
 character(80) debug_line
 character(280) parse_line_save, string, extra_ele_names
+character(*), parameter :: r_name = 'bmad_parser2'
 
 logical, optional :: make_mats6, err_flag
 logical parsing, found, delim_found, err, key_here, move

bmad/parsing/bmad_parser_struct.f90

@@ -134,10 +134,11 @@ module bmad_parser_struct
   integer :: i_const_tot = 0, i_const_init = 0
   integer :: ios_next_chunk = 0
   integer :: ios_this_chunk = 0
-  character(400), allocatable :: lat_file_names(:)     ! List of all files used to create lat
+  integer :: ix_fixer = 0    ! Indicates order of when fixers are turned on in parsing.
   ! Note: use %line2_file_name to ID line. %line1_file_name may be blank!
   character(400) :: line1_file_name = ''               ! Name of file from which %input_line1 was read
   character(400) :: line2_file_name = ''               ! Name of file from which %input_line2 was read
+  character(400), allocatable :: lat_file_names(:)     ! List of all files used to create lat
   character(n_parse_line_extended) :: parse_line = ''  ! Current string to be parsed.
   character(n_parse_line_extended) :: input_line1 = '' ! Line before current line. For debug messages.
   character(n_parse_line_extended) :: input_line2 = '' ! Current line. For debug messages.

bmad/parsing/parser_set_attribute_mod.f90

@@ -42,6 +42,7 @@ subroutine parser_set_attribute (how, ele, delim, delim_found, err_flag, pele, c
                                                                  heterogeneous_ele_list, set_field_master)
 
 use photon_reflection_mod, only: finalize_reflectivity_table
+use fixer_mod, only: set_active_fixer
 
 implicit none
 
@@ -1922,6 +1923,14 @@ subroutine parser_set_attribute (how, ele, delim, delim_found, err_flag, pele, c
 
 case ('IS_ON')
   call parser_get_logical (attrib_word, ele%is_on, ele%name, delim, delim_found, err_flag)
+  if (ele%key == beginning_ele$ .or. ele%key == fixer$) then
+    if (bp_com%parser_name == 'bmad_parser2') then
+      call set_active_fixer(ele)
+    elseif (ele%is_on) then
+      bp_com%ix_fixer = bp_com%ix_fixer + 1
+      ele%value(ix_fixer$) = bp_com%ix_fixer  ! Used to indicate last fixer set on.
+    endif
+  endif
 
 case ('SUPERIMPOSE')
   call parser_get_logical (attrib_word, logic, ele%name, delim, delim_found, err_flag); if (err_flag) return

tao/version/tao_version_mod.f90

@@ -6,5 +6,5 @@
 !-
 
 module tao_version_mod
-character(*), parameter :: tao_version_date = "2025/08/11 19:09:49"
+character(*), parameter :: tao_version_date = "2025/08/11 22:12:57"
 end module