Skip to content
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

Fix AttributeError for misaligned non-multipoles #37

Merged
merged 4 commits into from
Aug 21, 2020
Merged

Fix AttributeError for misaligned non-multipoles #37

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
96dd4f9
Fix AttributeError for misaligned non-multipoles
roman-martin Jan 9, 2020
15a9ba0
Fix dx,dy,tilt error assignment for multiply sliced elements
roman-martin Jan 9, 2020
ccf3f9a
Unify interfaces of add_xyz_error_to() functions to use element_name
roman-martin Jan 9, 2020
f8ad424
line: add missing element in add_tilt_error, fix tests
aoeftiger Aug 20, 2020
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
49 changes: 25 additions & 24 deletions pysixtrack/line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,48 +345,48 @@ def from_madx_sequence(

# error handling (alignment, multipole orders, ...):

def find_element_ids(self, element):
"""Find element in this Line instance's self.elements.
def find_element_ids(self, element_name):
"""Find element_name in this Line instance's
self.elements_name list. Assumes the names are unique.

Return index before and after the element, taking into account
attached _aperture instances (LimitRect, LimitEllipse, ...)
which would follow the element occurrence in the list.

Raises IndexError if element not in this Line.
Raises IndexError if element_name not found in this Line.
"""
# will raise error if element not present:
idx_el = self.elements.index(element)
idx_el = self.element_names.index(element_name)
idx_after_el = idx_el + 1
el_name = self.element_names[idx_el]
if self.element_names[idx_after_el] == el_name + "_aperture":
if self.element_names[idx_after_el] == element_name + "_aperture":
idx_after_el += 1
return idx_el, idx_after_el

def add_offset_error_to(self, element, dx=0, dy=0):
idx_el, idx_after_el = self.find_element_ids(element)
el_name = self.element_names[idx_el]
def add_offset_error_to(self, element_name, dx=0, dy=0):
idx_el, idx_after_el = self.find_element_ids(element_name)
if not dx and not dy:
return
xyshift = elements.XYShift(dx=dx, dy=dy)
inv_xyshift = elements.XYShift(dx=-dx, dy=-dy)
self.insert_element(idx_el, xyshift, el_name + "_offset_in")
self.insert_element(idx_el, xyshift, element_name + "_offset_in")
self.insert_element(
idx_after_el + 1, inv_xyshift, el_name + "_offset_out"
idx_after_el + 1, inv_xyshift, element_name + "_offset_out"
)

def add_tilt_error_to(self, element, angle):
def add_tilt_error_to(self, element_name, angle):
'''Alignment error of transverse rotation around s-axis.
The given `element` gets wrapped by SRotation elements
with rotation angle `angle`.
The element corresponding to the given `element_name`
gets wrapped by SRotation elements with rotation angle
`angle`.

In the case of a thin dipole component, the corresponding
curvature terms in the Multipole (hxl and hyl) are rotated
by `angle` as well.
'''
idx_el, idx_after_el = self.find_element_ids(element)
el_name = self.element_names[idx_el]
idx_el, idx_after_el = self.find_element_ids(element_name)
if not angle:
return
element = self.elements[self.element_names.index(element_name)]
if isinstance(element, elements.Multipole) and (
element.hxl or element.hyl):
dpsi = angle * deg2rad
Expand All @@ -401,12 +401,13 @@ def add_tilt_error_to(self, element, angle):
element.hyl = hyl1
srot = elements.SRotation(angle=angle)
inv_srot = elements.SRotation(angle=-angle)
self.insert_element(idx_el, srot, el_name + "_tilt_in")
self.insert_element(idx_after_el + 1, inv_srot, el_name + "_tilt_out")
self.insert_element(idx_el, srot, element_name + "_tilt_in")
self.insert_element(idx_after_el + 1, inv_srot, element_name + "_tilt_out")

def add_multipole_error_to(self, element, knl=[], ksl=[]):
def add_multipole_error_to(self, element_name, knl=[], ksl=[]):
# will raise error if element not present:
assert element in self.elements
assert element_name in self.element_names
element = self.elements[self.element_names.index(element_name)]
# normal components
knl = np.trim_zeros(knl, trim="b")
if len(element.knl) < len(knl):
Expand Down Expand Up @@ -467,7 +468,6 @@ def apply_madx_errors(self, error_table):
if element_name not in self.element_names:
elements_not_found.append(element_name)
continue
element = self.elements[self.element_names.index(element_name)]

# add offset
try:
Expand All @@ -478,12 +478,12 @@ def apply_madx_errors(self, error_table):
dy = error_table["dy"][i_line]
except KeyError:
dy = 0
self.add_offset_error_to(element, dx, dy)
self.add_offset_error_to(element_name, dx, dy)

# add tilt
try:
dpsi = error_table["dpsi"][i_line]
self.add_tilt_error_to(element, angle=dpsi / deg2rad)
self.add_tilt_error_to(element_name, angle=dpsi / deg2rad)
except KeyError:
pass

Expand All @@ -496,7 +496,8 @@ def apply_madx_errors(self, error_table):
error_table[f"k{o}sl"][i_line]
for o in range(max_multipole_err + 1)
]
self.add_multipole_error_to(element, knl, ksl)
if any(knl) or any(ksl):
self.add_multipole_error_to(element_name, knl, ksl)

return elements_not_found

Expand Down
18 changes: 10 additions & 8 deletions tests/test_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,35 @@ def test_line():

n_elements = 3
position = 1
line.insert_element(position, drift_exact, "exact drift")
drift_exact_name = "exact drift"
line.insert_element(position, drift_exact, drift_exact_name)
n_elements += 1
assert len(line) == n_elements
assert line.find_element_ids(drift_exact)[0] == position
assert line.find_element_ids(drift_exact_name)[0] == position
assert line.get_length() == length

line.insert_element(position, multipole, "multipole")
multipole_name = "multipole"
line.insert_element(position, multipole, multipole_name)
n_elements += 1
line.insert_element(position + 1, aperture, "multipole_aperture")
n_elements += 1
assert len(line) == n_elements

line.add_offset_error_to(multipole, dx=0, dy=0)
line.add_offset_error_to(multipole_name, dx=0, dy=0)
assert len(line) == n_elements

line.add_offset_error_to(multipole, dx=0.2, dy=-0.003)
line.add_offset_error_to(multipole_name, dx=0.2, dy=-0.003)
n_elements += 2
assert len(line) == n_elements

line.add_tilt_error_to(multipole, angle=0)
line.add_tilt_error_to(multipole_name, angle=0)
assert len(line) == n_elements

line.add_tilt_error_to(multipole, angle=0.1)
line.add_tilt_error_to(multipole_name, angle=0.1)
n_elements += 2
assert len(line) == n_elements

line.add_multipole_error_to(multipole, knl=[0, 0.1], ksl=[-0.03, 0.01])
line.add_multipole_error_to(multipole_name, knl=[0, 0.1], ksl=[-0.03, 0.01])
# line.add_multipole_error_to(drift_exact,knl=[0,0.1],ksl=[-0.03,0.01])

line_dict = line.to_dict()
Expand Down