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.

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

Add arex/arey to available alignment errors #40

Merged
merged 4 commits into from
Aug 25, 2020

Conversation

roman-martin
Copy link

-add support for arex/arey aperture misalignments from MAD-X
-adapt find_element_ids() to find aperture marker more reliably
-checks if errors exist/are non-zero are now done before calling the respective add_xyz_error_to() functions, not in the functions themselves

Based on changes from PR #37

Copy link

@aoeftiger aoeftiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would opt for leaving the default values of dx=0, dy=0 and angle=0 (and accordingly add them for arex=0, arey=0) in the argument signatures to have an indication of what value type is requested for this argument.

I can live with removing return upon zero values inside the add_...() functions though, as long as no "empty" error elements are added in apply_madx_errors (as it is the case here, so that's fine with me).

--> @roman-martin do you want to re-add the default arguments?

@aoeftiger
Copy link

.. and potentially rebase this branch against #37 .

@aoeftiger
Copy link

@rdemaria @martinschwinzerl ready 😄

@rdemaria rdemaria merged commit 4ab545d into SixTrack:master Aug 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants