Merge pull request #91 from qutech/feature/Device_Object

Feature/device object

src/qumada/instrument/buffers/__init__.py

@@ -21,6 +21,7 @@
     Buffer,
     BufferException,
     is_bufferable,
+    is_triggerable,
     map_buffers,
 )
 from qumada.instrument.buffers.dummy_dmm_buffer import DummyDMMBuffer
@@ -32,6 +33,7 @@
     "BufferException",
     "map_buffers",
     "is_bufferable",
+    "is_triggerable",
     "MFLIBuffer",
     "SR830Buffer",
     "DummyDMMBuffer",

src/qumada/instrument/buffers/buffer.py

@@ -33,8 +33,9 @@ def is_bufferable(object: Instrument | Parameter):
     """Checks if the instrument or parameter is bufferable using the qumada Buffer definition."""
     if isinstance(object, Parameter):
         object = object.root_instrument
-    return hasattr(object, "_qumada_buffer") and isinstance(object._qumada_buffer, Buffer)
+    return hasattr(object, "_qumada_buffer")  # and isinstance(object._qumada_buffer, Buffer)
     # TODO: check, if parameter can really be buffered
+    # TODO: For some reason checking the type doesn't work all the time. Check again later.
 
 
 def is_triggerable(object: Instrument | Parameter):

src/qumada/instrument/buffers/dummy_dmm_buffer.py

@@ -29,7 +29,7 @@
 from jsonschema import validate
 from qcodes.parameters import Parameter
 
-from qumada.instrument.buffers.buffer import Buffer, BufferException
+from qumada.instrument.buffers import Buffer, BufferException
 from qumada.instrument.custom_drivers.Dummies.dummy_dmm import DummyDmm
 
 
@@ -117,6 +117,7 @@ def read_raw(self) -> dict:
             index = self._device.buffer.subscribed_params.index(parameter)
             data[parameter.name] = self._device.buffer.get()[index]
             data[parameter.name] = data[parameter.name][self.delay_data_points : self.num_points]
+        data["timestamps"] = np.linspace(0, self.num_points / self._device.buffer_SR(), self.num_points)
         return data
 
     def read(self) -> dict:

src/qumada/instrument/custom_drivers/Dummies/__init__.py

@@ -0,0 +1,5 @@
+"""
+Created on Fri May 10 16:46:48 2024
+
+@author: Huckemann
+"""

src/qumada/instrument/custom_drivers/Dummies/dummy_dmm.py

@@ -116,7 +116,7 @@ def __init__(self, name, trigger_event=threading.Event(), **kwargs):
             "buffer_SR",
             unit="Sa/s",
             set_cmd=None,
-            vals=vals.Ints(0, 512),
+            vals=vals.Numbers(0, 512),
         )
 
         self.add_parameter(