Oxygen parameters as in measurements, with scans

Author: elwaagaa

fma_ions/beam_parameters/sps_beam_parameters.py

@@ -67,11 +67,12 @@ class BeamParameters_SPS_Binomial_2016_before_RF_capture:
 @dataclass
 class BeamParameters_SPS_Oxygen:
     """Data Container for SPS oxygen beam parameters"""
-    Nb:  float = 25e8 # half of (John, Bartosik 2021) for oxygen, assuming bunch splitting
-    sigma_z: float = 0.213 # assume same as Pb
-    q : float = 0.59 # q-Gaussian parameter after RF spill --> assume same as Pb
-    exn: float = 1.3e-6
+    Nb:  float = 23.625e8 # measured on 2025-07-03 half of (John, Bartosik 2021) used 50 for oxygen,
+    sigma_z: float = 0.26 # use 2025-07-03 WCM measurement with q-Gaussian fit
+    q : float = 0.37 # q-Gaussian parameter after RF spill --> use 2025-07-03 WCM measurement
+    exn: float = 0.9e-6
     eyn: float = 0.9e-6
+    m : float = 9 # dummy value, not needed if q-Gaussian is used
 
 @dataclass
 class BeamParameters_SPS_Proton:

htcondor_submission/2024_SPS_Pb_flat_bottom_cases/qy_scan/oxygen/launch_gpu_qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_with_comp_TRANSFER_FUNCTION.py

@@ -11,10 +11,10 @@
 dir_path = pathlib.Path(__file__).parent.absolute()
 
 # Define run files and which parameters to change
-master_name = 'Qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_adaptive_sc_WITH_TRANSFER_FUNCTION_130k_turns'
+master_name = 'Qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_adaptive_sc_WITH_TRANSFER_FUNCTION_130k_turns_as_03_07_2025_MD'
 num_turns = 130_000 # corresponds to 3s for SPS ions at flat bottom
 Qx = 26.31
-Qy_range = np.arange(26.12, 26.27, 0.01)
+Qy_range = np.arange(26.10, 26.28, 0.01)
 run_files = ['sps_oxygen_run_{}_tbt_qx_26dot31.py'.format(i+1) for i in range(len(Qy_range))]
 
 # Define script and folder names
@@ -37,11 +37,6 @@
 n_turns = {}
 num_part = 20_000
 
-beamParams=fma_ions.BeamParameters_SPS()
-beamParams.Nb = 75.2e8
-beamParams.exn = 1.74e-6
-beamParams.eyn = 2.11e-6
-
 # Transfer function factors
 a_50 = 1.0 #1.7170
 a_150 = 0.5098
@@ -58,7 +53,7 @@
 
 # Tracking on GPU context
 sps = fma_ions.SPS_Flat_Bottom_Tracker(qx0={:.3f}, qy0={:.3f}, num_turns=n_turns, num_part=num_part)
-tbt = sps.track_SPS(ion_type='O', beamParams=beamParams, which_context='gpu', distribution_type='qgaussian', install_SC_on_line=True, add_beta_beat=True,
+tbt = sps.track_SPS(ion_type='O', which_context='gpu', distribution_type='qgaussian', install_SC_on_line=True, add_beta_beat=True,
                 add_non_linear_magnet_errors=True, apply_kinetic_IBS_kicks=True, ibs_step = 2000,
                 add_tune_ripple=True, ripple_freqs = ripple_freqs, kqf_amplitudes = kqf_amplitudes, 
                 kqd_amplitudes = kqd_amplitudes, kqf_phases=kqf_phases, kqd_phases=kqd_phases,

htcondor_submission/2024_SPS_Pb_flat_bottom_cases/qy_scan/oxygen/launch_gpu_qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_with_comp_TRANSFER_FUNCTION_long.py

@@ -11,10 +11,10 @@
 dir_path = pathlib.Path(__file__).parent.absolute()
 
 # Define run files and which parameters to change
-master_name = 'Qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_adaptive_sc_WITH_TRANSFER_FUNCTION_300k_turns_long'
+master_name = 'Qy_scan_oxygen_ibs_50_150_300_600_Hz_ripple_adaptive_sc_WITH_TRANSFER_FUNCTION_300k_turns_as_03_07_2025_MD_long'
 num_turns = 300_000 # corresponds to 9s for SPS ions at flat bottom
 Qx = 26.31
-Qy_range = np.arange(26.12, 26.27, 0.01)
+Qy_range = np.arange(26.10, 26.28, 0.01)
 run_files = ['sps_oxygen_run_{}_tbt_qx_26dot31_long.py'.format(i+1) for i in range(len(Qy_range))]
 
 # Define script and folder names
@@ -37,11 +37,6 @@
 n_turns = {}
 num_part = 20_000
 
-beamParams=fma_ions.BeamParameters_SPS()
-beamParams.Nb = 75.2e8
-beamParams.exn = 1.74e-6
-beamParams.eyn = 2.11e-6
-
 # Transfer function factors
 a_50 = 1.0 #1.7170
 a_150 = 0.5098
@@ -58,7 +53,7 @@
 
 # Tracking on GPU context
 sps = fma_ions.SPS_Flat_Bottom_Tracker(qx0={:.3f}, qy0={:.3f}, num_turns=n_turns, num_part=num_part)
-tbt = sps.track_SPS(ion_type='O', beamParams=beamParams, which_context='gpu', distribution_type='qgaussian', install_SC_on_line=True, add_beta_beat=True,
+tbt = sps.track_SPS(ion_type='O', which_context='gpu', distribution_type='qgaussian', install_SC_on_line=True, add_beta_beat=True,
                 add_non_linear_magnet_errors=True, apply_kinetic_IBS_kicks=True, ibs_step = 2000,
                 add_tune_ripple=True, ripple_freqs = ripple_freqs, kqf_amplitudes = kqf_amplitudes, 
                 kqd_amplitudes = kqd_amplitudes, kqf_phases=kqf_phases, kqd_phases=kqd_phases,