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.

Sign up for GitHub

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

Jump to bottom

Read Bmad lattice files #65

Merged
merged 86 commits into from
Sep 14, 2023
Merged

Read Bmad lattice files #65

merged 86 commits into from
Sep 14, 2023

Commits on Sep 3, 2023

  1. Prototyped clean and recursive reading of lattice file lines

    @jank324
    jank324 committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    c9c96cf View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Protoyping pattern matching of expressions in bmad lattice files with… 

    … fullmatch
    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    c479ca4 View commit details
    Browse the repository at this point in the history

  2. Continue designing regex patterns until realised there are incomplete… 

    … lines
    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    d1910b3 View commit details
    Browse the repository at this point in the history

  3. Function to merge lines that end in ampersand

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    523cfe9 View commit details
    Browse the repository at this point in the history

  4. Merge comma-continued lines from Bmad lattice files

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    2838a01 View commit details
    Browse the repository at this point in the history

  5. Figured out pattern matches for different types of lines

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    5cf78bf View commit details
    Browse the repository at this point in the history

  6. Prototype basic parsing (no logic) into dictionaries

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    0fe6a00 View commit details
    Browse the repository at this point in the history

  7. Probably match all types of lines to functions that understand them

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a319edd View commit details
    Browse the repository at this point in the history

  8. Make sure the Bmad conversion module is visible

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    e695adf View commit details
    Browse the repository at this point in the history

  9. Commit before switching back to first evaluating elements as dictiona… 

    …ries
    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    3940642 View commit details
    Browse the repository at this point in the history

  10. Prototype fully parses (not necesarily correctly)

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    4a096dd View commit details
    Browse the repository at this point in the history

  11. Example test of parsed context

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    109750c View commit details
    Browse the repository at this point in the history

  12. Integrate prototyped parsing

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    8806b00 View commit details
    Browse the repository at this point in the history

  13. Integrate full parsing code

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    c55990e View commit details
    Browse the repository at this point in the history

  14. Prototype first part of conversion

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    09ed77a View commit details
    Browse the repository at this point in the history

  15. Rename Monitor to Marker

    @jank324
    jank324 committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    80443df View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Prototype obviosu conversions of elements

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    61c075e View commit details
    Browse the repository at this point in the history

  2. Implement flattening of segments with subsegments

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    2a43bf6 View commit details
    Browse the repository at this point in the history

  3. Fix Solenoid __repr__

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    491ada6 View commit details
    Browse the repository at this point in the history

  4. Implement kicker conversion

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    c4c8076 View commit details
    Browse the repository at this point in the history

  5. Rename Bmad adapter source file

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    35a979b View commit details
    Browse the repository at this point in the history

  6. Fix x_limit and y_limit on collimators being parsed as limit

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    1c9b04d View commit details
    Browse the repository at this point in the history

  7. Implement conversion of collimators

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    23d141f View commit details
    Browse the repository at this point in the history

  8. Prototype undulator/wiggler conversion

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    39db6d9 View commit details
    Browse the repository at this point in the history

  9. Add dummy translation for patch elements

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    59e56e8 View commit details
    Browse the repository at this point in the history

  10. Integrate prototyped Bmad conversion functions

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    bf4b208 View commit details
    Browse the repository at this point in the history

  11. Silence flake8 warning on regex patterns

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    959c082 View commit details
    Browse the repository at this point in the history

  12. Integrate full lattice conversion code from prototype

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    3e2fec3 View commit details
    Browse the repository at this point in the history

  13. Add convenience method to Segment class

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    56d4b6f View commit details
    Browse the repository at this point in the history

  14. Fix failing Monitor/Marker tests

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    33acbda View commit details
    Browse the repository at this point in the history

  15. Fix flake8 warning

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    529988f View commit details
    Browse the repository at this point in the history

  16. Implement sband conversion

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    85c5d9b View commit details
    Browse the repository at this point in the history

  17. Enforce that elements have a plot method

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    99d91c8 View commit details
    Browse the repository at this point in the history

  18. Remove grid from lattice plot

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f801c45 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' into 64-read-bmad-lattices

    @jank324
    jank324 authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    528f145 View commit details
    Browse the repository at this point in the history

  20. Add bmad conversion source file to docs

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    563784b View commit details
    Browse the repository at this point in the history

  21. Implement twiss parameter over s plot

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    4b0a662 View commit details
    Browse the repository at this point in the history

  22. Add missing type annotations

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    4bb0d4e View commit details
    Browse the repository at this point in the history

  23. Add tilt to quadrupole __repr__

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8759b74 View commit details
    Browse the repository at this point in the history

  24. Fix tensor dimension error for titlted quads

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    9dd9663 View commit details
    Browse the repository at this point in the history

  25. Fix dontbmad docs

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    2e5a861 View commit details
    Browse the repository at this point in the history

  26. Test conversion of Bmad Tao tutorial lattice

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    bd0c4a3 View commit details
    Browse the repository at this point in the history

  27. Dipole __repr__ match property names

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    4e4c04f View commit details
    Browse the repository at this point in the history

  28. Tests comparing RBend and SBend to Ocelot

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f09e1f5 View commit details
    Browse the repository at this point in the history

  29. Add test that catches cavity fault

    @jank324
    jank324 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    dcbccf6 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Create docstring for base_rmatrix function

    @jank324
    jank324 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    0e0eed4 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. First test implementation of Cavity cpoied from Ocelot

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    8b04082 View commit details
    Browse the repository at this point in the history

  2. Remove Cavity transfer matrix test

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    c169630 View commit details
    Browse the repository at this point in the history

  3. Remove duplicate definition of __call__

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    979bdd2 View commit details
    Browse the repository at this point in the history

  4. Fix typo

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    90bb79d View commit details
    Browse the repository at this point in the history

  5. Design test for Cavity that compares to Ocelot and also matches Bmad

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    5e825bd View commit details
    Browse the repository at this point in the history

  6. Fix cavity test

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    1127f7c View commit details
    Browse the repository at this point in the history

  7. Return empty particle beam if no particles left

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    0ef0c07 View commit details
    Browse the repository at this point in the history

  8. Implement cavity for parameter beam

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    6faa30b View commit details
    Browse the repository at this point in the history

  9. Better test file name

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    bbcb1f9 View commit details
    Browse the repository at this point in the history

  10. Compare more properties of the beams

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    c7be520 View commit details
    Browse the repository at this point in the history

  11. Add beam type comparison tests for some "trusted" elements

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    5931d9c View commit details
    Browse the repository at this point in the history

  12. Correctly translate cavity parameters from Bmad

    @jank324
    jank324 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    3e0e9ab View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2023

  1. Fix beam type comparison tests for cavity

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    d9805cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 64-read-bmad-lattices

    @jank324
    jank324 authored Sep 9, 2023
    Configuration menu
    Copy the full SHA
    134c48f View commit details
    Browse the repository at this point in the history

  3. Reduce sporadic test failures

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    1df50d7 View commit details
    Browse the repository at this point in the history

  4. Fix cavity phase unit in Bmad conversion

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    190c6b2 View commit details
    Browse the repository at this point in the history

  5. Compare cavity with phase not equal zero to Ocelot

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    837a85f View commit details
    Browse the repository at this point in the history

  6. Tests if LCLS project can be done without cavity fix

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    fcf7494 View commit details
    Browse the repository at this point in the history

  7. Test changing phase for original cavity test example

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    3cb3c5c View commit details
    Browse the repository at this point in the history

  8. Play around comparing both beam types throug cavity elements

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    5085299 View commit details
    Browse the repository at this point in the history

  9. Consolidate cavity beam type tracking methods into one

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    d502715 View commit details
    Browse the repository at this point in the history

  10. Fix all but sigma_p of ParameterBeam through cavity

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    52718d9 View commit details
    Browse the repository at this point in the history

  11. Force split method implementation

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    6d1cdf0 View commit details
    Browse the repository at this point in the history

  12. Add more split tests

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    d9d23d7 View commit details
    Browse the repository at this point in the history

  13. Address duplicate name issue

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    6175c3a View commit details
    Browse the repository at this point in the history

  14. Remove and cleanup dataclasses

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    40ce4d0 View commit details
    Browse the repository at this point in the history

  15. Further testing when skipping cavity for the time being

    @jank324
    jank324 committed Sep 9, 2023
    Configuration menu
    Copy the full SHA
    26a88c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Scans over cavity parameters to find issue

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    93fe74d View commit details
    Browse the repository at this point in the history

  2. Use degree radians conversion function instead of doing it by hand

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    eddbb03 View commit details
    Browse the repository at this point in the history

  3. Fix indentation

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    5d1782c View commit details
    Browse the repository at this point in the history

  4. Fix "break" in voltage scan

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    60ab6e8 View commit details
    Browse the repository at this point in the history

  5. Fix plotting cheetah beams as ocelot

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    cd4ba1b View commit details
    Browse the repository at this point in the history

  6. Use torch for deg2rad

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    249aa21 View commit details
    Browse the repository at this point in the history

  7. Fix mistakenly removed cos

    @jank324
    jank324 committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    940dbcc View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Fix incoming beam used by Ocelot experiment

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    be96a03 View commit details
    Browse the repository at this point in the history

  2. Fix Bmad values for length scan

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7a4c5b0 View commit details
    Browse the repository at this point in the history

  3. Test minimal working example of LCLS cavity

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    ede5149 View commit details
    Browse the repository at this point in the history

  4. Remove debugging print statements

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    a87bbd6 View commit details
    Browse the repository at this point in the history

  5. Fix sporadic test failure due to too small tolerance

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    ffe972c View commit details
    Browse the repository at this point in the history

  6. Remove test notebook

    @jank324
    jank324 committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    501d113 View commit details
    Browse the repository at this point in the history