pymodaq 5.0.17__tar.gz → 5.0.18__tar.gz

{pymodaq-5.0.17 → pymodaq-5.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.17
+Version: 5.0.18
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ

{pymodaq-5.0.17 → pymodaq-5.0.18}/src/pymodaq/control_modules/daq_move.py

@@ -512,14 +512,21 @@ class DAQ_Move(ParameterControlModule):
         elif status.command == 'units':
             self.units = status.attribute
 
-    def _check_data_type(self, data_act: Union[list[np.ndarray], float, DataActuator]) -> DataActuator:
+    def _check_data_type(self, data_act: Union[list, np.ndarray, Number, DataActuator]) -> DataActuator:
         """ Make sure the data is a DataActuator
 
         Mostly to make sure DAQ_Move is backcompatible with old style plugins
         """
         if isinstance(data_act, list):  # backcompatibility
-            data_act = data_act[0]
-        if isinstance(data_act, np.ndarray):  # backcompatibility
+            if isinstance(data_act[0], Number):
+                data_act = DataActuator(data=[np.atleast_1d(val) for val in data_act], units=self.units)
+            elif isinstance(data_act[0], np.ndarray):
+                data_act = DataActuator(data=data_act, units=self.units)
+            elif isinstance(data_act[0], DataActuator):
+                data_act = data_act[0]
+            else:
+                raise TypeError('Unknown data type')
+        elif isinstance(data_act, np.ndarray):  # backcompatibility
             data_act = DataActuator(data=[data_act], units=self.units)
         data_act.name = self.title  # for the DataActuator name to be the title of the DAQ_Move
         if (not Unit(self.units).is_compatible_with(Unit(data_act.units)) and

{pymodaq-5.0.17 → pymodaq-5.0.18}/src/pymodaq/extensions/bayesian/bayesian_optimisation.py

@@ -12,7 +12,7 @@ from pymodaq_utils import utils
 from pymodaq_utils import config as config_mod
 from pymodaq_utils.enums import BaseEnum
 
-from pymodaq_gui.config import ConfigSaverLoader
+
 from pymodaq_utils.logger import set_logger, get_module_name
 
 from pymodaq_gui.plotting.data_viewers.viewer0D import Viewer0D
@@ -23,6 +23,11 @@ from pymodaq_gui import utils as gutils
 from pymodaq_gui.parameter import utils as putils
 from pymodaq_gui.h5modules.saving import H5Saver
 
+try:
+    from pymodaq_gui.config_saver_loader import ConfigSaverLoader
+except ModuleNotFoundError:
+    from pymodaq_gui.config import ConfigSaverLoader #backcompatibility
+
 from pymodaq_data.h5modules.data_saving import DataEnlargeableSaver
 
 

{pymodaq-5.0.17 → pymodaq-5.0.18}/src/pymodaq/utils/config.py

@@ -1,6 +1,9 @@
 from pymodaq_utils.config import (BaseConfig, Config, ConfigError, get_set_config_dir,
                                   USER, CONFIG_BASE_PATH, get_set_local_dir)
-from pymodaq_gui.config import get_set_roi_path
+try:
+    from pymodaq_gui.config_saver_loader import get_set_roi_path
+except ModuleNotFoundError:
+    from pymodaq_gui.config import get_set_roi_path
 
 
 def get_set_preset_path():

{pymodaq-5.0.17 → pymodaq-5.0.18}/src/pymodaq/utils/scanner/scan_factory.py

@@ -24,7 +24,12 @@ from pymodaq_gui.managers.parameter_manager import ParameterManager, Parameter
 from pymodaq_data.data import Axis, DataDistribution
 
 from pymodaq.utils.scanner.scan_config import ScanConfig
-from pymodaq_gui.config import ConfigSaverLoader
+try:
+    from pymodaq_gui.config_saver_loader import ConfigSaverLoader
+except ModuleNotFoundError:
+    from pymodaq_gui.config import ConfigSaverLoader
+
+from pymodaq.utils.config import Config as ControlModulesConfig
 
 
 if TYPE_CHECKING: