Skip to content

Patch fixes #378

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

Merged
merged 5 commits into from
Aug 2, 2023
Merged

Conversation

jgray-19
Copy link
Contributor

@jgray-19 jgray-19 commented Aug 2, 2023

An updated version of #367 with the comments taken into account

Fixes List

  • Make all patches follow trkfun format.
  • Add third argument to patches so that they run in trackone
  • Fix tilt so that srotation is performed in C and Lua
  • Fix symmetry between Lua and C
  • Make Lua and C attitude to optional arguments and m.d(the/phi/psi) identical
  • Force tilt in Lua and C to work the same
  • Fix changeref weighting

Copy link
Contributor

@ldeniau ldeniau left a comment

Choose a reason for hiding this comment

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

  • patches as element must use elm.angle -> m.ang & cflw.ang
  • misalign must use m.mang (we should simplify/remove the use ang in etrck)
  • no other maps use m.ang of cflw.ang
  • thus srotation used as tilt can use m.ang and cflw.ang. This simplifies a lot the code.

@ldeniau
Copy link
Contributor

ldeniau commented Aug 2, 2023

accepted for now, but it is not the correct way to do the rotation for the tilt

@ldeniau ldeniau merged commit 6201f6d into MethodicalAcceleratorDesign:dev Aug 2, 2023
@jgray-19
Copy link
Contributor Author

jgray-19 commented Aug 2, 2023

  • patches as element must use elm.angle -> m.ang & cflw.ang

    • misalign must use m.mang (we should simplify/remove the use ang in etrck)

    • no other maps use m.ang of cflw.ang

    • thus srotation used as tilt can use m.ang and cflw.ang. This simplifies a lot the code.

In this case, would you like me to change the sbend_thick (in c++), which currently uses m.ang. Then change the patches (in c++) (x/y/s)rotation to use m.ang instead of the current m.d(the/phi/psi)

@jgray-19 jgray-19 deleted the patch_fix_v2 branch October 22, 2024 07:55
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.

2 participants