-
Notifications
You must be signed in to change notification settings - Fork 12
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
Feature/adding errors #28
Conversation
for alignment (transverse offset and transverse tilt) and multipole error components
to read in MAD-X error table and apply alignment and multipole errors (from an ESAVE table) to current Line
Hello @aoeftiger! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:
Comment last updated at 2019-10-21 12:42:56 UTC |
sweet, I've adapted to PEP8 now
|
To be improved before merging:
|
merge from sixtrack/pysixtrack
now it is the same as in MAD-X for the shifts + tilt (cf. https://github.com/aoeftiger/sixtracklib_pyht_playground/blob/6617274f0238a7ba083604ddfb4f90db6ba780d7/tests/alignment_errors.ipynb or on nbviewer: https://nbviewer.jupyter.org/github/aoeftiger/sixtracklib_pyht_playground/blob/6617274f0238a7ba083604ddfb4f90db6ba780d7/tests/alignment_errors.ipynb)
fixes naming error for exact drift beam element
I merge the PR for the time being, we will patch the alignment errors later... |
Thanks, I'll put them as an issue in the sixtrack/pysixtrack repo then to remind myself |
loader_mad: adding kicker, collimator and elseparator elements
The PR adds an approach to add MAD-X lattice errors (from a
cpymad
exposed error table e.g. via ESAVE) to an existing line. For now this supportsa)
XYShift
for offsets (dx, dy
in MAD-X),b)
SRotation
for tilts (dpsi
in MAD-X) andc) multipole errors (
k1-20l
andk1-20sl
in MAD-X).The following should be confirmed before merging:
Multipole
-->XYShift
+SRotation
+Multipole
+SRotation
+XYShift
dx
ordy
error for a MAD-X element leads to a negative shift in the particle coordinate when enteringdpsi
error for a MAD-X element leads to a negative angle in theSRotation
when entering