From 728846cb4a44477d0fe88d83aa05d8af99d043ce Mon Sep 17 00:00:00 2001 From: ximenes Date: Sun, 10 Apr 2022 14:51:54 -0300 Subject: [PATCH] Update how rf freqs are initialized --- pymodels/BO_V06_01/lattice.py | 8 +++++--- pymodels/SI_V25_04/lattice.py | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pymodels/BO_V06_01/lattice.py b/pymodels/BO_V06_01/lattice.py index cbc2935..08febd7 100644 --- a/pymodels/BO_V06_01/lattice.py +++ b/pymodels/BO_V06_01/lattice.py @@ -293,7 +293,7 @@ def create_lattice(energy=energy, optics_mode=None): the_ring = _pyacc_lat.shift(the_ring, idx[0]) # -- sets rf frequency - set_rf_frequency(the_ring) + set_rf_frequency(the_ring, energy) # -- sets rf voltage set_rf_voltage(the_ring, energy) @@ -344,10 +344,12 @@ def get_optics_mode(optics_mode, energy=energy): return strengths -def set_rf_frequency(the_ring): +def set_rf_frequency(the_ring, energy): """Set RF frequency of the lattice.""" circumference = _pyacc_lat.length(the_ring) - velocity = _mp.constants.light_speed + _, beam_velocity, _, _, _ = _mp.beam_optics.beam_rigidity(energy=energy/1e9) + velocity = beam_velocity + # velocity = _mp.constants.light_speed rev_frequency = velocity / circumference rf_frequency = harmonic_number * rev_frequency idx = _pyacc_lat.find_indices(the_ring, 'fam_name', 'P5Cav') diff --git a/pymodels/SI_V25_04/lattice.py b/pymodels/SI_V25_04/lattice.py index 6c10b79..1ea08f8 100644 --- a/pymodels/SI_V25_04/lattice.py +++ b/pymodels/SI_V25_04/lattice.py @@ -623,7 +623,7 @@ def create_lattice( the_ring = _pyacc_lat.shift(the_ring, idx[0]) # -- sets rf frequency - set_rf_frequency(the_ring) + set_rf_frequency(the_ring, energy) # -- sets number of integration steps set_num_integ_steps(the_ring) @@ -634,12 +634,12 @@ def create_lattice( return the_ring -def set_rf_frequency(the_ring): +def set_rf_frequency(the_ring, energy): """Set RF frequency of the lattice.""" circumference = _pyacc_lat.length(the_ring) - # _, beam_velocity, _, _, _ = _mp.beam_optics.beam_rigidity(energy=energy) - # velocity = beam_velocity - velocity = _mp.constants.light_speed + _, beam_velocity, _, _, _ = _mp.beam_optics.beam_rigidity(energy=energy/1e9) + velocity = beam_velocity + # velocity = _mp.constants.light_speed rev_frequency = velocity / circumference rf_frequency = harmonic_number * rev_frequency idx = _pyacc_lat.find_indices(the_ring, 'fam_name', 'SRFCav')