Rohde Schwarz ZNB /VNA refactor common code

qcodes/instrument_drivers/rohde_schwarz/ZNB.py

@@ -68,7 +68,7 @@ def __init__(self, name, instrument, start, stop, npts, channel):
  label='{} magnitude'.format(
  instrument._vna_parameter),
  setpoint_units=('Hz',),
- setpoint_names=('{}_frequency'.format(instrument._vna_parameter),))
+ setpoint_names=('{} frequency'.format(instrument._vna_parameter),))
  self.set_sweep(start, stop, npts)
  self._channel = channel
 
@@ -114,7 +114,7 @@ def __init__(self, parent, name, channel):
  get_cmd='SOUR{}:POW?'.format(n),
  set_cmd='SOUR{}:POW {{:.4f}}'.format(n),
  get_parser=lambda x: int(round(float(x))),
- vals=vals.Numbers(-150, 25))
+ vals=vals.Numbers(-60, 25))
  self.add_parameter(name='bandwidth',
  label='Bandwidth',
  unit='Hz',
@@ -227,7 +227,7 @@ def _strip(self, var):
 
  def _set_start(self, val):
  channel = self._instrument_channel
- self.write('SENS{}:FREQ:START {:.4f}'.format(channel, val))
+ self.write('SENS{}:FREQ:START {:.7f}'.format(channel, val))
  stop = self.stop()
  if val >= stop:
  raise ValueError(
@@ -245,7 +245,7 @@ def _set_stop(self, val):
  if val <= start:
  raise ValueError(
  "Stop frequency must be larger than start frequency.")
- self.write('SENS{}:FREQ:STOP {:.4f}'.format(channel, val))
+ self.write('SENS{}:FREQ:STOP {:.7f}'.format(channel, val))
  # we get stop as the vna may not be able to set it to the exact value provided
  stop = self.stop()
  if val != stop:
@@ -255,28 +255,28 @@ def _set_stop(self, val):
 
  def _set_npts(self, val):
  channel = self._instrument_channel
- self.write('SENS{}:SWE:POIN {:.4f}'.format(channel, val))
+ self.write('SENS{}:SWE:POIN {:.7f}'.format(channel, val))
  self._update_traces()
 
  def _set_span(self, val):
  channel = self._instrument_channel
- self.write('SENS{}:FREQ:SPAN {:.4f}'.format(channel, val))
+ self.write('SENS{}:FREQ:SPAN {:.7f}'.format(channel, val))
  self._update_traces()
 
  def _set_center(self, val):
  channel = self._instrument_channel
- self.write('SENS{}:FREQ:CENT {:.4f}'.format(channel, val))
+ self.write('SENS{}:FREQ:CENT {:.7f}'.format(channel, val))
  self._update_traces()
 
  def _update_traces(self):
  """ updates start, stop and npts of all trace parameters"""
  start = self.start()
  stop = self.stop()
  npts = self.npts()
- for p in self.parameters:
- if isinstance(p, ArrayParameter):
+ for _, parameter in self.parameters.items():
+ if isinstance(parameter, (ArrayParameter, MultiParameter)):
  try:
- p.set_sweep(start, stop, npts)
+ parameter.set_sweep(start, stop, npts)
  except AttributeError:
  pass
 
@@ -310,13 +310,13 @@ def _get_sweep_data(self, force_polar=False):
  # need to ensure averaged result is returned
  for avgcount in range(self.avg()):
  self.write('INIT{}:IMM; *WAI'.format(self._instrument_channel))
-  data_str = self.ask(
-  'CALC{}:DATA? {}'.format(self._instrument_channel,
-  data_format_command))
-  data = np.array(data_str.rstrip().split(',')).astype('float64')
-  if self.format() in ['Polar', 'Complex',
-  'Smith', 'Inverse Smith']:
-  data = data[0::2] + 1j * data[1::2]
+ data_str = self.ask(
+ 'CALC{}:DATA? {}'.format(self._instrument_channel,
+ data_format_command))
+ data = np.array(data_str.rstrip().split(',')).astype('float64')
+ if self.format() in ['Polar', 'Complex',
+ 'Smith', 'Inverse Smith']:
+ data = data[0::2] + 1j * data[1::2]
  finally:
  self._parent.cont_meas_on()
  self.status(initial_state)
@@ -384,6 +384,8 @@ def __init__(self, name: str, address: str, init_s_params: bool=True, **kwargs):
  num_ports, num_ports))
  self.add_function('display_single_window',
  call_cmd='DISP:LAY GRID;:DISP:LAY:GRID 1,1')
+ self.add_function('display_dual_window',
+ call_cmd='DISP:LAY GRID;:DISP:LAY:GRID 2,1')
  self.add_function('rf_off', call_cmd='OUTP1 OFF')
  self.add_function('rf_on', call_cmd='OUTP1 ON')
  self.reset()
@@ -419,6 +421,8 @@ def add_channel(self, vna_parameter: str, **kwargs):
  self.channels.append(channel)
  if n_channels == 0:
  self.display_single_window()
+ if n_channels == 1:
+ self.display_dual_window()
 
  def _set_default_values(self):
  for channel in self.channels: