-
Notifications
You must be signed in to change notification settings - Fork 4
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
Extend FloorPlot
#50
Extend FloorPlot
#50
Conversation
0a6aade
to
159677f
Compare
Aside from CI failures:
This was already the idea, therefore it was using order from survey data (MAD-X had this), falling back to "nominal_order(element)" which would check for nominal strength even if not yet set, as opposed to "effective_order" which would check for actual strength values. Adding element type to survey is very good. However, since multipole handling is a major regression, let's keep the option to pass in the line object, and if done so, then use that extra information to colour the multipoles and other elements properly with the existing function. Let's not intentionally break what used to work before.
I think this can be reduced to one line with both, H and V bends, with two examples plots for two projections, and included in the main line.ipynb |
The line can now be provided an optional argument, in which case knl is used to extract order for Multipole elements. |
16ce015
to
0fb49fb
Compare
The Xtrack version with the additional columns in the survey is now released. |
I'll review and merge asap |
No rush :-) |
Update nb Update notebook Remove duplicated notebook Update notebook Extract order from knl for multipoles, if line is provided Update notebooks Clean up Missing plot Add more examples in notebook Add some straight magnets in example Complete example Remove redundant ZX ZY and XZ seem ok Refactored horizontal example The FloorPlot is made without passing the line Working on refactoring Examples with thin and thick elements XY plot
- add vertical bend example to line.ipynb - fix XZ projection for vertical bends not working due to rouding error - restore features if passing line object (e.g. custom label formatting) - use getter methods for survey data - trigonometric calculations on arrays instead of loop to improve performance
ff245b2
to
a592198
Compare
Had to do some changes to get tests running, and did some refactoring in the process for better performance and maintainability. Also included your v-bend example in the docs. |
Will be available on PyPI as pre-release 0.11.3-rc6 soon. I have recently updated the CI workflows to allow for pre-releases. PyPI and the version picker on the sphinx docs page reflects this. This means we can publish new features more quickly, while keeping the release cycle of "stable" versions (with possibly breaking changes, and for which docs are kept long-term) to every couple months. However, if you agree and tested it on your end, we could promote this RC version to stable 0.11.4, and continue development in the 0.12.* cycle @giadarol? |
@eltos, all good on my side. For me we can can go ahead. |
Note that this PR can be merged only after xtrack v0.73.1 is released.
The following modifications and extensions are introduced:
length
,isthick
andelement_type
have been added to the survey table in xtrack v0.73.1.Examples including horizontal and vertical bends are available at https://github.com/xsuite/xplt/blob/extend_floorplot/examples/line_cases.ipynb