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.

Sign up for GitHub

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

Feat improvements m5180 driver #106

Merged
merged 2 commits into from
Oct 5, 2021
+49 −8
Merged

Feat improvements m5180 driver #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c06f37
Improvements on CopperMountain/M5180.py driver.
simonzihlmann Oct 5, 2021
e65c9ea
add **kwargs to sweep and point parameters
simonzihlmann Oct 5, 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
57 changes: 49 additions & 8 deletions qcodes_contrib_drivers/drivers/CopperMountain/M5180.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Simon Zihlmannr <[email protected]>, february/march 2021
import logging
import numpy as np
from typing import Tuple, Optional
from typing import Tuple, Optional, Any

from qcodes import VisaInstrument
from qcodes.utils.validators import Numbers, Enum, Ints
Expand All @@ -27,6 +27,7 @@ def __init__(self,
stop: float,
npts: int,
instrument: "M5180",
**kwargs: Any,
) -> None:
"""
Linear frequency sweep that returns magnitude and phase for a single
Expand Down Expand Up @@ -60,6 +61,7 @@ def __init__(self,
(f"{instrument.short_name}_frequency",),
),
shapes=((npts,), (npts,),),
**kwargs,
)
self.set_sweep(start, stop, npts)

Expand All @@ -84,13 +86,14 @@ def get_raw(self) -> Tuple[ParamRawDataType, ParamRawDataType]:
assert isinstance(self.instrument, M5180)
self.instrument.write('CALC1:PAR:COUN 1') # 1 trace
self.instrument.write('CALC1:PAR1:DEF {}'.format(self.name))
self.instrument.write('CALC1:TRAC1:FORM SMITH') # Trace format
self.instrument.trigger_source('bus') # set the trigger to bus
self.instrument.write('TRIG:SEQ:SING') # Trigger a single sweep
self.instrument.ask('*OPC?') # Wait for measurement to complete

# get data from instrument
self.instrument.write('CALC1:TRAC1:FORM SMITH') # ensure correct format
sxx_raw = self.instrument.ask("CALC1:TRAC1:DATA:FDAT?")
self.instrument.write('CALC1:TRAC1:FORM MLOG')

# Get data as numpy array
sxx = np.fromstring(sxx_raw, dtype=float, sep=',')
Expand All @@ -113,6 +116,7 @@ def __init__(self,
stop: float,
npts: int,
instrument: "M5180",
**kwargs: Any,
) -> None:
"""Magnitude and phase measurement of a single point at start
frequency.
Expand Down Expand Up @@ -146,6 +150,7 @@ def __init__(self,
(f"{instrument.short_name}_frequency",),
),
shapes=((npts,), (npts,),),
**kwargs,
)
self.set_sweep(start, stop, npts)

Expand All @@ -170,13 +175,14 @@ def get_raw(self) -> Tuple[ParamRawDataType, ParamRawDataType]:
assert isinstance(self.instrument, M5180)
self.instrument.write('CALC1:PAR:COUN 1') # 1 trace
self.instrument.write('CALC1:PAR1:DEF {}'.format(self.name[-3:]))
self.instrument.write('CALC1:TRAC1:FORM SMITH') # Trace format
self.instrument.trigger_source('bus') # set the trigger to bus
self.instrument.write('TRIG:SEQ:SING') # Trigger a single sweep
self.instrument.ask('*OPC?') # Wait for measurement to complete

# get data from instrument
self.instrument.write('CALC1:TRAC1:FORM SMITH') # ensure correct format
sxx_raw = self.instrument.ask("CALC1:TRAC1:DATA:FDAT?")
self.instrument.write('CALC1:TRAC1:FORM MLOG')

# Get data as numpy array
sxx = np.fromstring(sxx_raw, dtype=float, sep=',')
Expand All @@ -198,7 +204,8 @@ def __init__(self, name : str,
timeout : int=100000,
**kwargs):
"""
QCoDeS driver for the VNA S5180 from Copper Mountain
QCoDeS driver for the VNA S5180 from Copper Mountain.
This driver only uses one channel.

Args:
name (str): Name of the instrument.
Expand All @@ -217,6 +224,9 @@ def __init__(self, name : str,

self.add_function('reset', call_cmd='*RST')

# set the unit of the electrical distance to meter
self.write('CALC1:CORR:EDEL:DIST:UNIT MET')

self.add_parameter(name='output',
label='Output',
get_parser=str,
Expand All @@ -240,8 +250,10 @@ def __init__(self, name : str,
get_cmd='SENS1:BWID?',
set_cmd='SENS1:BWID {}',
unit='Hz',
vals=Enum(1, 3, 1e1, 3e1, 1e2, 3e2,
1e3, 3e3, 1e4, 3e4, 1e5, 3e5))
vals=Enum(*np.append(np.kron([1, 1.5, 2, 3, 5, 7],
10 ** np.arange(5)),
np.kron([1, 1.5, 2, 3], 10 ** 5)
)))

self.add_parameter('averages_enabled',
label='Averages Status',
Expand All @@ -266,13 +278,42 @@ def __init__(self, name : str,
unit='',
vals=Numbers(min_value=1, max_value=999))

self.add_parameter('electrical_delay',
label='Electrical delay',
get_cmd='CALC1:CORR:EDEL:TIME?',
set_cmd='CALC1:CORR:EDEL:TIME {}',
get_parser=float,
set_parser=float,
unit='s',
vals=Numbers(-10, 10))

self.add_parameter('electrical_distance',
label='Electrical distance',
get_cmd='CALC1:CORR:EDEL:DIST?',
set_cmd='CALC1:CORR:EDEL:DIST {}',
get_parser=float,
set_parser=float,
unit='m',
vals=Numbers())

self.add_parameter('clock_source',
label='Clock source',
get_cmd='SENSe1:ROSCillator:SOURce?',
set_cmd='SENSe1:ROSCillator:SOURce {}',
get_parser=str,
set_parser=str,
vals = Enum('int', 'Int', 'INT',
'internal', 'Internal', 'INTERNAL',
'ext', 'Ext', 'EXT',
'external', 'External', 'EXTERNAL'))

self.add_parameter(name='start',
label='Start Frequency',
get_parser=float,
get_cmd='SENS1:FREQ:STAR?',
set_cmd=self._set_start,
unit='Hz',
vals=Numbers(min_value=100e3,
vals=Numbers(min_value=300e3,
max_value=18e9))

self.add_parameter(name='stop',
Expand All @@ -281,7 +322,7 @@ def __init__(self, name : str,
get_cmd='SENS1:FREQ:STOP?',
set_cmd=self._set_stop,
unit='Hz',
vals=Numbers(min_value=100e3,
vals=Numbers(min_value=300e3+1,
max_value=18e9))

self.add_parameter(name='center',
Expand Down