Code

Feature/parameter improvements#651

Code

Merged

WilliamHPNielsen merged 95 commits intomicrosoft:mastermicrosoft/Qcodes:masterfrom nulinspiratie:feature/parameter_improvementsnulinspiratie/Qcodes:feature/parameter_improvementsCopy head branch name to clipboardSep 29, 2017

+709-759

Commits

Commits on May 16, 2017

• refactor: Remove max_delay

  Show description for 1b0f89d
  nulinspiratie

  committed
  1b0f89d

  Copy full SHA for 1b0f89d

• Refactor: Change get/set_delay to dependent properties

  nulinspiratie

  committed
  b0ff683

  Copy full SHA for b0ff683

• Refactor: Change get/set_step to dependent property

  Show description for df911e4
  nulinspiratie

  committed
  df911e4

  Copy full SHA for df911e4

• Refactor: Delay -> Post_delay

  nulinspiratie

  committed
  9038a2c

  Copy full SHA for 9038a2c

• Refactor: Merge _validate_and_set/sweep to set

  Show description for 1720401
  nulinspiratie

  committed
  1720401

  Copy full SHA for 1720401

• Refactor: rename _set_get/set to _initialize_get/set

  Show description for 842222e
  nulinspiratie

  committed
  842222e

  Copy full SHA for 842222e

• Refactor: remoed _update_last_ts

  Show description for ecad7b6
  nulinspiratie

  committed
  ecad7b6

  Copy full SHA for ecad7b6

• Refactor: Moved max_val_age to base_parameter and GetLatest()

  Show description for 5e8eed0
  nulinspiratie

  committed
  5e8eed0

  Copy full SHA for 5e8eed0

Commits on Jun 21, 2017

• Merge branch 'QCoDeS/master' into feature/parameter_improvements

  nulinspiratie

  committed
  dbc387d

  Copy full SHA for dbc387d

• fix: Removed unnecessary quote

  nulinspiratie

  committed
  acc479d

  Copy full SHA for acc479d

Commits on Jun 28, 2017

• Merge branch 'QCoDeS/master' into feature/parameter_improvements

  nulinspiratie

  committed
  6033c76

  Copy full SHA for 6033c76

• Merge branch 'master' of https://github.com/QCoDeS/Qcodes into feature/parameter_improvements

  nulinspiratie

  committed
  1c58295

  Copy full SHA for 1c58295

• refactor: rename _get/_set to _get_command/_set_command

  nulinspiratie

  committed
  edf0803

  Copy full SHA for edf0803

• fix: GetLatest now performs get on parameter

  nulinspiratie

  committed
  2cfc839

  Copy full SHA for 2cfc839

• refactor: removed has_set/has_get

  nulinspiratie

  committed
  7b72b94

  Copy full SHA for 7b72b94

• Add get/set wrappers

  nulinspiratie

  committed
  2df5771

  Copy full SHA for 2df5771

• feat: add kwargs to set from call()

  nulinspiratie

  committed
  794af70

  Copy full SHA for 794af70

• refactor: move step to base_parameter, re-add exception to StandardParameter.get()

  Show description for b5c91f0
  nulinspiratie

  committed
  b5c91f0

  Copy full SHA for b5c91f0

• feat: Added inter_delay, post_delay

  Show description for 0642eaf
  nulinspiratie

  committed
  0642eaf

  Copy full SHA for 0642eaf

• refactor: moved _initialize_get/set to parameter init, changed _vals to vals

  nulinspiratie

  committed
  e4d8f27

  Copy full SHA for e4d8f27

• refactor: Removed set_validator

  nulinspiratie

  committed
  73d1113

  Copy full SHA for 73d1113

• refactor: validate to BaseParameter, get/set_cmd also handle None

  Show description for 74c40e5
  nulinspiratie

  committed
  74c40e5

  Copy full SHA for 74c40e5

• move initial_val to Parameter, remove ManualParameter

  nulinspiratie

  committed
  d766fbd

  Copy full SHA for d766fbd

• fix: Subclass InstrumentRefParamter from Parameter

  nulinspiratie

  committed
  ffe6049

  Copy full SHA for ffe6049

• feat: add valmapping to BaseParameter, remove StandardParameter

  nulinspiratie

  committed
  b683dff

  Copy full SHA for b683dff

• get/set_parser now implemented in BaseParameter get/set wrappers

  nulinspiratie

  committed
  1d93da0

  Copy full SHA for 1d93da0

• refactor: removal of units in (Array)Parameter

  nulinspiratie

  committed
  cdff448

  Copy full SHA for cdff448

• feat: add scale

  nulinspiratie

  committed
  241978f

  Copy full SHA for 241978f

Commits on Jun 29, 2017

• Added StandardParameter and Manualparameter as deprecated

  nulinspiratie

  committed
  e5b6398

  Copy full SHA for e5b6398

• feat: added raw_value

  nulinspiratie

  committed
  bc788f6

  Copy full SHA for bc788f6

• fix: Placed deprecation warnings after super().__init__

  nulinspiratie

  committed
  3ac3f46

  Copy full SHA for 3ac3f46

• refactor: change _get/set_wrapper to _wrap_get/set

  nulinspiratie

  committed
  38dce43

  Copy full SHA for 38dce43

• fix: get/set after super().__init__ to ensure all attrs are set

  Show description for c4ff66a
  nulinspiratie

  committed
  c4ff66a

  Copy full SHA for c4ff66a

Commits on Jul 1, 2017

• refactor: replace full_name by str(parameter)

  nulinspiratie

  committed
  a0d1048

  Copy full SHA for a0d1048

• refactor: remove get_attrs, replace full_name occurrences

  nulinspiratie

  committed
  0eaf148

  Copy full SHA for 0eaf148

• fix: aggregator typo

  nulinspiratie

  committed
  8db77ea

  Copy full SHA for 8db77ea

• fix: replace is_sequence Iterator by Iterable

  Show description for 4902d41
  nulinspiratie

  committed
  4902d41

  Copy full SHA for 4902d41

• refactor: change InstrumentRefParameter set_validators

  nulinspiratie

  committed
  0d5b9b0

  Copy full SHA for 0d5b9b0

• refactor: combine _latest_value, _latest_ts by _latest dict attr, remove _latest method

  nulinspiratie

  committed
  024f8c6

  Copy full SHA for 024f8c6

• refactor: _save_val validates by default

  nulinspiratie

  committed
  5d5430d

  Copy full SHA for 5d5430d

• fix: remove partial import

  nulinspiratie

  committed
  31c9912

  Copy full SHA for 31c9912

• refactor: remove no_getter/setter, unused imports

  nulinspiratie

  committed
  a063206

  Copy full SHA for a063206

• refactor: tidy up code, remove todo

  nulinspiratie

  committed
  07ae82e

  Copy full SHA for 07ae82e

• refactor: change back save_val by default to validator=False

  Show description for 2a2b1e8
  nulinspiratie

  committed
  2a2b1e8

  Copy full SHA for 2a2b1e8

• fix: snapshot does not change self._latest

  nulinspiratie

  committed
  804e98c

  Copy full SHA for 804e98c

• feat: only include meta_attrs that are not None

  nulinspiratie

  committed
  07ef880

  Copy full SHA for 07ef880

• fix: vals in base_parameter

  nulinspiratie

  committed
  426f6a8

  Copy full SHA for 426f6a8

• fix: raise error when max_val_age is set but no get/get_cmd

  nulinspiratie

  committed
  9669f6e

  Copy full SHA for 9669f6e

• fix: move setting of vals attr earlier

  nulinspiratie

  committed
  d44958d

  Copy full SHA for d44958d

• fix: Multiparameter accepts array as setpoints

  nulinspiratie

  committed
  8e22174

  Copy full SHA for 8e22174

• fix: change setter values to value

  nulinspiratie

  committed
  e215dc1

  Copy full SHA for e215dc1

• fix: allow step=None

  nulinspiratie

  committed
  59939fd

  Copy full SHA for 59939fd

• fix: setpoints in ArrayParameter can now be an np.array

  nulinspiratie

  committed
  3aa7be6

  Copy full SHA for 3aa7be6

• doc: remove trailing whitespaces

  nulinspiratie

  committed
  670d3f1

  Copy full SHA for 670d3f1

Commits on Jul 2, 2017

• fix: docstring typo

  nulinspiratie

  committed
  79c20a0

  Copy full SHA for 79c20a0

• fix: allow step=None

  nulinspiratie

  committed
  22477f7

  Copy full SHA for 22477f7

• fix: functools wraps function wraps get/set fuction

  nulinspiratie

  committed
  18164ba

  Copy full SHA for 18164ba

• fix: instrument with empty name not included in full_name

  nulinspiratie

  committed
  21b2be4

  Copy full SHA for 21b2be4

• refactor: change get_sweep_values to get_ramp_values

  nulinspiratie

  committed
  b1f8cd5

  Copy full SHA for b1f8cd5

• fix: change add_parameter default parameter, ramping fix

  nulinspiratie

  committed
  54d3587

  Copy full SHA for 54d3587

Commits on Jul 8, 2017

• fix: reverted Iterable to Iterator, explicitly added np.ndarray

  nulinspiratie

  committed
  d147395

  Copy full SHA for d147395

• fix: Forgot to add helpers to previous commit

  nulinspiratie

  committed
  2902e98

  Copy full SHA for 2902e98

Commits on Jul 23, 2017

• Merge branch 'master' into feature/parameter_improvements

  jenshnielsen

  authored
  06da231

  Copy full SHA for 06da231

• correct conflict resolution

  Show description for 3454aad
  jenshnielsen

  committed
  3454aad

  Copy full SHA for 3454aad

• fix: replaced reference to has_get, has_set

  nulinspiratie

  committed
  b48bc07

  Copy full SHA for b48bc07

Commits on Aug 28, 2017

• test: fixed testParameter tests

  nulinspiratie

  committed
  1d8ef64

  Copy full SHA for 1d8ef64

• test:fix most other tests

  nulinspiratie

  committed
  ae655b6

  Copy full SHA for ae655b6

Commits on Sep 5, 2017

• fix: CombinedParameter defaults to set_cmd=None

  nulinspiratie

  committed
  1fc3694

  Copy full SHA for 1fc3694

• Merge branch 'master' of https://github.com/QCoDeS/Qcodes into feature/parameter_improvements

  Show description for 73eb5c6
  nulinspiratie

  committed
  73eb5c6

  Copy full SHA for 73eb5c6

• fix: all existing tests are working

  nulinspiratie

  committed
  07fef09

  Copy full SHA for 07fef09

• fix: get_ramp_values also returns final value

  nulinspiratie

  committed
  c99111d

  Copy full SHA for c99111d

• test: add test for step, ramp, scale, raw_value

  nulinspiratie

  committed
  1c5eae1

  Copy full SHA for 1c5eae1

• test: add test for GetLatest, including max_val_age

  nulinspiratie

  committed
  c3e1fa1

  Copy full SHA for c3e1fa1

• test: fix combined tests

  nulinspiratie

  committed
  552569d

  Copy full SHA for 552569d

• test: fix test_loop error

  nulinspiratie

  committed
  a079f05

  Copy full SHA for a079f05

• docs: update global docstring

  nulinspiratie

  committed
  c950c7b

  Copy full SHA for c950c7b

• docs: start with BaseParameter docs

  nulinspiratie

  committed
  63afc67

  Copy full SHA for 63afc67

• docs: finish BaseParameter

  nulinspiratie

  committed
  5e77014

  Copy full SHA for 5e77014

• docs: finish Parameters docs

  nulinspiratie

  committed
  76e6bc2

  Copy full SHA for 76e6bc2

• fix: defaults for snapshot_get, metadata

  nulinspiratie

  committed
  ae9e73a

  Copy full SHA for ae9e73a

Commits on Sep 26, 2017

• Merge branch 'QCoDeS/master' into feature/parameter_improvements

  nulinspiratie

  committed
  8dae62d

  Copy full SHA for 8dae62d

• fix: set vals to Enum if val_mapping provided

  nulinspiratie

  committed
  2e197a9

  Copy full SHA for 2e197a9

• feat: Remove default vals=Numbers() for Parameter

  nulinspiratie

  committed
  46bcc89

  Copy full SHA for 46bcc89

• fix: remove unused import

  nulinspiratie

  committed
  dc2bd38

  Copy full SHA for dc2bd38

• doc: fixes

  nulinspiratie

  committed
  e4ab530

  Copy full SHA for e4ab530

• forgot call to super().__init__()

  nulinspiratie

  committed
  9062494

  Copy full SHA for 9062494

• doc: unindent

  nulinspiratie

  committed
  4fe2025

  Copy full SHA for 4fe2025

• doc: remove trailing whitespaces

  nulinspiratie

  committed
  b379088

  Copy full SHA for b379088

• added super.__init__(None)

  nulinspiratie

  committed
  13f36ab

  Copy full SHA for 13f36ab

• doc: damn white spaces

  nulinspiratie

  committed
  128cce5

  Copy full SHA for 128cce5

• fix: remove init from getlatest

  nulinspiratie

  committed
  6b1f429

  Copy full SHA for 6b1f429

• fix: test fix for vals=Numbers()

  nulinspiratie

  committed
  3eb1580

  Copy full SHA for 3eb1580

Commits on Sep 29, 2017

• Merge branch 'master' into feature/parameter_improvements

  WilliamHPNielsen

  authored
  33c89c2

  Copy full SHA for 33c89c2

• readd deprecated set_validator

  Show description for 1fca63e
  jenshnielsen

  committed
  1fca63e

  Copy full SHA for 1fca63e

• use warnings module for deprecation warnings

  jenshnielsen

  committed
  b5ecebb

  Copy full SHA for b5ecebb