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

Cz flux arc fix #497

Merged
merged 27 commits into from
Aug 30, 2018
Merged

Cz flux arc fix #497

merged 27 commits into from
Aug 30, 2018

Commits on Aug 28, 2018

  1. Redefining martinis pulse in terms of freqs and anharmoninicties

    FKMalino committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    bf0de42 View commit details
    Browse the repository at this point in the history

  2. Revert "Redefining martinis pulse in terms of freqs and anharmoninict… 

    …ies"

This reverts commit bf0de42.
    FKMalino committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    cfe9c4d View commit details
    Browse the repository at this point in the history

  3. Revert "Revert "Redefining martinis pulse in terms of freqs and anhar… 

    …moninicties""

This reverts commit cfe9c4d.
    FKMalino committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    da6104a View commit details
    Browse the repository at this point in the history

  4. Changes to plotting

    FKMalino committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    79ad9c7 View commit details
    Browse the repository at this point in the history

  5. new martinis flux pulse rewrite

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    b271701 View commit details
    Browse the repository at this point in the history

  6. added test for eps theta conversion and removed old code

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    40c54be View commit details
    Browse the repository at this point in the history

  7. added checks for theta_initial and theta_f check in CZ waveform

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    917fb8e View commit details
    Browse the repository at this point in the history

  8. reverted changes to flux lutman

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    26ca2c6 View commit details
    Browse the repository at this point in the history

  9. split tests of fluxlutman and mwlutman

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    c83d17c View commit details
    Browse the repository at this point in the history

  10. basic levels integrated in flux lutman

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    20ba51e View commit details
    Browse the repository at this point in the history

  11. basic plotting of levels in flux lutman

    @AdriaanRol
    AdriaanRol committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    42825cc View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. set up known failures before fixing tests in CZ flux arc

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    b539134 View commit details
    Browse the repository at this point in the history

  2. added tests and fixed bugs for frequency conversion

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    3c4855f View commit details
    Browse the repository at this point in the history

  3. added method to calculate detuning between levels

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    c08f589 View commit details
    Browse the repository at this point in the history

  4. added tests for calculating detuning

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    9ba0dd6 View commit details
    Browse the repository at this point in the history

  5. deleted very old qumis based qwg lutman and tests

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    17a2244 View commit details
    Browse the repository at this point in the history

  6. restored the CZ waveform, need to add tests

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    7562c5c View commit details
    Browse the repository at this point in the history

  7. restored double sided and added some comments

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    534e10f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into CZ_flux_arc_fix

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    503c9f9 View commit details
    Browse the repository at this point in the history

  9. added plot_level_diagrams

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    6e9f0b6 View commit details
    Browse the repository at this point in the history

  10. added method to plot CZ trajectory for debugging

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    5c123f1 View commit details
    Browse the repository at this point in the history

  11. added beginning of lenght ratio calculation

    @AdriaanRol
    AdriaanRol committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    15415e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. added auto calculation option for CZ lenght ratio

    @AdriaanRol
    AdriaanRol committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    eea57bf View commit details
    Browse the repository at this point in the history

  2. bug found and fixed in waveforms_flux 

    it was wrong the integration step to convert from virtual time to physical time
    @fbattistel
    fbattistel committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    d6fd312 View commit details
    Browse the repository at this point in the history

  3. cleaned up some and added more tests

    @AdriaanRol
    AdriaanRol committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    47582b0 View commit details
    Browse the repository at this point in the history

  4. removed martinis pulse from conventional tek sequences

    @AdriaanRol
    AdriaanRol committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    ab2b291 View commit details
    Browse the repository at this point in the history

  5. ...

    @AdriaanRol
    AdriaanRol committed Aug 30, 2018
    Configuration menu
    Copy the full SHA
    473feab View commit details
    Browse the repository at this point in the history