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

Generalized thin combine function (don't merge) #827

Merged
merged 11 commits into from Oct 21, 2019
Merged

Generalized thin combine function (don't merge) #827

merged 11 commits into from Oct 21, 2019

Commits on Sep 23, 2019

  1. Towards thin cf

    tobias committed Sep 23, 2019
    Configuration menu
    Copy the full SHA
    46443b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Not pretty but seems to give the correct results.

    tobias committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    f8f3bda View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2019

  1. Merge branch 'master' of github.com:MethodicalAcceleratorDesign/MAD-X… 

    … into cf_generalized
    tobias committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    1f41216 View commit details
    Browse the repository at this point in the history

  2. Update twiss and trrun.

    tobias committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    8e07713 View commit details
    Browse the repository at this point in the history

  3. Cleanup.

    tobias committed Sep 30, 2019
    Configuration menu
    Copy the full SHA
    c18f657 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2019

  1. Also implemneted the old.

    tobias committed Oct 14, 2019
    Configuration menu
    Copy the full SHA
    cff0071 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2019

  1. just remove print

    tobias committed Oct 17, 2019
    Configuration menu
    Copy the full SHA
    194d45b View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Twiss seems to be working fine now.

    tobias committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    309c655 View commit details
    Browse the repository at this point in the history

  2. Tracking seems ok now as well.

    tobias committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    9f84c7b View commit details
    Browse the repository at this point in the history

  3. Adding a test.

    tobias committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    716fdd4 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge branch 'master' into cf_generalized

    tobias committed Oct 21, 2019
    Configuration menu
    Copy the full SHA
    d664b44 View commit details
    Browse the repository at this point in the history