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

Add markers #59

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open

Add markers #59

wants to merge 27 commits into from

Commits on May 26, 2020

  1. - Updated schema.json to include marker 

    - Updated tests to check if all tests pass when adding marker - all tests pass
    @tomerten
    tomerten committed May 26, 2020
    Configuration menu
    Copy the full SHA
    dea69fa View commit details
    Browse the repository at this point in the history

  2. Automated Code Formatting using Black

    @felix-andreas
    felix-andreas committed May 26, 2020
    Configuration menu
    Copy the full SHA
    929b570 View commit details
    Browse the repository at this point in the history

  3. add newline to end of file

    @felix-andreas
    felix-andreas authored May 26, 2020
    Configuration menu
    Copy the full SHA
    e554b78 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge branch 'master' into add-markers-tom

    @felix-andreas
    felix-andreas authored May 28, 2020
    Configuration menu
    Copy the full SHA
    7ef86a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. add space to end of file

    @felix-andreas
    felix-andreas authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    b0e15da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add-markers-tom' of https://github.com/nobeam/latticejson… 

    … into add-markers-tom
    @tomerten
    tomerten committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    c83d039 View commit details
    Browse the repository at this point in the history

  3. - updated example.json in test to include monitor

    @tomerten
    tomerten committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    4fdc191 View commit details
    Browse the repository at this point in the history

  4. Delete README.txt

    @felix-andreas
    felix-andreas authored Jul 2, 2020
    Configuration menu
    Copy the full SHA
    4f06242 View commit details
    Browse the repository at this point in the history

  5. - added Monitor

    Tom Mertens committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    3799c08 View commit details
    Browse the repository at this point in the history

  6. - added marker to tests

    Tom Mertens committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    aa9d286 View commit details
    Browse the repository at this point in the history

  7. - updated version number in examplewq

    @tomerten
    tomerten committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    b7f1751 View commit details
    Browse the repository at this point in the history

  8. - added Hcor and Vcor

    Tom Mertens committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    6bf5031 View commit details
    Browse the repository at this point in the history

  9. - corrected typo in schema.json

    Tom Mertens committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    03f5c82 View commit details
    Browse the repository at this point in the history

  10. - corrected Kick to kick in hcor and vcor

    Tom Mertens committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    327d0b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Automated Code Formatting using Black

    @felix-andreas
    felix-andreas committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    f1279c0 View commit details
    Browse the repository at this point in the history

  2. - added kicker (non linear kicker in lattice) 

    - updated tests
- corrected version in test_undefined
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    71d7c6a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'add-markers-tom' of https://github.com/nobeam/latticejson… 

    … into add-markers-tom
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    9188328 View commit details
    Browse the repository at this point in the history

  4. - cavity removed voltage from being required both madx and elegant have 

    a default value so it is not mandatory
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    739de83 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'add-markers-tom' of https://github.com/nobeam/latticejson… 

    … into add-markers-tom
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    bcca405 View commit details
    Browse the repository at this point in the history

  6. - Working version 

    - Needed updating test file for cavities: f -> frequency
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    9eaeabe View commit details
    Browse the repository at this point in the history

  7. - added k1 to dipoles in order to be able to convert Ji-Gwuang his 

    lattice
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    5deb2f6 View commit details
    Browse the repository at this point in the history

  8. Automated Code Formatting using Black

    @felix-andreas
    felix-andreas committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    6b69c50 View commit details
    Browse the repository at this point in the history

  9. * updated schema to include multipole for converting maxiv lattice 

    * updated parse to deal with array values
* updated test example
* tested maxiv madx and elegant conversion both worked but result in
different json files
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    589fba7 View commit details
    Browse the repository at this point in the history

  10. - moved array to madx transformer 

    - removed min value from schema for length, SLS has negativ drifts
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    5b9c651 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'add-markers-tom' of https://github.com/nobeam/latticejson… 

    … into add-markers-tom
    Tom Mertens committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    b9ac171 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. added various attrs for dipole kicker and cavity

    Tom Mertens committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    37da071 View commit details
    Browse the repository at this point in the history

  2. Automated Code Formatting using Black

    @felix-andreas
    felix-andreas committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    4fc9b2d View commit details
    Browse the repository at this point in the history