[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/qumada/instrument/buffers/dummy_dmm_buffer.py

@@ -22,6 +22,7 @@
 
 @author: till3
 """
+
 from __future__ import annotations
 
 import numpy as np

src/qumada/instrument/buffers/mfli_buffer.py

@@ -136,10 +136,8 @@ def num_points(self) -> int | None:
     @num_points.setter
     def num_points(self, num_points) -> None:
         if num_points > 8_388_608:
-            raise BufferException(
-                "Buffer is to small for this measurement. \
-                                  Please reduce the number of data points"
-            )
+            raise BufferException("Buffer is to small for this measurement. \
+                                  Please reduce the number of data points")
         self._num_points = int(num_points)
 
     # TODO: Define setter for other settings (e.g. burst_duration, num_bursts etc)
@@ -179,10 +177,8 @@ def _set_num_points(self) -> None:
                 self._num_bursts = int(self.settings["num_bursts"])
                 self._burst_duration = self.settings["duration"] / self._num_bursts
             else:
-                logger.info(
-                    "You have specified neither burst_duration nor num_bursts. \
-                      Using duration as burst_duration!"
-                )
+                logger.info("You have specified neither burst_duration nor num_bursts. \
+                      Using duration as burst_duration!")
                 self._burst_duration = self.settings["duration"]
 
         if "num_points" in self.settings:

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

@@ -146,10 +146,8 @@ def pulse(
                 assert parameter._short_name == "dc_constant_V"
         instruments = {parameter.root_instrument for parameter in parameters}
         if len(instruments) > 1:
-            raise Exception(
-                "Parameters are from more than one instrument. \
-                This would lead to non synchronized ramps."
-            )
+            raise Exception("Parameters are from more than one instrument. \
+                This would lead to non synchronized ramps.")
         qdac: QDac2 = instruments.pop()
         assert isinstance(qdac, QDac2)
         if delay < 1e-6:
@@ -177,10 +175,8 @@ def pulse(
         qdac.free_all_triggers()
 
     def setup_trigger_in():
-        raise Exception(
-            "QDac2 does not have a trigger input \
-            not yet supported!"
-        )
+        raise Exception("QDac2 does not have a trigger input \
+            not yet supported!")
 
     def clean_generators(self):
         for dc_list in self.dc_lists:
@@ -192,10 +188,8 @@ def query_instrument(parameters: list[Parameter]):
         """Check if all parameters are from the same instrument"""
         instruments = {parameter.root_instrument for parameter in parameters}
         if len(instruments) > 1:
-            raise Exception(
-                "Parameters are from more than one instrument. \
-                This would lead to non synchronized ramps."
-            )
+            raise Exception("Parameters are from more than one instrument. \
+                This would lead to non synchronized ramps.")
         qdac: QDac2 = instruments.pop()
         assert isinstance(qdac, QDac2)
         return qdac

src/qumada/instrument/mapping/base.py

@@ -192,10 +192,8 @@ def add_mapping_to_instrument(
         helper_mapping = _load_instrument_mapping(mapping)
         instrument._is_triggerable = False
     else:
-        raise ValueError(
-            "Mapping parameter has to be either of type \
-                         InstrumentMapping or str"
-        )
+        raise ValueError("Mapping parameter has to be either of type \
+                         InstrumentMapping or str")
 
     mapping = {}
     mapping["parameter_names"] = {

src/qumada/measurement/device_object.py

@@ -66,10 +66,8 @@ def add_terminal(self, terminal_name: str, type: str | None = None, terminal_dat
                 self.namespace[terminal_name.replace(" ", "_")] = self.terminals[terminal_name]
                 logger.warning(f"Added {terminal_name} to global namespace!")
             else:
-                raise Terminal_Exists_Exception(
-                    f"Terminal {terminal_name} already exists in global namespace. \
-                        Please remove it first!"
-                )
+                raise Terminal_Exists_Exception(f"Terminal {terminal_name} already exists in global namespace. \
+                        Please remove it first!")
 
     def remove_terminal(self, terminal_name: str):
         if terminal_name in self.terminals.keys():
@@ -420,15 +418,11 @@ def sweep_2D(
             if buffered is True:
                 if "num_points" in temp_buffer_settings.keys():
                     temp_buffer_settings["num_points"] = fast_num_points
-                    logger.warning(
-                        f"Temporarily changed buffer settings to match the \
-                        number of points specified {fast_num_points=}"
-                    )
+                    logger.warning(f"Temporarily changed buffer settings to match the \
+                        number of points specified {fast_num_points=}")
                 else:
-                    logger.warning(
-                        "Num_points not specified in buffer settings! fast_num_points value is \
-                        ignored and buffer settings are used to specify measurement!"
-                    )
+                    logger.warning("Num_points not specified in buffer settings! fast_num_points value is \
+                        ignored and buffer settings are used to specify measurement!")
 
                 script = Generic_2D_Sweep_buffered()
             else:
@@ -623,10 +617,8 @@ def pulsed_measurement(
 
         if "num_points" in temp_buffer_settings.keys():
             temp_buffer_settings["num_points"] = len(setpoints[0])
-            logger.warning(
-                "Temporarily changed buffer settings to match the \
-                number of points specified in the setpoints"
-            )
+            logger.warning("Temporarily changed buffer settings to match the \
+                number of points specified in the setpoints")
         else:
             raise Exception(
                 "For this kind of measurement, you have to specify the number of points in the buffer settings!"
@@ -761,10 +753,8 @@ def run_measurement(
 
         if "num_points" in temp_buffer_settings.keys():
             temp_buffer_settings["num_points"] = len(setpoints[0])
-            logger.warning(
-                "Temporarily changed buffer settings to match the \
-                number of points specified in the setpoints"
-            )
+            logger.warning("Temporarily changed buffer settings to match the \
+                number of points specified in the setpoints")
         else:
             raise Exception(
                 "For this kind of measurement, you have to specify the number of points in the buffer settings!"
@@ -992,10 +982,8 @@ def _set_limits(self):
             raise ValueError(f"Invalid limits provided for {self._parent.name} {self.name}")
         param = self.instrument_parameter
         if not isinstance(param, Parameter):
-            logger.exception(
-                f"Cannot set limits to {self._parent.name} {self.name} \
-                             as no valid instrument parameter was assigned to it!"
-            )
+            logger.exception(f"Cannot set limits to {self._parent.name} {self.name} \
+                             as no valid instrument parameter was assigned to it!")
         else:
             try:
                 if self._limit_validator in param.validators:
@@ -1108,10 +1096,8 @@ def measured_ramp(
                     f"Temporarily changed buffer settings to match the number of points specified {num_points=}"
                 )
             else:
-                logger.warning(
-                    "Num_points not specified in buffer settings! fast_num_points value is \
-                        ignored and buffer settings are used to specify measurement!"
-                )
+                logger.warning("Num_points not specified in buffer settings! fast_num_points value is \
+                        ignored and buffer settings are used to specify measurement!")
             if backsweep is True:
                 script = Generic_1D_Hysteresis_buffered()
             else:

src/qumada/measurement/doNd_enhanced/doNd_enhanced.py

@@ -391,10 +391,8 @@ def do1d_parallel_asym(
                         break
                     else:
                         warnings.warn("Break condition was met.")
-                        print(
-                            "Break condition was met. This meassage pops up alone \
-                               if there is some issue with warning.warn"
-                        )
+                        print("Break condition was met. This meassage pops up alone \
+                               if there is some issue with warning.warn")
                         raise BreakConditionInterrupt("Break condition was met.")
 
     param_set[0].post_delay = original_delay

src/qumada/measurement/measurement.py

@@ -126,10 +126,8 @@ def add_gate_parameter(self, parameter_name: str, gate_name: str = None, paramet
             parameter (Parameter): Custom parameter. Set this, if you want to set a custom parameter. Defaults to None.
         """
         if parameter_name not in MeasurementScript.PARAMETER_NAMES:
-            raise NameError(
-                f'parameter_name "{parameter_name}" not in MeasurementScript.PARAMETER_NAMES. \
-                            Allowed parameters are listed in qumada.instrument.parameter_whitelists'
-            )
+            raise NameError(f'parameter_name "{parameter_name}" not in MeasurementScript.PARAMETER_NAMES. \
+                            Allowed parameters are listed in qumada.instrument.parameter_whitelists')
         if not gate_name:
             self.gate_parameters[parameter_name] = parameter
         else:
@@ -309,10 +307,8 @@ def generate_lists(self) -> None:
                     try:
                         self.compensating_parameters_values.append(self.properties[gate][parameter]["value"])
                     except KeyError as e:
-                        print(
-                            f"No value assigned for compensating parameter \
-                              {self.compensating_parameters[-1]}"
-                        )
+                        print(f"No value assigned for compensating parameter \
+                              {self.compensating_parameters[-1]}")
                         raise e
                     try:
                         leverarms = self.properties[gate][parameter]["leverarms"]
@@ -328,20 +324,16 @@ def generate_lists(self) -> None:
                             comp_list.append({"gate": entry["terminal"], "parameter": entry["parameter"]})
                         self.compensated_parameters.append(comp_list)
                     except KeyError as e:
-                        print(
-                            f"The terminal to be compensated for with {self.compensating_parameters[-1]} \
+                        print(f"The terminal to be compensated for with {self.compensating_parameters[-1]} \
                             is not properly specified! Make sure to define a dictionary with \
-                            terminal and parameter as keys."
-                        )
+                            terminal and parameter as keys.")
                         raise e
                     try:
                         limits = self.properties[gate][parameter]["limits"]
                         self.compensating_limits.append(limits)
                     except KeyError as e:
-                        print(
-                            f"No limits assigned to compensating parameter \
-                              {self.compensating_parameters[-1]}!"
-                        )
+                        print(f"No limits assigned to compensating parameter \
+                              {self.compensating_parameters[-1]}!")
                         raise e
 
                 elif self.properties[gate][parameter]["type"].find("dynamic") >= 0:
@@ -352,29 +344,23 @@ def generate_lists(self) -> None:
                             try:
                                 assert self.properties[gate][parameter]["num_points"] == self.buffered_num_points
                             except AssertionError:
-                                logger.warning(
-                                    f"Number of datapoints from buffer_settings\
+                                logger.warning(f"Number of datapoints from buffer_settings\
                                     and gate_parameters do not match. Using \
                                     the value from the buffer settings: \
-                                    {self.buffered_num_points}"
-                                )
+                                    {self.buffered_num_points}")
                         elif "setpoints" in self.properties[gate][parameter].keys():
                             try:
                                 assert len(self.properties[gate][parameter]["setpoints"]) == self.buffered_num_points
                             except AssertionError:
-                                logger.warning(
-                                    f"Number of datapoints from buffer_settings\
+                                logger.warning(f"Number of datapoints from buffer_settings\
                                     and gate_parameters do not match. Using \
                                     the value from the buffer settings: \
-                                    {self.buffered_num_points}"
-                                )
+                                    {self.buffered_num_points}")
 
                         else:
-                            logger.info(
-                                "No num_points or setpoints given for\
+                            logger.info("No num_points or setpoints given for\
                                          buffered measurement. The value from \
-                                         buffer_settings is used"
-                            )
+                                         buffer_settings is used")
                         try:
                             self.dynamic_sweeps.append(
                                 LinSweep(
@@ -514,31 +500,25 @@ def initialize(self, dyn_ramp_to_val=False, inactive_dyn_channels: list | None =
                             try:
                                 assert self.properties[gate][parameter]["num_points"] == self.buffered_num_points
                             except AssertionError:
-                                logger.warning(
-                                    f"Number of datapoints from buffer_settings\
+                                logger.warning(f"Number of datapoints from buffer_settings\
                                     and gate_parameters do not match. Using \
                                     the value from the buffer settings: \
-                                    {self.buffered_num_points}"
-                                )
+                                    {self.buffered_num_points}")
                                 self.properties[gate][parameter]["num_points"] = self.buffered_num_points
 
                         elif "setpoints" in self.properties[gate][parameter].keys():
                             try:
                                 assert len(self.properties[gate][parameter]["setpoints"]) == self.buffered_num_points
                             except AssertionError:
-                                logger.warning(
-                                    f"Number of datapoints from buffer_settings\
+                                logger.warning(f"Number of datapoints from buffer_settings\
                                     and gate_parameters do not match. Using \
                                     the value from the buffer settings: \
-                                    {self.buffered_num_points}"
-                                )
+                                    {self.buffered_num_points}")
 
                         else:
-                            logger.info(
-                                "No num_points or setpoints given for\
+                            logger.info("No num_points or setpoints given for\
                                          buffered measurement. The value from \
-                                         buffer_settings is used"
-                            )
+                                         buffer_settings is used")
                     #     try:
                     #         self.dynamic_sweeps.append(
                     #             LinSweep(
@@ -748,10 +728,8 @@ def reset(self) -> None:
         Resets all static/dynamic parameters to their value/start value.
         TODO: Remove! Since initialize() does only create lists one, there is no advantage of using reset().
         """
-        logger.warning(
-            "The reset() method is deprecated and will be removed in a future release! \
-                        It is recommended to replace all calls of reset() with initialize()"
-        )
+        logger.warning("The reset() method is deprecated and will be removed in a future release! \
+                        It is recommended to replace all calls of reset() with initialize()")
         ramp_rate = self.settings.get("ramp_rate", 0.3)
         setpoint_intervall = self.settings.get("setpoint_intervall", 0.1)
         for gate, parameters in self.gate_parameters.items():