Skip to content

Correct bug in model and measured ORM #61

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Correct bug in model and measured ORM #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab02061
Change np.average to np.ma.average to properly handle cases with zero…
Oct 10, 2024
b58d83b
Fixed measured ORM to return to initial state despite corrector stren…
Oct 30, 2024
0c12d7b
Added deepcopy around variables to prevent next line to set their fir…
Nov 5, 2024
3e6006e
Disentangle changes from two different PR.
Nov 7, 2024
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
5 changes: 3 additions & 2 deletions pySC/correction/loco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import multiprocessing
from pySC.lattice_properties.response_model import SCgetModelRM, SCgetModelDispersion
from pySC.core.constants import SETTING_ADD, TRACK_ORB
from pySC.core.constants import SETTING_ADD, SETTING_ABS, TRACK_ORB
from pySC.core.beam import bpm_reading
import matplotlib.pyplot as plt
from scipy.optimize import least_squares
Expand Down Expand Up @@ -71,9 +71,10 @@ def measure_closed_orbit_response_matrix(SC, bpm_ords, cm_ords, dkick=1e-5):
cnt = 0
for n_dim in range(2):
for cm_ord in cm_ords[n_dim]:
initial_cm_value = SC.get_cm_setpoints(cm_ord, skewness=bool(n_dim))
SC.set_cm_setpoints(cm_ord, dkick, skewness=bool(n_dim), method=SETTING_ADD)
closed_orbits1 = bpm_reading(SC, bpm_ords=bpm_ords)[0]
SC.set_cm_setpoints(cm_ord, -dkick, skewness=bool(n_dim), method=SETTING_ADD)
SC.set_cm_setpoints(cm_ord, initial_cm_value, skewness=bool(n_dim), method=SETTING_ABS)
response_matrix[:, cnt] = np.ravel((closed_orbits1 - closed_orbits0) / dkick)
cnt = cnt + 1
return response_matrix
Expand Down
4 changes: 2 additions & 2 deletions pySC/lattice_properties/response_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ def SCgetModelRING(SC: SimulatedCommissioning, includeAperture: bool =False) ->
ring = SC.IDEALRING.deepcopy()
for ord in range(len(SC.RING)):
if hasattr(SC.RING[ord], 'SetPointA') and hasattr(SC.RING[ord], 'SetPointB'):
ring[ord].PolynomA = SC.RING[ord].SetPointA
ring[ord].PolynomB = SC.RING[ord].SetPointB
ring[ord].PolynomA = copy.deepcopy(SC.RING[ord].SetPointA)
ring[ord].PolynomB = copy.deepcopy(SC.RING[ord].SetPointB)
ring[ord].PolynomA[0] = 0.0
ring[ord].PolynomB[0] = 0.0
if includeAperture:
Expand Down
Loading