Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
301e6fb
Keysight N5245A driver
johnhornibrook Oct 21, 2017
7551ea3
Merge branch 'master' into driver-n5245a
jenshnielsen Apr 23, 2018
70f6437
Merge remote-tracking branch 'qcodes/master' into driver-n5245a
May 16, 2018
2ab48e6
Merge remote-tracking branch 'qcodes/master' into driver-n5245a
spauka Jun 7, 2018
d2ff2c9
Add new array parameters to PNA driver
spauka Jun 7, 2018
4af2c89
Make PNA driver generic
spauka Jun 8, 2018
a8136cb
Make driver generic, extend with traces and ports
spauka Jun 8, 2018
9dcbda9
Add initializer for N5245A PNA
spauka Jun 8, 2018
92d0bfa
Allow channel lists to be cleared
spauka Jun 8, 2018
a0051d1
Add nports to N5245A
spauka Jun 8, 2018
c98754b
Remove multi-parameters, not compatible with new dataset
spauka Jun 8, 2018
2cbb44b
Add FOM parameters
spauka Jun 8, 2018
4e5fc69
Fix parameter getting
spauka Jun 8, 2018
e8c6385
Add mypy annotations
spauka Jun 8, 2018
c73b215
Ignore typing on overloaded properties
spauka Jun 8, 2018
1da1635
Add N5230C driver as well
spauka Jun 8, 2018
3d76208
Merge branch 'master' into driver-n5245a
jenshnielsen Jul 20, 2018
fb5aa72
make register_parameter match add_result for array_parameter
jenshnielsen Jun 7, 2018
64dad3c
Add docstring to clear
spauka Jul 22, 2018
9cea3f7
Fix codacy errors
spauka Jul 22, 2018
e5144b0
Remove unused imports
spauka Jul 23, 2018
ac8120f
Merge branch 'master' into driver-n5245a
WilliamHPNielsen Jul 23, 2018
95e8d67
Fix whitespace and formatting
spauka Jul 23, 2018
525988d
Move run_sweep to trace
spauka Jul 26, 2018
77a1de4
Add tests for channel clear
spauka Jul 26, 2018
9417600
Add Keysight PNA driver example
spauka Jul 26, 2018
d4db4a8
Remove unused variable
spauka Jul 26, 2018
ae6d5c0
Rearrange trace parameters, change auto_sweep implementation
spauka Jul 27, 2018
f433164
Clarify comment on traces
spauka Jul 27, 2018
8f73d57
Set active trace in correct location
spauka Jul 27, 2018
e9e13cf
Merge branch 'master' into driver-n5245a
spauka Jul 27, 2018
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
Prev Previous commit
Next Next commit
Allow channel lists to be cleared
  • Loading branch information
spauka committed Jun 8, 2018
commit 92d0bfa51ff42f6a761c3743866e7745a528a932
6 changes: 6 additions & 0 deletions qcodes/instrument/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,12 @@ def append(self, obj: InstrumentChannel):
self._channel_mapping[obj.short_name] = obj
return self._channels.append(obj)

def clear(self):
if self._locked:
raise AttributeError("Cannot clear a locked channel list")
self._channels.clear()
self._channel_mapping.clear()

def extend(self, objects):
"""
Insert an iterable of objects into the list of channels.
Expand Down