Skip to content

Update how rf freqs are initialized #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
xresende wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update how rf freqs are initialized #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pymodels/BO_V06_01/lattice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down
10 changes: 5 additions & 5 deletions pymodels/SI_V25_04/lattice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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')
Expand Down