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.

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

Feature/parameter improvements #651

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
1b0f89d
refactor: Remove max_delay
nulinspiratie May 16, 2017
b0ff683
Refactor: Change get/set_delay to dependent properties
nulinspiratie May 16, 2017
df911e4
Refactor: Change get/set_step to dependent property
nulinspiratie May 16, 2017
9038a2c
Refactor: Delay -> Post_delay
nulinspiratie May 16, 2017
1720401
Refactor: Merge _validate_and_set/sweep to set
nulinspiratie May 16, 2017
842222e
Refactor: rename _set_get/set to _initialize_get/set
nulinspiratie May 16, 2017
ecad7b6
Refactor: remoed _update_last_ts
nulinspiratie May 16, 2017
5e8eed0
Refactor: Moved max_val_age to base_parameter and GetLatest()
nulinspiratie May 16, 2017
dbc387d
Merge branch 'QCoDeS/master' into feature/parameter_improvements
nulinspiratie Jun 21, 2017
acc479d
fix: Removed unnecessary quote
nulinspiratie Jun 21, 2017
6033c76
Merge branch 'QCoDeS/master' into feature/parameter_improvements
nulinspiratie Jun 28, 2017
1c58295
Merge branch 'master' of https://github.com/QCoDeS/Qcodes into featur…
nulinspiratie Jun 28, 2017
edf0803
refactor: rename _get/_set to _get_command/_set_command
nulinspiratie Jun 28, 2017
2cfc839
fix: GetLatest now performs get on parameter
nulinspiratie Jun 28, 2017
7b72b94
refactor: removed has_set/has_get
nulinspiratie Jun 28, 2017
2df5771
Add get/set wrappers
nulinspiratie Jun 28, 2017
794af70
feat: add kwargs to set from call()
nulinspiratie Jun 28, 2017
b5c91f0
refactor: move step to base_parameter, re-add exception to StandardPa…
nulinspiratie Jun 28, 2017
0642eaf
feat: Added inter_delay, post_delay
nulinspiratie Jun 28, 2017
e4d8f27
refactor: moved _initialize_get/set to parameter init, changed _vals …
nulinspiratie Jun 28, 2017
73d1113
refactor: Removed set_validator
nulinspiratie Jun 28, 2017
74c40e5
refactor: validate to BaseParameter, get/set_cmd also handle None
nulinspiratie Jun 28, 2017
d766fbd
move initial_val to Parameter, remove ManualParameter
nulinspiratie Jun 28, 2017
ffe6049
fix: Subclass InstrumentRefParamter from Parameter
nulinspiratie Jun 28, 2017
b683dff
feat: add valmapping to BaseParameter, remove StandardParameter
nulinspiratie Jun 28, 2017
1d93da0
get/set_parser now implemented in BaseParameter get/set wrappers
nulinspiratie Jun 28, 2017
cdff448
refactor: removal of units in (Array)Parameter
nulinspiratie Jun 28, 2017
241978f
feat: add scale
nulinspiratie Jun 28, 2017
e5b6398
Added StandardParameter and Manualparameter as deprecated
nulinspiratie Jun 29, 2017
bc788f6
feat: added raw_value
nulinspiratie Jun 29, 2017
3ac3f46
fix: Placed deprecation warnings after super().__init__
nulinspiratie Jun 29, 2017
38dce43
refactor: change _get/set_wrapper to _wrap_get/set
nulinspiratie Jun 29, 2017
c4ff66a
fix: get/set after super().__init__ to ensure all attrs are set
nulinspiratie Jun 29, 2017
a0d1048
refactor: replace full_name by str(parameter)
nulinspiratie Jul 1, 2017
0eaf148
refactor: remove get_attrs, replace full_name occurrences
nulinspiratie Jul 1, 2017
8db77ea
fix: aggregator typo
nulinspiratie Jul 1, 2017
4902d41
fix: replace is_sequence Iterator by Iterable
nulinspiratie Jul 1, 2017
0d5b9b0
refactor: change InstrumentRefParameter set_validators
nulinspiratie Jul 1, 2017
024f8c6
refactor: combine _latest_value, _latest_ts by _latest dict attr, rem…
nulinspiratie Jul 1, 2017
5d5430d
refactor: _save_val validates by default
nulinspiratie Jul 1, 2017
31c9912
fix: remove partial import
nulinspiratie Jul 1, 2017
a063206
refactor: remove no_getter/setter, unused imports
nulinspiratie Jul 1, 2017
07ae82e
refactor: tidy up code, remove todo
nulinspiratie Jul 1, 2017
2a2b1e8
refactor: change back save_val by default to validator=False
nulinspiratie Jul 1, 2017
804e98c
fix: snapshot does not change self._latest
nulinspiratie Jul 1, 2017
07ef880
feat: only include meta_attrs that are not None
nulinspiratie Jul 1, 2017
426f6a8
fix: vals in base_parameter
nulinspiratie Jul 1, 2017
9669f6e
fix: raise error when max_val_age is set but no get/get_cmd
nulinspiratie Jul 1, 2017
d44958d
fix: move setting of vals attr earlier
nulinspiratie Jul 1, 2017
8e22174
fix: Multiparameter accepts array as setpoints
nulinspiratie Jul 1, 2017
e215dc1
fix: change setter values to value
nulinspiratie Jul 1, 2017
59939fd
fix: allow step=None
nulinspiratie Jul 1, 2017
3aa7be6
fix: setpoints in ArrayParameter can now be an np.array
nulinspiratie Jul 1, 2017
670d3f1
doc: remove trailing whitespaces
nulinspiratie Jul 1, 2017
79c20a0
fix: docstring typo
nulinspiratie Jul 2, 2017
22477f7
fix: allow step=None
nulinspiratie Jul 2, 2017
18164ba
fix: functools wraps function wraps get/set fuction
nulinspiratie Jul 2, 2017
21b2be4
fix: instrument with empty name not included in full_name
nulinspiratie Jul 2, 2017
b1f8cd5
refactor: change get_sweep_values to get_ramp_values
nulinspiratie Jul 2, 2017
54d3587
fix: change add_parameter default parameter, ramping fix
nulinspiratie Jul 2, 2017
d147395
fix: reverted Iterable to Iterator, explicitly added np.ndarray
nulinspiratie Jul 8, 2017
2902e98
fix: Forgot to add helpers to previous commit
nulinspiratie Jul 8, 2017
06da231
Merge branch 'master' into feature/parameter_improvements
jenshnielsen Jul 23, 2017
3454aad
correct conflict resolution
jenshnielsen Jul 23, 2017
b48bc07
fix: replaced reference to `has_get`, `has_set`
nulinspiratie Jul 23, 2017
1d8ef64
test: fixed testParameter tests
nulinspiratie Aug 28, 2017
ae655b6
test:fix most other tests
nulinspiratie Aug 28, 2017
1fc3694
fix: CombinedParameter defaults to set_cmd=None
nulinspiratie Sep 5, 2017
73eb5c6
Merge branch 'master' of https://github.com/QCoDeS/Qcodes into featur…
nulinspiratie Sep 5, 2017
07fef09
fix: all existing tests are working
nulinspiratie Sep 5, 2017
c99111d
fix: get_ramp_values also returns final value
nulinspiratie Sep 5, 2017
1c5eae1
test: add test for step, ramp, scale, raw_value
nulinspiratie Sep 5, 2017
c3e1fa1
test: add test for GetLatest, including max_val_age
nulinspiratie Sep 5, 2017
552569d
test: fix combined tests
nulinspiratie Sep 5, 2017
a079f05
test: fix test_loop error
nulinspiratie Sep 5, 2017
c950c7b
docs: update global docstring
nulinspiratie Sep 5, 2017
63afc67
docs: start with BaseParameter docs
nulinspiratie Sep 5, 2017
5e77014
docs: finish BaseParameter
nulinspiratie Sep 5, 2017
76e6bc2
docs: finish Parameters docs
nulinspiratie Sep 5, 2017
ae9e73a
fix: defaults for snapshot_get, metadata
nulinspiratie Sep 5, 2017
8dae62d
Merge branch 'QCoDeS/master' into feature/parameter_improvements
nulinspiratie Sep 26, 2017
2e197a9
fix: set vals to Enum if val_mapping provided
nulinspiratie Sep 26, 2017
46bcc89
feat: Remove default vals=Numbers() for Parameter
nulinspiratie Sep 26, 2017
dc2bd38
fix: remove unused import
nulinspiratie Sep 26, 2017
e4ab530
doc: fixes
nulinspiratie Sep 26, 2017
9062494
forgot call to super().__init__()
nulinspiratie Sep 26, 2017
4fe2025
doc: unindent
nulinspiratie Sep 26, 2017
b379088
doc: remove trailing whitespaces
nulinspiratie Sep 26, 2017
13f36ab
added super.__init__(None)
nulinspiratie Sep 26, 2017
128cce5
doc: damn white spaces
nulinspiratie Sep 26, 2017
6b1f429
fix: remove init from getlatest
nulinspiratie Sep 26, 2017
3eb1580
fix: test fix for vals=Numbers()
nulinspiratie Sep 26, 2017
33c89c2
Merge branch 'master' into feature/parameter_improvements
WilliamHPNielsen Sep 29, 2017
1fca63e
readd deprecated set_validator
jenshnielsen Sep 29, 2017
b5ecebb
use warnings module for deprecation warnings
jenshnielsen Sep 29, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions qcodes/instrument/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from qcodes.utils.helpers import DelegateAttributes, strip_attrs, full_class
from qcodes.utils.metadata import Metadatable
from qcodes.utils.validators import Anything
from .parameter import Parameter
from .function import Function
from .parameter import StandardParameter


class InstrumentBase(Metadatable, DelegateAttributes):
Expand Down Expand Up @@ -71,8 +71,7 @@ def get_mock_messages(self):
raise ValueError("Cannot get mock messages if not in testing mode")
return self.mocker.get_log_messages()

def add_parameter(self, name, parameter_class=StandardParameter,
**kwargs):
def add_parameter(self, name, parameter_class=Parameter, **kwargs):
"""
Bind one Parameter to this instrument.

Expand Down Expand Up @@ -323,7 +322,7 @@ def validate_status(self, verbose=False):

"""
for k, p in self.parameters.items():
if p.has_get and p.has_set:
if hasattr(p, 'get') and hasattr(p, 'set'):
value = p.get()
if verbose:
print('validate_status: param %s: %s' % (k, value))
Expand Down
Loading