Merge pull request #807 from johnhornibrook/driver-n5245a

driver/Keysight N5245A
microsoft · Jul 27, 2018 · 3d49344 · 3d49344
2 parents f7b173f + e9e13cf
commit 3d49344
Show file tree

Hide file tree

Showing 7 changed files with 879 additions and 2 deletions.
diff --git a/docs/examples/driver_examples/Qcodes_example_with_Keysight_Network_Analyzer.ipynb b/docs/examples/driver_examples/Qcodes_example_with_Keysight_Network_Analyzer.ipynb
diff --git a/qcodes/dataset/measurements.py b/qcodes/dataset/measurements.py
@@ -421,8 +421,8 @@ def register_parameter(
         my_setpoints: Optional[Sequence[Union[str, _BaseParameter]]]
         if isinstance(parameter, ArrayParameter):
             spname_parts = []
-            if parameter.instrument is not None:
-                inst_name = parameter.instrument.name
+            if parameter._instrument is not None:
+                inst_name = parameter._instrument.name
                 if inst_name is not None:
                     spname_parts.append(inst_name)
             if parameter.setpoint_names is not None:

diff --git a/qcodes/instrument/channel.py b/qcodes/instrument/channel.py
@@ -280,6 +280,15 @@ def append(self, obj: InstrumentChannel):
         self._channels = cast(List[InstrumentChannel], self._channels)
         return self._channels.append(obj)
 
+    def clear(self):
+        """
+        Clear all items from the channel list.
+        """
+        if self._locked:
+            raise AttributeError("Cannot clear a locked channel list")
+        self._channels.clear()
+        self._channel_mapping.clear()
+
     def remove(self, obj: InstrumentChannel):
         """
         Removes obj from channellist if not locked.

diff --git a/qcodes/instrument_drivers/Keysight/N5230C.py b/qcodes/instrument_drivers/Keysight/N5230C.py
@@ -0,0 +1,9 @@
+from . import N52xx
+
+class N5230C(N52xx.PNABase):
+    def __init__(self, name, address, **kwargs):
+        super().__init__(name, address,
+                         min_freq=300e3, max_freq=13.5e9,
+                         min_power=-90, max_power=13,
+                         nports=2,
+                         **kwargs)
diff --git a/qcodes/instrument_drivers/Keysight/N5245A.py b/qcodes/instrument_drivers/Keysight/N5245A.py
@@ -0,0 +1,15 @@
+from . import N52xx
+
+class N5245A(N52xx.PNAxBase):
+    def __init__(self, name, address, **kwargs):
+        super().__init__(name, address,
+                         min_freq=10e6, max_freq=50e9,
+                         min_power=-30, max_power=13,
+                         nports=4,
+                         **kwargs)
+
+        options = self.get_options()
+        if "419" in options:
+            self._set_power_limits(min_power=-90, max_power=13)
+        if "080" in options:
+            self._enable_fom()