Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
54b68ce
feat: Add skeleton for Keysight N9030B
Dec 21, 2020
3a663f9
feat: N9030B Add missing type annotations
Dec 21, 2020
bb95c91
feat: N9030B Add trace class and initial params
Dec 21, 2020
439f75c
Update driver skeleton
Akshita07 Dec 28, 2020
62e3131
Update freq axis parameter
Akshita07 Dec 29, 2020
d1c59e0
Add validator for npts
Akshita07 Dec 29, 2020
b140799
Add trace parameter and measurement related methods
Akshita07 Dec 29, 2020
0af867a
Update trace param class
Akshita07 Dec 29, 2020
9903703
Replace add_functions with methods and parameter
Akshita07 Jan 12, 2021
4b52440
Add init method to trace class
Akshita07 Jan 13, 2021
e85e384
Reaggance and add separate class for SA mode
Akshita07 Jan 14, 2021
aa54249
Add doc strings
Akshita07 Jan 14, 2021
9936a99
Add phase noise mode class
Akshita07 Jan 14, 2021
c554e53
Move measurement param to base class
Akshita07 Jan 14, 2021
379ac74
Add missing type annotations
Akshita07 Jan 14, 2021
6390a38
Add params to Phase noise mode
Akshita07 Jan 14, 2021
3287dcd
fix type hint
Akshita07 Jan 14, 2021
4ebb800
Add yaml and test file
Akshita07 Jan 14, 2021
0670293
Add empty line in yaml file
Akshita07 Jan 14, 2021
9d4092f
Add driver example notebook
Akshita07 Jan 14, 2021
156e587
Fix link in notebook
Akshita07 Jan 14, 2021
19b6699
Make SA and PNoise modes as submodules
Akshita07 Jan 15, 2021
f8f6384
Add submodules to yaml
Akshita07 Jan 15, 2021
d58e16a
Update notebook
Akshita07 Jan 15, 2021
f1ab7f1
Update yaml
Akshita07 Jan 15, 2021
629c433
Add mode fixtures to test file
Akshita07 Jan 15, 2021
71f84ee
Add mode to class name
Akshita07 Jan 17, 2021
9a0d177
Add mode to class name
Akshita07 Jan 17, 2021
f16e3fa
Rename variable
Akshita07 Jan 17, 2021
28704bf
Rename n to number
Akshita07 Jan 17, 2021
8641451
fixes according to review
Akshita07 Jan 17, 2021
a162d0a
Add set up methods for both modes
Akshita07 Jan 17, 2021
b04c24a
Add tests for measurements setup
Akshita07 Jan 17, 2021
f51eab9
Update yaml
Akshita07 Jan 18, 2021
b7cee88
Add min max freq for sa mode and fix calls to drivers params
Akshita07 Jan 18, 2021
568b350
pn to log_plot fixture name
Akshita07 Jan 18, 2021
2b0a985
Fix string parsing for catalog commands
Akshita07 Jan 18, 2021
0a175ac
minor fix for parsing
Akshita07 Jan 18, 2021
f5a0cdd
Add set cmd to sweep time
Akshita07 Jan 18, 2021
a036f4f
fix parsing for modes
Akshita07 Jan 18, 2021
0142343
update get_data methods
Akshita07 Jan 18, 2021
f49e1cd
fix meas parsing
Akshita07 Jan 18, 2021
31e7db5
update sample responses in yaml
Akshita07 Jan 18, 2021
9c1d4ad
fix get_data queries and meas valid vals
Akshita07 Jan 18, 2021
368f7ef
add docstring and mypy fixes
Akshita07 Jan 18, 2021
89b753b
Use enumerate inplace of range len
Akshita07 Jan 18, 2021
68a0cef
update notebook
Akshita07 Jan 18, 2021
601629e
split data string
Akshita07 Jan 18, 2021
6028637
get only trace data
Akshita07 Jan 18, 2021
9904017
take y vals as trace data
Akshita07 Jan 18, 2021
33fd0d9
update number to 3 (returns trace1 data)
Akshita07 Jan 18, 2021
f3e3fbb
Add check for carrier missing for PN mode get_data
Akshita07 Jan 19, 2021
1b40c0b
log warning and return array of -1 for carrier missing for PN mode ge…
Akshita07 Jan 19, 2021
31229cc
Add signal tracking param for PN mode
Akshita07 Jan 19, 2021
50fc53b
add missing braces
Akshita07 Jan 19, 2021
1a23351
update freq axis param
Akshita07 Jan 19, 2021
0b14386
add parenthesis to start, stop and npts calls
Akshita07 Jan 19, 2021
e0bae37
Add signal tracking enabled to yaml
Akshita07 Jan 19, 2021
2c87a81
edits to run unit tests
trevormorgan Jan 20, 2021
d4117b5
Update tests file
Akshita07 Jan 20, 2021
e82ad4c
Update yaml
Akshita07 Jan 20, 2021
bcc7157
Update freq axis param in driver
Akshita07 Jan 20, 2021
1cc7ad8
Update tests
Akshita07 Jan 20, 2021
3965b07
mypy fixes
Akshita07 Jan 20, 2021
7d9e9ca
fix to freq axis parameter
trevormorgan Jan 21, 2021
e54c8c9
working pyvisa-sim yaml
trevormorgan Jan 21, 2021
175b308
Remove unused import and raises errors in except
Akshita07 Jan 21, 2021
b84f9ed
Update tests
Akshita07 Jan 21, 2021
8009786
Remove extra line from the end of test file
Akshita07 Jan 21, 2021
2e9db81
raise error from e
Akshita07 Jan 21, 2021
d0762a8
Update notebook
Akshita07 Jan 21, 2021
9329860
Correct usage of enumerate
Akshita07 Jan 21, 2021
5d2a451
Update variable names
Akshita07 Jan 21, 2021
50b7ee1
Add units
Akshita07 Jan 21, 2021
7dce6d4
Update doc strings
Akshita07 Jan 21, 2021
d73b15f
Raise correct errors
Akshita07 Jan 21, 2021
d41c006
Remove unused statements
Akshita07 Jan 21, 2021
c4d146f
raise error from e
Akshita07 Jan 21, 2021
43e6a08
Merge branch 'master' into feat/keysight_N9030B
Akshita07 Jan 22, 2021
4cd554a
Merge branch 'master' into feat/keysight_N9030B
jenshnielsen Jan 22, 2021
8617d4f
remove new exp for 2nd run and plottr section
Akshita07 Jan 22, 2021
4588199
remove initial values for auto sweep time/type enabled
Akshita07 Jan 22, 2021
399f0a8
Merge branch 'feat/keysight_N9030B' of https://github.com/neildick/Qc…
Akshita07 Jan 22, 2021
f47874b
Merge branch 'master' into feat/keysight_N9030B
jenshnielsen Jan 25, 2021
4d1d7f1
Upload executed example notebook
Akshita07 Jan 26, 2021
8b4cc86
Merge branch 'feat/keysight_N9030B' of https://github.com/neildick/Qc…
Akshita07 Jan 26, 2021
dd1e616
Merge branch 'master' into feat/keysight_N9030B
Akshita07 Jan 26, 2021
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

Large diffs are not rendered by default.

195 changes: 195 additions & 0 deletions qcodes/instrument/sims/Keysight_N9030B.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
spec: "1.0"
devices:
KeysightN9030B:
eom:
GPIB INSTR:
q: "\n"
r: "\n"
error: ERROR
dialogues:
- q: "*RST"
- q: ":ABORt"
- q: ":INSTrument:CATalog?"
r: '"SA 1, PNOISE 14"'
- q: ":CONFigure:CATalog?"
r: '"SAN, LPL"'
- q: "*OPT?"
r: '"544"'
- q: "*IDN?"
r: "Keysight Technologies,N9030B,1000,0.1"

properties:

mode:
default: "SA"
getter:
q: ":INSTrument:SELect?"
r: "{}"
setter:
q: ":INSTrument:SELect {}"

measurement:
default: "SAN"
getter:
q: ":CONFigure?"
r: "{}"
setter:
q: ":CONFigure:{}"

cont_meas:
getter:
q: ":INITiate:CONTinuous?"
r: "{}"
setter:
q: ":INITiate:CONTinuous {}"

channels:
sa:
ids: ['sa']
can_select: True

properties:

start:
default: 100
getter:
q: ":SENSe:FREQuency:STARt?"
r: "{}"
setter:
q: ":SENSe:FREQuency:STARt {}"
specs:
type: float

stop:
default: 10000
getter:
q: ":SENSe:FREQuency:STOP?"
r: "{}"
setter:
q: ":SENSe:FREQuency:STOP {}"
specs:
type: float

center:
default: 1.805e9
getter:
q: ":SENSe:FREQuency:CENTer?"
r: "{}"
setter:
q: ":SENSe:FREQuency:CENTer {}"
specs:
type: float

span:
default: 3.59e9
getter:
q: ":SENSe:FREQuency:SPAN?"
r: "{}"
setter:
q: ":SENSe:FREQuency:SPAN {}"
specs:
type: float

npts:
default: 1001
getter:
q: ":SENSe:SWEep:POINts?"
r: "{}"
setter:
q: ":SENSe:SWEep:POINts {}"
specs:
min: 1
max: 20001
type: int

sweep_time:
default: 20
getter:
q: ":SENSe:SWEep:TIME?"
r: "{}"
specs:
type: float

auto_sweep_time_enabled:
default: "ON"
getter:
q: ":SENSe:SWEep:TIME:AUTO?"
r: "{}"
setter:
q: ":SENSe:SWEep:TIME:AUTO {}"
specs:
type: str
valid: ["ON", "OFF"]

auto_sweep_type_enabled:
default: "OFF"
getter:
q: ":SENSe:SWEep:TYPE:AUTO?"
r: "{}"
setter:
q: ":SENSe:SWEep:TYPE:AUTO {}"
specs:
type: str
valid: ["ON", "OFF"]

sweep_type:
default: "SWE"
getter:
q: ":SENSe:SWEep:TYPE?"
r: "{}"
setter:
q: ":SENSe:SWEep:TYPE {}"
specs:
type: str
valid: ["FFT", "SWE"]
pn:
ids: ['pn']
can_select: True

properties:
npts:
default: 601
getter:
q: ":SENSe:LPLot:SWEep:POINts?"
r: "{}"
setter:
q: ":SENSe:LPLot:SWEep:POINts {}"
specs:
min: 601
max: 20001
type: int

start_offset:
default: 100
getter:
q: ":SENSe:LPLot:FREQuency:OFFSet:STARt?"
r: "{}"
setter:
q: ":SENSe:LPLot:FREQuency:OFFSet:STARt {}"
specs:
type: float

stop_offset:
default: 1e6
getter:
q: ":SENSe:LPLot:FREQuency:OFFSet:STOP?"
r: "{}"
setter:
q: ":SENSe:LPLot:FREQuency:OFFSet:STOP {}"
specs:
type: float

signal_tracking_enabled:
default: "ON"
getter:
q: ":SENSe:FREQuency:CARRier:TRACk?"
r: "{}"
setter:
q: ":SENSe:FREQuency:CARRier:TRACk {}"
specs:
type: str
valid: ["ON", "OFF"]

resources:
GPIB::1::INSTR:
device: KeysightN9030B
Loading