Code

Feature/Measurement loop#4074

Code

Open

nulinspiratie wants to merge 167 commits intomicrosoft:mainmicrosoft/Qcodes:mainfrom nulinspiratie:feature/measurement-loopnulinspiratie/Qcodes:feature/measurement-loopCopy head branch name to clipboard

+4,675-53

Commits

Commits on Feb 25, 2022

• keysight issue

  nulinspiratie

  committed
  6b9475d

• Merge branch 'origin/master'

  nulinspiratie

  committed
  8b384bf

• Auto stash before merge of "master" and "origin/master"

  nulinspiratie

  committed
  bfc330e

• Merge branch 'feature/monitor-upgrade'

  nulinspiratie

  committed
  4faaf95

Commits on Mar 6, 2022

• monitor message

  nulinspiratie

  committed
  a6acead

• Merge branch 'feature/monitor-upgrade'

  nulinspiratie

  committed
  8116751

Commits on Apr 2, 2022

• Merge remote-tracking branch 'origin/master'

  nulinspiratie

  committed
  ab523df

• fix: ensure keyboardinterrupt doesn't interrupt visa command

  nulinspiratie

  committed
  88757c2

• Merge branch 'bug/qdac-keyboardinterrupt'

  nulinspiratie

  committed
  16d79a6

• Begun incorporating measurement loop

  nulinspiratie

  committed
  ffb444b

• Begun incorporating measurement loop

  nulinspiratie

  committed
  89d6ed3

• Added DataHandler, DatasetHandler

  nulinspiratie

  committed
  4f43aed

• Fixed Sweep

  nulinspiratie

  committed
  60a1d8c

• Gone through entire file, but needs testing

  nulinspiratie

  committed
  0f1cab0

• creating tests for measurement loop

  nulinspiratie

  committed
  575ede2

Commits on Apr 3, 2022

• working 1d and 2d datasets

  nulinspiratie

  committed
  1f0171b

• basic 1d and 2d tests are working!

  nulinspiratie

  committed
  5755686

• initializes dataset on second iteration of first sweep

  nulinspiratie

  committed
  a2852de

Commits on Apr 4, 2022

• Merge branch 'feature/measurement-loop'

  nulinspiratie

  committed
  32aac38

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

  Show description for 124e550
  pre-commit-ci[bot]

  committed
  124e550

Commits on Apr 5, 2022

• merge

  nulinspiratie

  committed
  47beddd

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

  Show description for f7e7a4d
  pre-commit-ci[bot]

  committed
  f7e7a4d

• Implemented incremental adding of parameters

  nulinspiratie

  committed
  7e80e47

• Merge branch 'master' into feature/measurement-loop

  nulinspiratie

  authored
  8aa2742

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

  Show description for dbe5fcd
  pre-commit-ci[bot]

  committed
  dbe5fcd

Commits on Apr 6, 2022

• Merge remote-tracking branch 'origin/bug/qdac-keyboardinterrupt'

  

  The Beefy One v2

  committed
  a029767

• fix: Update data cache

  nulinspiratie

  committed
  64468a6

• test nested measurement and no_parameter

  nulinspiratie

  committed
  39ccc0b

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

  Show description for afc0a94
  pre-commit-ci[bot]

  committed
  afc0a94

Commits on Apr 8, 2022

• Merge remote-tracking branch 'origin/master'

  

  The Beefy One v2

  committed
  c3ff94e

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

  nulinspiratie

  committed
  8fa68f1

Commits on Apr 23, 2022

• Merge remote-tracking branch 'origin/master'

  

  The Beefy One v2

  committed
  3fab4c8

• Merge remote-tracking branch 'microsoft/master'

  nulinspiratie

  committed
  785031e

Commits on May 3, 2022

• Merge remote-tracking branch 'nulinspiratie/master'

  

  The Beefy One v2

  committed
  9398f1d

• add Measurement.enteractions

  

  The Beefy One v2

  committed
  c3ffca3

Commits on Jun 20, 2022

• Add repetitionSweep

  nulinspiratie

  committed
  8b49145

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

  Show description for e1ea91c
  pre-commit-ci[bot]

  committed
  e1ea91c

• Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

  

  The Beefy One

  committed
  877d4e3

• minor bugfixes

  

  The Beefy One

  committed
  b4f57e1

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

  Show description for dfb7085
  pre-commit-ci[bot]

  committed
  dfb7085

• Merge branch 'feature/measurement-loop'

  

  The Beefy One

  committed
  4185e55

Commits on Jul 20, 2022

• upgrading Sweep

  nulinspiratie

  committed
  9326822

Commits on Jul 29, 2022

• upgrading sweep

  nulinspiratie

  committed
  431d753

Commits on Aug 1, 2022

• Nearly finished with Sweep

  nulinspiratie

  committed
  2ab4566

• Started adding tests for Sweep

  nulinspiratie

  committed
  013e3aa

• fixed tests

  nulinspiratie

  committed
  e648ad6

• Merge remote-tracking branch 'external/master' into feature/measurement-loop

  nulinspiratie

  committed
  a4b1720

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

  Show description for d4e18c1
  pre-commit-ci[bot]

  committed
  d4e18c1

Commits on Aug 2, 2022

• Wrote ~2/3 of MeasurementLoop tutorial

  nulinspiratie

  committed
  ae0ee84

• Merge remote-tracking branch 'old-qcodes/feature/measurement-loop' into feature/measurement-loop

  nulinspiratie

  committed
  7627398

Commits on Aug 3, 2022

• finished tutorial

  nulinspiratie

  committed
  783c48d

Commits on Aug 4, 2022

• slightly improve sweep execution

  nulinspiratie

  committed
  06cd4d8

Commits on Aug 5, 2022

• Merge branch 'feature/measurement-loop'

  

  The Beefy One

  committed
  73cc680

• Forgot to add self as sweep in Sweep.execute

  

  The Beefy One

  committed
  f441802

• fixed issue with self-referencing type-hint

  

  The Beefy One

  committed
  24f5da3

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

  Show description for 14a2835
  pre-commit-ci[bot]

  committed
  14a2835

• Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

  

  The Beefy One

  committed
  1afa7d8

Commits on Aug 9, 2022

• Added MeasurementLoop, Sweep to qcodes.dataset

  nulinspiratie

  committed
  3b9359a

Commits on Aug 10, 2022

• BaseSweep is subclass of AbstractSweep

  nulinspiratie

  committed
  b661605

• fixed bugs of BaseSweep

  nulinspiratie

  committed
  71795d4

• Add args to sweep.execute

  nulinspiratie

  committed
  8f165d9

• fix: all tests working again

  nulinspiratie

  committed
  744901f

• add some basic tests

  nulinspiratie

  committed
  f6a2b09

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

  Show description for 4916697
  pre-commit-ci[bot]

  committed
  4916697

Commits on Aug 15, 2022

• add len(sweep)

  nulinspiratie

  committed
  b4b5384

Commits on Aug 16, 2022

• Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

  

  The Beefy One

  committed
  3bdda68

Commits on Aug 21, 2022

• improve database for tests

  nulinspiratie

  committed
  384d0e1

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

  Show description for da536ef
  pre-commit-ci[bot]

  committed
  da536ef

Commits on Sep 13, 2022

• Apply pep8 formatting to code

  nulinspiratie

  committed
  9d38998

• Added type hints

  nulinspiratie

  committed
  c5180a5

• fix public api imports

  nulinspiratie

  committed
  79c5cc9

• attempting fix of keysight __init__.py

  nulinspiratie

  committed
  ea1be0f

• added newline after keysight/__init__.py

  nulinspiratie

  committed
  513ca14

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

  Show description for e05a82e
  pre-commit-ci[bot]

  committed
  e05a82e

• Merge remote-tracking branch 'QCoDeS-CPH/master' into feature/measurement-loop

  nulinspiratie

  committed
  6da094d

• added _BaseParameter import

  nulinspiratie

  committed
  fa85657

• Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop' into feature/measurement-loop

  nulinspiratie

  committed
  e3eebce

• Changed to double-quotes

  nulinspiratie

  committed
  1fcab47

• load Measurement before MeasurementLoop

  nulinspiratie

  committed
  74ea45a

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

  Show description for f50595d
  pre-commit-ci[bot]

  committed
  f50595d

• Fixing circular imports

  nulinspiratie

  committed
  c15cd8a

• Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop' into feature/measurement-loop

  nulinspiratie

  committed
  beb66ab

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

  Show description for f984c26
  pre-commit-ci[bot]

  committed
  f984c26

• wrote all the documentation for measurement_loop.py

  nulinspiratie

  committed
  30859f8

• Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop' into feature/measurement-loop

  nulinspiratie

  committed
  0d3ae37

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

  Show description for 8345ad9
  pre-commit-ci[bot]

  committed
  8345ad9

Commits on Sep 14, 2022

• fix typo

  nulinspiratie

  committed
  1fa5df8

• applied pep styling

  nulinspiratie

  committed
  c40c771

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

  Show description for deb0a12
  pre-commit-ci[bot]

  committed
  deb0a12

• fix pytest error

  nulinspiratie

  committed
  b9519df

• Merge branch 'feature/measurement-loop' of https://github.com/nulinspiratie/Qcodes into feature/measurement-loop

  nulinspiratie

  committed
  927ede2

• second round of pep fixes

  nulinspiratie

  committed
  70e0896

• typing fixes

  nulinspiratie

  committed
  369c5dc

• return self in MeasurementLoop context manager

  nulinspiratie

  committed
  54d9297

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

  Show description for ae10757
  pre-commit-ci[bot]

  committed
  ae10757

• Fixed last pep issue?

  nulinspiratie

  committed
  66a7a63

• Fixing Keysight capitalization issue

  nulinspiratie

  committed
  800f0f6

• Merge branch 'feature/measurement-loop' of https://github.com/nulinspiratie/Qcodes into feature/measurement-loop

  nulinspiratie

  committed
  c671d12

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

  Show description for f1f2067
  pre-commit-ci[bot]

  committed
  f1f2067

• Delete __init__.py

  nulinspiratie

  authored
  74596eb

• fixing pytest issues

  nulinspiratie

  committed
  33cac93

• Merge branch 'feature/measurement-loop' of https://github.com/nulinspiratie/Qcodes into feature/measurement-loop

  nulinspiratie

  committed
  d13aaf3

• Fixing pytest issues

  nulinspiratie

  committed
  ae78eed

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

  Show description for 93027b9
  pre-commit-ci[bot]

  committed
  93027b9

• missing double quote

  nulinspiratie

  committed
  9c587e5

• Merge branch 'feature/measurement-loop' of https://github.com/nulinspiratie/Qcodes into feature/measurement-loop

  nulinspiratie

  committed
  d8eee70

Commits on Sep 15, 2022

• allow linsweep in MeasurementLoop

  nulinspiratie

  committed
  e099071

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

  Show description for 448acc0
  pre-commit-ci[bot]

  committed
  448acc0

• fix type errors

  nulinspiratie

  committed
  16c7f09

• Merge remote-tracking branch 'QCoDeS-Sydney/feature/measurement-loop' into feature/measurement-loop

  nulinspiratie

  committed
  bad167c

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

  Show description for 3d85b55
  pre-commit-ci[bot]

  committed
  3d85b55

Commits on Sep 20, 2022

• fraction complete working for basic example

  nulinspiratie

  committed
  b2e0537

Commits on Sep 21, 2022

• round fraction_complete

  nulinspiratie

  committed
  4711f6f

• add test fraction complete

  nulinspiratie

  committed
  b2c1997

• Working progress bars

  nulinspiratie

  committed
  258c1d4

Commits on Sep 22, 2022

• Don't show progress bar by default

  nulinspiratie

  committed
  6e057a8

• Catch any progress bar errors

  nulinspiratie

  committed
  85131d4

• add plot functionality to Sweep.execute

  nulinspiratie

  committed
  02faed5

• Perform sweep using Sweep(*args)()

  nulinspiratie

  committed
  248e41b

Commits on Sep 23, 2022

• Merge branch 'feature/measurement-loop-percentage' into feature/measurement-loop

  nulinspiratie

  committed
  02b2cdd

• Merge remote-tracking branch 'QCoDeS-CPH/master' into feature/measurement-loop

  nulinspiratie

  committed
  bdd3b00

• Merge remote-tracking branch 'MorelloLab/feature/measurement-loop'

  nulinspiratie

  committed
  06bea97

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

  Show description for 8385b9c
  pre-commit-ci[bot]

  committed
  8385b9c

• override parameter.sweep

  nulinspiratie

  committed
  9d83dab

• Merge branch 'feature/parameter-sweep'

  nulinspiratie

  committed
  007ec03

Commits on Oct 17, 2022

• mistakenly added multiple sweeps

  

  The Beefy One

  committed
  15029a8

• Merge branch 'feature/measurement-loop' into feature/parameter-sweep

  

  The Beefy One

  committed
  997e136

• fix in parameter sweep

  

  The Beefy One

  committed
  611e7a7

• Merge branch 'feature/parameter-sweep'

  

  The Beefy One

  committed
  7f8468d

Commits on Oct 18, 2022

• Add Exception to except

  

  The Beefy One

  committed
  2106278

• Merge branch 'master' into feature/measurement-loop

  

  The Beefy One

  committed
  e2d2a56

• Merge branch 'feature/measurement-loop' into master-msmt_pc

  

  The Beefy One

  committed
  698e205

• Merge branch 'fix/snapshot-exception' into master-msmt_pc

  

  The Beefy One

  committed
  9e7f4fe

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

  

  The Beefy One

  committed
  8356937

• Merge branch 'feature/measurement-loop' into master-msmt_pc

  

  The Beefy One

  committed
  d8ae7b5

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

  Show description for cf7af50
  pre-commit-ci[bot]

  committed
  cf7af50

• minor fix to masking/unmasking

  

  The Beefy One

  committed
  ecea839

• Merge branch 'feature/measurement-loop' into master-msmt_pc

  

  The Beefy One

  committed
  a754ba8

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

  Show description for 67d969c
  pre-commit-ci[bot]

  committed
  67d969c

• reverting tqdm

  

  The Beefy One

  committed
  c9400b1

• Fix plot function

  

  The Beefy One

  committed
  3ced8d8

• Merge branch 'feature/measurement-loop' into feature/parameter-sweep

  

  The Beefy One

  committed
  66d54c9

• better plotting logic

  

  The Beefy One

  committed
  147b983

• Merge branch 'feature/measurement-loop' into master-msmt_pc

  

  The Beefy One

  committed
  aaa834b

• Merge branch 'feature/parameter-sweep' into master-msmt_pc

  

  The Beefy One

  committed
  d0126b6

Commits on Oct 28, 2022

• show plot after sweep

  nulinspiratie

  committed
  1dca9e8

• Merge branch 'feature/parameter-sweep'

  nulinspiratie

  committed
  fb2db63

Commits on Nov 8, 2022

• remove sweep stop arg

  Show description for ad7db8d
  nulinspiratie

  committed
  ad7db8d

Commits on Nov 11, 2022

• ignore num when step is given

  

  The Beefy One

  committed
  3eecb6c

Commits on Nov 13, 2022

• fix step + num

  

  The Beefy One

  committed
  dbcc850

Commits on Nov 15, 2022

• include metadata

  nulinspiratie

  committed
  bf61df7

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

  Show description for 0ad7dad
  pre-commit-ci[bot]

  committed
  0ad7dad

Commits on Dec 6, 2022

• begun adding measurement loop array

  nulinspiratie

  committed
  a29ff55

• fixed mistaken test

  nulinspiratie

  committed
  391b5d5

• ran through first test without errors

  nulinspiratie

  committed
  a7a45a9

• measuring arrays works

  nulinspiratie

  committed
  a9020ef

• Merge branch 'feature/measurement-loop-array' into feature/measurement-loop

  nulinspiratie

  committed
  248c48c

Commits on Dec 8, 2022

• don't show more than one tqdm progress bar

  nulinspiratie

  committed
  f1f1516

• minor fix for measuring arrays

  nulinspiratie

  committed
  f7fe1c3

• bug in unmasking

  nulinspiratie

  committed
  6dad7e6

• Allow sweep without name

  nulinspiratie

  committed
  ed1cb20

• Fix unmasking of sweep in msmt

  nulinspiratie

  committed
  cd950df

• add Iterate

  nulinspiratie

  committed
  4dd77cb

Commits on Dec 18, 2022

• Add N-dimensional array support

  nulinspiratie

  committed
  9c34a28

Commits on Dec 19, 2022

• improvements to config

  

  The Beefy One

  committed
  b79b2b5

• verification improvements

  

  The Beefy One

  committed
  54aad18

Commits on Mar 7, 2023

• add thread functionality

  

  The Beefy One

  committed
  6300b17