Live plotting for 3.0

.pre-commit-config.yaml

@@ -15,21 +15,21 @@ repos:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.1
+    rev: v3.20.0
     hooks:
     -   id: pyupgrade
         args: [--py39-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black"]
 -   repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
     -   id: black
         args: ["--line-length", "120"]
 -   repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
     -   id: flake8

docs/device_object.rst

@@ -194,7 +194,7 @@ This stores all parameter values (of parameters that can be set). With
 
 you can reset it to the stored
 configuration. Alternatively you can use "device.save_state(name)" and "device.set_state(name)" to store and set multiple working points with
-custom names. They can also be accessed via "device.states" in case you forgot the name. To store a state in json-file, use device.save_to_file(name, path), you can load it 
+custom names. They can also be accessed via "device.states" in case you forgot the name. To store a state in json-file, use device.save_to_file(name, path), you can load it
 via "device.load_state_from_file(name, path)" to load it (use "device.set_state(name)" afterwards to set it) or with "device.set_state_from_file(name, path)" to directly apply the configuration to the device.
 For all of those methods the parameters are ramped to the final state by default (with the default QuMada ramp rate), again depending on the "device.ramp" setting.
 

src/qumada/instrument/custom_drivers/ZI/MFLI.py

@@ -41,11 +41,13 @@ class MFLI(Instrument):
     """
 
     def __init__(
-        self, name: str, device: str,
+        self,
+        name: str,
+        device: str,
         serverhost: str = "localhost",
-        existing_session: Session = None, 
-        allow_version_mismatch = False,
-        **kwargs
+        existing_session: Session = None,
+        allow_version_mismatch=False,
+        **kwargs,
     ):
         super().__init__(name, **kwargs)
         if isinstance(existing_session, Session):

src/qumada/instrument/mapping/Dummies/DummyDac.py

@@ -60,8 +60,8 @@ def ramp(
 
         if not start_values:
             start_values = [param.get() for param in parameters]
-            
-        print("Ramping...")    
+
+        print("Ramping...")
         instrument._triggered_ramp_channels(
             [param._instrument for param in parameters], start_values, end_values, ramp_time, num_points
         )
@@ -96,7 +96,7 @@ def pulse(
 
     def setup_trigger_in():
         pass
-    
+
     def force_trigger(self):
         self._instrument.force_trigger()
-        self._instrument._is_triggered.clear()
+        self._instrument._is_triggered.clear()

src/qumada/instrument/mapping/Harvard/Decadac.py

@@ -19,12 +19,14 @@
 # - Till Huckeman
 
 
+import logging
+
 from qcodes.instrument.parameter import Parameter
 
 from qumada.instrument.custom_drivers.Harvard.Decadac import Decadac
 from qumada.instrument.mapping import DECADAC_MAPPING
 from qumada.instrument.mapping.base import InstrumentMapping
-import logging
+
 logger = logging.getLogger(__name__)
 
 
@@ -159,6 +161,6 @@ def trigger_in(self, trigger: str | None) -> None:
     def force_trigger(self):
         string = ""
         for b in range(0, 6):
-            for c in range(0,6):
-                string+=f"B{b};C{c};G0;"
-        self._instrument.write(string)
+            for c in range(0, 6):
+                string += f"B{b};C{c};G0;"
+        self._instrument.write(string)

src/qumada/instrument/mapping/QDevil/qdac.py

@@ -30,6 +30,7 @@ class QDacMapping(InstrumentMapping):
     def __init__(self):
         super().__init__(QDAC_MAPPING)
         self.max_ramp_channels = 8
+
     def ramp(
         self,
         parameters: list[Parameter],
@@ -72,7 +73,7 @@ def ramp(
 
     def setup_trigger_in(self):
         raise Exception("QDac does not have a trigger input!")
-        
+
     def force_trigger(self):
         pass
         # Not required as QDac has no trigger input and starts ramps instantly.

src/qumada/instrument/mapping/QDevil/qdac2.py

@@ -182,7 +182,7 @@ def setup_trigger_in(self):
             "QDac2 does not have a trigger input \
             not yet supported!"
         )
-            
+
     def force_trigger(self):
         pass
         # Currently no trigger inputs are supported, thus all ramps are started

src/qumada/instrument/mapping/base.py

@@ -76,8 +76,10 @@ def pulse(
         **kwargs,
     ) -> None:
         """Defining qumada pulse. Requires proper implementation for each instrument"""
-        raise Exception("Pulse not properly implemented for this instrument!\
-                        You cannot use pulsed measurements with this instrument.")
+        raise Exception(
+            "Pulse not properly implemented for this instrument!\
+                        You cannot use pulsed measurements with this instrument."
+        )
 
     @abstractmethod
     def setup_trigger_in(self, trigger_settings: dict) -> None: