Skip to content

Commit

Permalink
Revert "Merge remote-tracking branch 'freddieknets/main' into release…
Browse files Browse the repository at this point in the history
…/v0.12.0"

This reverts commit 1826657, reversing
changes made to d47795f.
  • Loading branch information
szymonlopaciuk committed Feb 20, 2023
1 parent 1826657 commit 51fc71b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion xpart/build_particles.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ def build_particles(_context=None, _buffer=None, _offset=None, _capacity=None,
tracker.line.get_s_elements())<=match_at_s)[0][-1]
assert at_element == expected_at_element or (
at_element < expected_at_element and
all([tracker.line[nn].behaves_like_drift
all([isinstance(tracker.line.element_dict[nn], xt.Drift)
or tracker.line.element_dict[nn].__class__.__name__.startswith('Limit')
for nn in tracker.line.element_names[at_element:expected_at_element]])), (
"`match_at_s` can only be placed in the drifts downstream of the "
"specified `at_element`. No active element can be present in between."
Expand Down

0 comments on commit 51fc71b

Please sign in to comment.