Put Tao curve legend parameters in tao_legend_struct. (#1293)

* Put Tao curve legend parameters in tao_legend_struct.
bmad-sim · Nov 15, 2024 · 8aaaef1 · 8aaaef1
1 parent 5dde5a4
commit 8aaaef1
Show file tree

Hide file tree

Showing 52 changed files with 689 additions and 695 deletions.
diff --git a/bmad-doc/tao_examples/cbeta_cell/SetMultiOrbit.tao b/bmad-doc/tao_examples/cbeta_cell/SetMultiOrbit.tao
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell.bmad b/bmad-doc/tao_examples/cbeta_cell/cell.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell.lat.bmad b/bmad-doc/tao_examples/cbeta_cell/cell.lat.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell1.lat b/bmad-doc/tao_examples/cbeta_cell/cell1.lat
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell2.lat b/bmad-doc/tao_examples/cbeta_cell/cell2.lat
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell3.lat b/bmad-doc/tao_examples/cbeta_cell/cell3.lat
diff --git a/bmad-doc/tao_examples/cbeta_cell/cell4.lat b/bmad-doc/tao_examples/cbeta_cell/cell4.lat
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy0.bmad b/bmad-doc/tao_examples/cbeta_cell/energy0.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy1.bmad b/bmad-doc/tao_examples/cbeta_cell/energy1.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy2.bmad b/bmad-doc/tao_examples/cbeta_cell/energy2.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy3.bmad b/bmad-doc/tao_examples/cbeta_cell/energy3.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy4.bmad b/bmad-doc/tao_examples/cbeta_cell/energy4.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy5.bmad b/bmad-doc/tao_examples/cbeta_cell/energy5.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/energy_patches.bmad b/bmad-doc/tao_examples/cbeta_cell/energy_patches.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/solution_4.5deg.bmad b/bmad-doc/tao_examples/cbeta_cell/solution_4.5deg.bmad
diff --git a/bmad-doc/tao_examples/cbeta_cell/tao.init b/bmad-doc/tao_examples/cbeta_cell/tao.init
diff --git a/bmad-doc/tao_examples/cbeta_cell/tao.startup b/bmad-doc/tao_examples/cbeta_cell/tao.startup
diff --git a/bmad-doc/tao_examples/cbeta_cell/tao_plot.init b/bmad-doc/tao_examples/cbeta_cell/tao_plot.init
diff --git a/bmad-doc/tao_examples/cbeta_ffag/CorrectOrbit.tao b/bmad-doc/tao_examples/cbeta_ffag/CorrectOrbit.tao
diff --git a/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao b/bmad-doc/tao_examples/cbeta_ffag/OrbitCorrectionSetup4.tao
diff --git a/bmad-doc/tao_examples/cbeta_ffag/SetMultiOrbit.tao b/bmad-doc/tao_examples/cbeta_ffag/SetMultiOrbit.tao
diff --git a/bmad-doc/tao_examples/cbeta_ffag/tao.init b/bmad-doc/tao_examples/cbeta_ffag/tao.init
diff --git a/bmad-doc/tao_examples/cbeta_ffag/tao.startup b/bmad-doc/tao_examples/cbeta_ffag/tao.startup
diff --git a/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init b/bmad-doc/tao_examples/cbeta_ffag/tao_plot.init
diff --git a/bmad-doc/tao_examples/erl/line.beam b/bmad-doc/tao_examples/erl/line.beam
diff --git a/bmad-doc/tao_examples/erl/tao.init b/bmad-doc/tao_examples/erl/tao.init
diff --git a/bmad-doc/tao_examples/erl/tao.startup b/bmad-doc/tao_examples/erl/tao.startup
diff --git a/bmad-doc/tao_examples/erl/tao_plot.init b/bmad-doc/tao_examples/erl/tao_plot.init
diff --git a/bmad-doc/tao_examples/optics_matching/tao.init b/bmad-doc/tao_examples/optics_matching/tao.init
diff --git a/bmad-doc/tao_examples/optics_matching/tao.startup b/bmad-doc/tao_examples/optics_matching/tao.startup
diff --git a/bmad-doc/tao_examples/optics_matching/tao_plot.init b/bmad-doc/tao_examples/optics_matching/tao_plot.init
diff --git a/bmad-doc/tao_examples/space_charge/tao_plot.init b/bmad-doc/tao_examples/space_charge/tao_plot.init
diff --git a/bmad/multiparticle/wake_mod.f90 b/bmad/multiparticle/wake_mod.f90
@@ -522,7 +522,7 @@ subroutine sr_z_long_wake (ele, bunch, z_ave)
 srz => sr%z_long
 if (srz%dz == 0) return
 
-f0 = sr%amp_scale * bunch%charge_live
+f0 = sr%amp_scale * bunch%charge_live / sum(bunch%particle%charge, bunch%particle%state == alive$)
 if (sr%scale_with_length) f0 = f0 * ele%value(l$) 
 
 ! Compute binned bunch distribution and wake
@@ -544,8 +544,8 @@ subroutine sr_z_long_wake (ele, bunch, z_ave)
     cycle
   endif
 
-  r1 = ix2 - rz_rel
-  r2 = rz_rel - ix1
+  r1 = (ix2 - rz_rel) * p%charge
+  r2 = (rz_rel - ix1) * p%charge
 
   select case (srz%position_dependence)
   case (none$, x_trailing$, y_trailing$)
@@ -572,6 +572,7 @@ subroutine sr_z_long_wake (ele, bunch, z_ave)
 call fft_1d(srz%w_out, 1)
 
 ! Apply wake
+! Notice that p%charge does not appear here.
 
 do i = 1, size(bunch%particle)
   p => bunch%particle(i)