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

Array id names #197

Closed
wants to merge 10 commits into from
Closed

Array id names #197

wants to merge 10 commits into from

Commits on May 26, 2016

  1. add instrument_name to array_ids to reduce amount of unexpected aut… 

    …ogenerated ids.
    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    96aa98c View commit details
    Browse the repository at this point in the history

  2. fix: add set and instrument name to the relevant data arrays

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    bd6f9c8 View commit details
    Browse the repository at this point in the history

  3. fix: Remove obsolete files

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    67e01ac View commit details
    Browse the repository at this point in the history

  4. fix: small bugfix

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    6ba6d1b View commit details
    Browse the repository at this point in the history

  5. update: notebooks

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    ae5315e View commit details
    Browse the repository at this point in the history

  6. fix: adjust toymodel to work with the expanded array_ids

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    e3ebe20 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into array_id_names

    Triton1 committed May 26, 2016
    Configuration menu
    Copy the full SHA
    ac9d86d View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. update: notebook

    Merlin committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    a24624f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'array_id_names' of https://github.com/qdev-dk/Qcodes in… 

    …to array_id_names
    Merlin committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    b255b29 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/qdev-dk/Qcodes into array… 

    …_id_names

# Conflicts:
#	qcodes/tests/test_loop.py
    Merlin committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    3d7d034 View commit details
    Browse the repository at this point in the history