fixed bunch spacing

lhcopt · Mar 4, 2021 · 0ffe77b · 0ffe77b
1 parent ac41fb2
commit 0ffe77b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/python_examples/ions_python/config.py b/python_examples/ions_python/config.py
@@ -80,7 +80,7 @@
 
     # Beam-beam parameters (used by python tools - NOT by legacy macros)
     'numberOfLRPerIRSide'      : [25, 20, 25, 20], 
-    'bunch_spacing_buckets'    : 20,
+    'bunch_spacing_buckets'    : 10,
     'numberOfHOSlices'         : 11,
     'bunch_population_ppb'     : None,
     'sigmaz_m'                 : None,

diff --git a/python_examples/ions_python/optics_specific_tools.py b/python_examples/ions_python/optics_specific_tools.py
@@ -234,8 +234,11 @@ def _check_separations_at_ips_against_madvars(twiss_df_b1, twiss_df_b2,
 def create_bb_shedule_to_track(filling_scheme_fname,bunch_to_track, beam=1):
     import fillingpatterns as fp
     patt = fp.FillingPattern.from_json(filling_scheme_fname)
-    patt.compute_beam_beam_schedule(n_lr_per_side=20)
-    bb_shedule_to_track = patt[f'b{beam}'].bb_schedule.loc[bunch_to_track]
+    patt.compute_beam_beam_schedule(n_lr_per_side=25)
+    if beam==1:
+        bb_shedule_to_track = patt.b1.bb_schedule.loc[bunch_to_track]
+    else:
+        bb_shedule_to_track = patt.b2.bb_schedule.loc[bunch_to_track]
     return bb_shedule_to_track
 
 def filter_bb_df(bb_df, bb_schedule_to_track):