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

Feature/Measurement loop #4074

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

Feature/Measurement loop #4074

wants to merge 167 commits into from

Commits on Feb 25, 2022

  1. keysight issue

    @nulinspiratie
    nulinspiratie committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    6b9475d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'origin/master'

    @nulinspiratie
    nulinspiratie committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    8b384bf View commit details
    Browse the repository at this point in the history

  3. Auto stash before merge of "master" and "origin/master"

    @nulinspiratie
    nulinspiratie committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    bfc330e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/monitor-upgrade'

    @nulinspiratie
    nulinspiratie committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    4faaf95 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2022

  1. monitor message

    @nulinspiratie
    nulinspiratie committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    a6acead View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/monitor-upgrade'

    @nulinspiratie
    nulinspiratie committed Mar 6, 2022
    Configuration menu
    Copy the full SHA
    8116751 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. Merge remote-tracking branch 'origin/master'

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    ab523df View commit details
    Browse the repository at this point in the history

  2. fix: ensure keyboardinterrupt doesn't interrupt visa command

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    88757c2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bug/qdac-keyboardinterrupt'

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    16d79a6 View commit details
    Browse the repository at this point in the history

  4. Begun incorporating measurement loop

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    ffb444b View commit details
    Browse the repository at this point in the history

  5. Begun incorporating measurement loop

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    89d6ed3 View commit details
    Browse the repository at this point in the history

  6. Added DataHandler, DatasetHandler

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    4f43aed View commit details
    Browse the repository at this point in the history

  7. Fixed Sweep

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    60a1d8c View commit details
    Browse the repository at this point in the history

  8. Gone through entire file, but needs testing

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    0f1cab0 View commit details
    Browse the repository at this point in the history

  9. creating tests for measurement loop

    @nulinspiratie
    nulinspiratie committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    575ede2 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2022

  1. working 1d and 2d datasets

    @nulinspiratie
    nulinspiratie committed Apr 3, 2022
    Configuration menu
    Copy the full SHA
    1f0171b View commit details
    Browse the repository at this point in the history

  2. basic 1d and 2d tests are working!

    @nulinspiratie
    nulinspiratie committed Apr 3, 2022
    Configuration menu
    Copy the full SHA
    5755686 View commit details
    Browse the repository at this point in the history

  3. initializes dataset on second iteration of first sweep

    @nulinspiratie
    nulinspiratie committed Apr 3, 2022
    Configuration menu
    Copy the full SHA
    a2852de View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge branch 'feature/measurement-loop'

    @nulinspiratie
    nulinspiratie committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    32aac38 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    124e550 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. merge

    @nulinspiratie
    nulinspiratie committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    47beddd View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    f7e7a4d View commit details
    Browse the repository at this point in the history

  3. Implemented incremental adding of parameters

    @nulinspiratie
    nulinspiratie committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    7e80e47 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feature/measurement-loop

    @nulinspiratie
    nulinspiratie committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    8aa2742 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    dbe5fcd View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Merge remote-tracking branch 'origin/bug/qdac-keyboardinterrupt'

    The Beefy One v2 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    a029767 View commit details
    Browse the repository at this point in the history

  2. fix: Update data cache

    @nulinspiratie
    nulinspiratie committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    64468a6 View commit details
    Browse the repository at this point in the history

  3. test nested measurement and no_parameter

    @nulinspiratie
    nulinspiratie committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    39ccc0b View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    afc0a94 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge remote-tracking branch 'origin/master'

    The Beefy One v2 committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    c3ff94e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'sydney-fork/feature/measurement-loop'

    @nulinspiratie
    nulinspiratie committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    8fa68f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2022

  1. Merge remote-tracking branch 'origin/master'

    The Beefy One v2 committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    3fab4c8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'microsoft/master'

    @nulinspiratie
    nulinspiratie committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    785031e View commit details
    Browse the repository at this point in the history

Commits on May 3, 2022

  1. Merge remote-tracking branch 'nulinspiratie/master'

    The Beefy One v2 committed May 3, 2022
    Configuration menu
    Copy the full SHA
    9398f1d View commit details
    Browse the repository at this point in the history

  2. add Measurement.enteractions

    The Beefy One v2 committed May 3, 2022
    Configuration menu
    Copy the full SHA
    c3ffca3 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Add repetitionSweep

    @nulinspiratie
    nulinspiratie committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    8b49145 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    e1ea91c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

    The Beefy One committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    877d4e3 View commit details
    Browse the repository at this point in the history

  4. minor bugfixes

    The Beefy One committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    b4f57e1 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    dfb7085 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/measurement-loop'

    The Beefy One committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    4185e55 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. upgrading Sweep

    @nulinspiratie
    nulinspiratie committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    9326822 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. upgrading sweep

    @nulinspiratie
    nulinspiratie committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    431d753 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Nearly finished with Sweep

    @nulinspiratie
    nulinspiratie committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    2ab4566 View commit details
    Browse the repository at this point in the history

  2. Started adding tests for Sweep

    @nulinspiratie
    nulinspiratie committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    013e3aa View commit details
    Browse the repository at this point in the history

  3. fixed tests

    @nulinspiratie
    nulinspiratie committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e648ad6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'external/master' into feature/measureme… 

    …nt-loop
    @nulinspiratie
    nulinspiratie committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    a4b1720 View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    d4e18c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Wrote ~2/3 of MeasurementLoop tutorial

    @nulinspiratie
    nulinspiratie committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    ae0ee84 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'old-qcodes/feature/measurement-loop' in… 

    …to feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    7627398 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. finished tutorial

    @nulinspiratie
    nulinspiratie committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    783c48d View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2022

  1. slightly improve sweep execution

    @nulinspiratie
    nulinspiratie committed Aug 4, 2022
    Configuration menu
    Copy the full SHA
    06cd4d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Merge branch 'feature/measurement-loop'

    The Beefy One committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    73cc680 View commit details
    Browse the repository at this point in the history

  2. Forgot to add self as sweep in Sweep.execute

    The Beefy One committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    f441802 View commit details
    Browse the repository at this point in the history

  3. fixed issue with self-referencing type-hint

    The Beefy One committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    24f5da3 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    14a2835 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

    The Beefy One committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    1afa7d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Added MeasurementLoop, Sweep to qcodes.dataset

    @nulinspiratie
    nulinspiratie committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    3b9359a View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. BaseSweep is subclass of AbstractSweep

    @nulinspiratie
    nulinspiratie committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    b661605 View commit details
    Browse the repository at this point in the history

  2. fixed bugs of BaseSweep

    @nulinspiratie
    nulinspiratie committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    71795d4 View commit details
    Browse the repository at this point in the history

  3. Add args to sweep.execute

    @nulinspiratie
    nulinspiratie committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    8f165d9 View commit details
    Browse the repository at this point in the history

  4. fix: all tests working again

    @nulinspiratie
    nulinspiratie committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    744901f View commit details
    Browse the repository at this point in the history

  5. add some basic tests

    @nulinspiratie
    nulinspiratie committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    f6a2b09 View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    4916697 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. add len(sweep)

    @nulinspiratie
    nulinspiratie committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    b4b5384 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

    The Beefy One committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    3bdda68 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. improve database for tests

    @nulinspiratie
    nulinspiratie committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    384d0e1 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    da536ef View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Apply pep8 formatting to code

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    9d38998 View commit details
    Browse the repository at this point in the history

  2. Added type hints

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    c5180a5 View commit details
    Browse the repository at this point in the history

  3. fix public api imports

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    79c5cc9 View commit details
    Browse the repository at this point in the history

  4. attempting fix of keysight __init__.py

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    ea1be0f View commit details
    Browse the repository at this point in the history

  5. added newline after keysight/__init__.py

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    513ca14 View commit details
    Browse the repository at this point in the history

  6. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    e05a82e View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'QCoDeS-CPH/master' into feature/measure… 

    …ment-loop
    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    6da094d View commit details
    Browse the repository at this point in the history

  8. added _BaseParameter import

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    fa85657 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop'… 

    … into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    e3eebce View commit details
    Browse the repository at this point in the history

  10. Changed to double-quotes

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    1fcab47 View commit details
    Browse the repository at this point in the history

  11. load Measurement before MeasurementLoop

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    74ea45a View commit details
    Browse the repository at this point in the history

  12. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    f50595d View commit details
    Browse the repository at this point in the history

  13. Fixing circular imports

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    c15cd8a View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop'… 

    … into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    beb66ab View commit details
    Browse the repository at this point in the history

  15. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    f984c26 View commit details
    Browse the repository at this point in the history

  16. wrote all the documentation for measurement_loop.py

    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    30859f8 View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop'… 

    … into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    0d3ae37 View commit details
    Browse the repository at this point in the history

  18. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    8345ad9 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. fix typo

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    1fa5df8 View commit details
    Browse the repository at this point in the history

  2. applied pep styling

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    c40c771 View commit details
    Browse the repository at this point in the history

  3. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    deb0a12 View commit details
    Browse the repository at this point in the history

  4. fix pytest error

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    b9519df View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/measurement-loop' of https://github.com/nulinsp… 

    …iratie/Qcodes into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    927ede2 View commit details
    Browse the repository at this point in the history

  6. second round of pep fixes

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    70e0896 View commit details
    Browse the repository at this point in the history

  7. typing fixes

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    369c5dc View commit details
    Browse the repository at this point in the history

  8. return self in MeasurementLoop context manager

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    54d9297 View commit details
    Browse the repository at this point in the history

  9. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    ae10757 View commit details
    Browse the repository at this point in the history

  10. Fixed last pep issue?

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    66a7a63 View commit details
    Browse the repository at this point in the history

  11. Fixing Keysight capitalization issue

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    800f0f6 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'feature/measurement-loop' of https://github.com/nulinsp… 

    …iratie/Qcodes into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    c671d12 View commit details
    Browse the repository at this point in the history

  13. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    f1f2067 View commit details
    Browse the repository at this point in the history

  14. Delete __init__.py

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    74596eb View commit details
    Browse the repository at this point in the history

  15. fixing pytest issues

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    33cac93 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feature/measurement-loop' of https://github.com/nulinsp… 

    …iratie/Qcodes into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    d13aaf3 View commit details
    Browse the repository at this point in the history

  17. Fixing pytest issues

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    ae78eed View commit details
    Browse the repository at this point in the history

  18. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    93027b9 View commit details
    Browse the repository at this point in the history

  19. missing double quote

    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    9c587e5 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'feature/measurement-loop' of https://github.com/nulinsp… 

    …iratie/Qcodes into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    d8eee70 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. allow linsweep in MeasurementLoop

    @nulinspiratie
    nulinspiratie committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    e099071 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    448acc0 View commit details
    Browse the repository at this point in the history

  3. fix type errors

    @nulinspiratie
    nulinspiratie committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    16c7f09 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop'… 

    … into feature/measurement-loop
    @nulinspiratie
    nulinspiratie committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    bad167c View commit details
    Browse the repository at this point in the history

  5. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    3d85b55 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2022

  1. fraction complete working for basic example

    @nulinspiratie
    nulinspiratie committed Sep 20, 2022
    Configuration menu
    Copy the full SHA
    b2e0537 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. round fraction_complete

    @nulinspiratie
    nulinspiratie committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    4711f6f View commit details
    Browse the repository at this point in the history

  2. add test fraction complete

    @nulinspiratie
    nulinspiratie committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    b2c1997 View commit details
    Browse the repository at this point in the history

  3. Working progress bars

    @nulinspiratie
    nulinspiratie committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    258c1d4 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2022

  1. Don't show progress bar by default

    @nulinspiratie
    nulinspiratie committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    6e057a8 View commit details
    Browse the repository at this point in the history

  2. Catch any progress bar errors

    @nulinspiratie
    nulinspiratie committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    85131d4 View commit details
    Browse the repository at this point in the history

  3. add plot functionality to Sweep.execute

    @nulinspiratie
    nulinspiratie committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    02faed5 View commit details
    Browse the repository at this point in the history

  4. Perform sweep using Sweep(*args)()

    @nulinspiratie
    nulinspiratie committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    248e41b View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Merge branch 'feature/measurement-loop-percentage' into feature/measu… 

    …rement-loop
    @nulinspiratie
    nulinspiratie committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    02b2cdd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'QCoDeS-CPH/master' into feature/measure… 

    …ment-loop
    @nulinspiratie
    nulinspiratie committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    bdd3b00 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

    @nulinspiratie
    nulinspiratie committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    06bea97 View commit details
    Browse the repository at this point in the history

  4. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    8385b9c View commit details
    Browse the repository at this point in the history

  5. override parameter.sweep

    @nulinspiratie
    nulinspiratie committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    9d83dab View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/parameter-sweep'

    @nulinspiratie
    nulinspiratie committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    007ec03 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. mistakenly added multiple sweeps

    The Beefy One committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    15029a8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/measurement-loop' into feature/parameter-sweep

    The Beefy One committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    997e136 View commit details
    Browse the repository at this point in the history

  3. fix in parameter sweep

    The Beefy One committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    611e7a7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/parameter-sweep'

    The Beefy One committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    7f8468d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Add Exception to except

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    2106278 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/measurement-loop

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    e2d2a56 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/measurement-loop' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    698e205 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix/snapshot-exception' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    9e7f4fe View commit details
    Browse the repository at this point in the history

  5. Convert None to NaN so it doesn't raise an error

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    8356937 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/measurement-loop' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    d8ae7b5 View commit details
    Browse the repository at this point in the history

  7. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    cf7af50 View commit details
    Browse the repository at this point in the history

  8. minor fix to masking/unmasking

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    ecea839 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'feature/measurement-loop' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    a754ba8 View commit details
    Browse the repository at this point in the history

  10. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    67d969c View commit details
    Browse the repository at this point in the history

  11. reverting tqdm

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    c9400b1 View commit details
    Browse the repository at this point in the history

  12. Fix plot function

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    3ced8d8 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'feature/measurement-loop' into feature/parameter-sweep

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    66d54c9 View commit details
    Browse the repository at this point in the history

  14. better plotting logic

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    147b983 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'feature/measurement-loop' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    aaa834b View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feature/parameter-sweep' into master-msmt_pc

    The Beefy One committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    d0126b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. show plot after sweep

    @nulinspiratie
    nulinspiratie committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    1dca9e8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/parameter-sweep'

    @nulinspiratie
    nulinspiratie committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    fb2db63 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. remove sweep stop arg 

    it can cause mistakes
    @nulinspiratie
    nulinspiratie committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    ad7db8d View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. ignore num when step is given

    The Beefy One committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    3eecb6c View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2022

  1. fix step + num

    The Beefy One committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    dbcc850 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2022

  1. include metadata

    @nulinspiratie
    nulinspiratie committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    bf61df7 View commit details
    Browse the repository at this point in the history

  2. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Nov 15, 2022
    Configuration menu
    Copy the full SHA
    0ad7dad View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. begun adding measurement loop array

    @nulinspiratie
    nulinspiratie committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    a29ff55 View commit details
    Browse the repository at this point in the history

  2. fixed mistaken test

    @nulinspiratie
    nulinspiratie committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    391b5d5 View commit details
    Browse the repository at this point in the history

  3. ran through first test without errors

    @nulinspiratie
    nulinspiratie committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    a7a45a9 View commit details
    Browse the repository at this point in the history

  4. measuring arrays works

    @nulinspiratie
    nulinspiratie committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    a9020ef View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/measurement-loop-array' into feature/measuremen… 

    …t-loop
    @nulinspiratie
    nulinspiratie committed Dec 6, 2022
    Configuration menu
    Copy the full SHA
    248c48c View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. don't show more than one tqdm progress bar

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    f1f1516 View commit details
    Browse the repository at this point in the history

  2. minor fix for measuring arrays

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    f7fe1c3 View commit details
    Browse the repository at this point in the history

  3. bug in unmasking

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    6dad7e6 View commit details
    Browse the repository at this point in the history

  4. Allow sweep without name

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    ed1cb20 View commit details
    Browse the repository at this point in the history

  5. Fix unmasking of sweep in msmt

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    cd950df View commit details
    Browse the repository at this point in the history

  6. add Iterate

    @nulinspiratie
    nulinspiratie committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    4dd77cb View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2022

  1. Add N-dimensional array support

    @nulinspiratie
    nulinspiratie committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    9c34a28 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2022

  1. improvements to config

    The Beefy One committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    b79b2b5 View commit details
    Browse the repository at this point in the history

  2. verification improvements

    The Beefy One committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    54aad18 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. add thread functionality

    The Beefy One committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    6300b17 View commit details
    Browse the repository at this point in the history