Skip to content

Commit

Permalink
Unify interfaces of add_xyz_error_to() functions to use element_name
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-martin committed Jan 9, 2020
1 parent 63dcdbf commit 1c7e0ef
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pysixtrack/line.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,10 @@ def add_tilt_error_to(self, element_name, angle):
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 @@ -442,7 +443,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 Down Expand Up @@ -472,7 +472,7 @@ def apply_madx_errors(self, error_table):
for o in range(max_multipole_err + 1)
]
if any(knl) or any(ksl):
self.add_multipole_error_to(element, knl, ksl)
self.add_multipole_error_to(element_name, knl, ksl)

return elements_not_found

Expand Down

0 comments on commit 1c7e0ef

Please sign in to comment.