pymodaq 4.3.0__py3-none-any.whl → 4.3.2__py3-none-any.whl

pymodaq/control_modules/move_utility_classes.py

@@ -78,7 +78,11 @@ class MoveCommand:
         self.value = value
 
 
-def comon_parameters_fun(is_multiaxes=False, axes_names=[], axis_names=[], master=True, epsilon=config('actuator', 'epsilon_default')):
+def comon_parameters_fun(is_multiaxes = False,
+                         axes_names = [],
+                         axis_names: Union[List, Dict] = [],
+                         master = True,
+                         epsilon = config('actuator', 'epsilon_default')):
     """Function returning the common and mandatory parameters that should be on the actuator plugin level
 
     Parameters
@@ -212,6 +216,7 @@ class DAQ_Move_base(QObject):
         self.move_is_done = False
         self.parent = parent
         self.stage = None
+        self.controller = None
         self.status = edict(info="", controller=None, stage=None, initialized=False)
 
         self._ispolling = True
@@ -225,10 +230,7 @@ class DAQ_Move_base(QObject):
                 self.settings.restoreState(params_state.saveState())
 
         self.settings.sigTreeStateChanged.connect(self.send_param_status)
-        # self.settings.child('multiaxes',
-        #                     'axis').sigLimitsChanged.connect(lambda param,
-        #                                                             limits: self.send_param_status(
-        #    param, [(param, 'limits', None)]))
+
         if parent is not None:
             self._title = parent.title
         else:

pymodaq/dashboard.py

@@ -43,6 +43,7 @@ get_instrument_plugins()
 
 logger = set_logger(get_module_name(__file__))
 
+
 config = configmod.Config()
 
 local_path = configmod.get_set_local_dir()

pymodaq/extensions/bayesian/utils.py

@@ -116,10 +116,13 @@ class BayesianAlgorithm:
 
     @property
     def best_individual(self) -> Union[np.ndarray, None]:
-        max_param = self._algo.max.get('params', None)
-        if max_param is None:
+        if self._algo.max is None:
             return None
-        return self._algo.space.params_to_array(max_param)
+        else:
+            max_param = self._algo.max.get('params', None)
+            if max_param is None:
+                return None
+            return self._algo.space.params_to_array(max_param)
 
     def stopping(self, ind_iter: int, stopping_parameters: StoppingParameters):
         if ind_iter >= stopping_parameters.niter:

pymodaq/extensions/utils.py

@@ -47,11 +47,13 @@ def get_extensions():
                 for mod in modules:
                     mod_in = importlib.import_module(f'{pkg.value}.extensions.{mod}')
                     if hasattr(mod_in, 'EXTENSION_NAME'):
-                        extension_import.append({'pkg': pkg.value, 'module': mod, 'name': mod_in.EXTENSION_NAME,
+                        extension_import.append({'pkg': pkg.value, 'module': mod,
+                                                 'name': mod_in.EXTENSION_NAME,
                                                  'class_name': mod_in.CLASS_NAME})
 
             except Exception as e:  # pragma: no cover
-                logger.warning(f'Impossible to import the {pkg.value}.extensions.{mod} extension: {str(e)}')
+                logger.warning(f'Impossible to import the {pkg.value}.extensions.{mod} extension: '
+                               f'{str(e)}')
 
     return extension_import
 

pymodaq/resources/VERSION

@@ -1,2 +1,2 @@
-version = '4.3.0'
+version = '4.3.2'
 

pymodaq/utils/config.py

@@ -20,7 +20,7 @@ except:
     USER = 'unknown_user'
 
 CONFIG_BASE_PATH = Path(environ['PROGRAMDATA']) if sys.platform == 'win32' else \
-    Path('Library/Application Support') if sys.platform == 'darwin' else Path('/etc')
+    Path('/Library/Application Support') if sys.platform == 'darwin' else Path('/etc')
 
 
 KeyType = TypeVar('KeyType')

{pymodaq-4.3.0.dist-info → pymodaq-4.3.2.dist-info}/METADATA

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

{pymodaq-4.3.0.dist-info → pymodaq-4.3.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pymodaq/__init__.py,sha256=boHjxPnKEAQUmOHKbnxlI8DHP1eM5IKSrrnd1EqkvHg,4295
-pymodaq/dashboard.py,sha256=CxLywGorw8RcLLnF0dlbO1EeiDLkT7qhi37Ov2qlRbQ,64521
+pymodaq/dashboard.py,sha256=9SN2974L0FA-mUBWgAZ12aLzZmmFrQeUojdj3jstv44,64522
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,7 +8,7 @@ pymodaq/control_modules/daq_move_ui.py,sha256=euA8_utFfiscd9ahZxRTqqTiCSrNB4CKCL
 pymodaq/control_modules/daq_viewer.py,sha256=5CYmdWHGE7sQApeMfdWNV3zbPyoxxYtzFlQ1PaEw4fI,57883
 pymodaq/control_modules/daq_viewer_ui.py,sha256=FWP3jdIOR9vTgYqNaaodteGZ3dwgQ1GdWKrOpOAuSrs,15693
 pymodaq/control_modules/mocks.py,sha256=hh_xSWp9g1UV3NAQVD9Ft9tNWfTsSvKU0OU0trgzP2w,1956
-pymodaq/control_modules/move_utility_classes.py,sha256=GUgCQ-UxqOPFNb6-BaGLhhd8cn8UHtqk8WNoFzbFYXc,33653
+pymodaq/control_modules/move_utility_classes.py,sha256=bdO0O8qMcU4siW879XU7AAhcTLZz1s7vH_paDAD5G-8,33544
 pymodaq/control_modules/utils.py,sha256=5YdSwq_lFJm7IalYWe_Hn1U4LUoUmo1gedvV9UguU0Y,20016
 pymodaq/control_modules/viewer_utility_classes.py,sha256=mhUNZCx0SzaZJtxuKBMDcW5BfCY7hGPowJyQtQquwNE,26704
 pymodaq/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,10 +40,10 @@ pymodaq/extensions/daq_logger.py,sha256=hEAb98fv1qJxcH9NPvaiLp1SPWkBVBwpujJhuyAi
 pymodaq/extensions/daq_scan.py,sha256=CGBPrhLRHPmFJunKQ1aK5RgToXemzNEPdYSHn7e36DE,49414
 pymodaq/extensions/daq_scan_ui.py,sha256=bYJaWBLQMl2Yu1PAxc-bCldh4keWXd6l12ttrHqExE0,10181
 pymodaq/extensions/h5browser.py,sha256=eQZ8YhPHdiBCyHIn1JJJLn7OgZsc1XlcETgqdafofZs,1140
-pymodaq/extensions/utils.py,sha256=MEWdfJUp1EMnmwGnVQ61eGFZJ7fne29pEEDD6Jrk50M,1942
+pymodaq/extensions/utils.py,sha256=3cF3-7hVxYY1xxi0Kz-ck_yHcWyO5gAFFghf8Zo01Z8,2026
 pymodaq/extensions/bayesian/__init__.py,sha256=QMV9tq8Axi6YjoGj4UguBO8Zvuh26r5s91bm6YU7Itk,55
 pymodaq/extensions/bayesian/bayesian_optimisation.py,sha256=zB6DoyHx6nsKHsl3G4T0Hsw8npl80gdEIwvNfx4DCrU,30033
-pymodaq/extensions/bayesian/utils.py,sha256=7arnxz_nDtlOFwe6QQfV-nFciCWw3ZcE8YUNd_fce1k,15455
+pymodaq/extensions/bayesian/utils.py,sha256=1m_NpYMr-Swg2ImtMvbh-XOxutkAVwc0M2BWeK_NMIg,15544
 pymodaq/extensions/pid/__init__.py,sha256=YP5CemFZ54mFlFIhktct2SeOmkAuvxQm2y1Fiq5HiMQ,534
 pymodaq/extensions/pid/daq_move_PID.py,sha256=EiTJz4fLcjVL1UxnFREu2oZEz2nl-iL5xgxf83YG85M,3090
 pymodaq/extensions/pid/pid_controller.py,sha256=y0LTF_3N4mKEeRXyvgPycIy4FMPr-kRxLHgl1BV_YLc,28453
@@ -57,7 +57,7 @@ pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.py,sha256=1u7hWDaiwsZ
 pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.ui,sha256=PyzbCWPMkh5oIYYteZczXyWMeHKW9EJmM1QlzXhnyTk,7037
 pymodaq/post_treatment/daq_measurement/daq_measurement_main.py,sha256=CAKwcWMOD86aXB8mbdxOK7e8nZRos5d59FzDtqK1QoY,17093
 pymodaq/post_treatment/daq_measurement/process_from_QtDesigner_DAQ_Measurement_GUI.bat,sha256=e1tu2A67MS9fk3jhriF6saQgRxWIucIvNW92iWXFP6E,164
-pymodaq/resources/VERSION,sha256=cOXotjj1xwm8kdYjV2xWBVYiKHhNsCQgmR8yiSQ0BTg,19
+pymodaq/resources/VERSION,sha256=sjnuS49ZtKszCS7BjQ3fAuL5c6ZSFLfQRHwgQvKEjxk,19
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/config_template.toml,sha256=d3pofgIK5FxaRMELAI1qEsRcMD3GlYd87zZjDj9G9m0,3210
 pymodaq/resources/preset_default.xml,sha256=Dt8iWLwPPOPtcG00JCVP-mh-G7KC6B0YN8hd8RQdnNI,27256
@@ -307,7 +307,7 @@ pymodaq/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/array_manipulation.py,sha256=uMdiVVR2mU7j6Z4DKL5VGhUPqiWvFX2YK7RLMGdLyC8,10415
 pymodaq/utils/calibration_camera.py,sha256=d3aAu0izXOdeLs-vyBaFfBuvyDGT3O-SreTuyd0Kvs4,8921
 pymodaq/utils/chrono_timer.py,sha256=rwX8apS8B-IKhA0Cp2H9tLz0BRN7G3Pg5ptozvd3MKM,7244
-pymodaq/utils/config.py,sha256=0QqoBJC4ECuIeh1UsvUQqhxkKl7Vfgi4iERp-6qNWAc,16202
+pymodaq/utils/config.py,sha256=u-Q4af-tgXG7h8YitMGSPkigDxGoOYSEMHERQCF9mAM,16203
 pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
 pymodaq/utils/daq_utils.py,sha256=0jTrbT0aaZr3KaTgeDicmK9FbVnu3iaWBmNHnNJpr3A,28050
 pymodaq/utils/data.py,sha256=7m48jht2GOerMNszM5Pwvv5bdYHa3uTPc8UI2YQPmJE,110327
@@ -437,8 +437,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
 pymodaq/utils/tcp_ip/mysocket.py,sha256=StAWj8dzHeMnbLj68Sel81uWFy-YkKVNRnVf7gXrESI,3452
 pymodaq/utils/tcp_ip/serializer.py,sha256=oTQ24JNln_vRX4YADitTYiJplwFIdsta1ZDp6TOGMCA,27562
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=xIMTNgVW_rKK0yTi4FDNFLf85-Akb27Jz2LdrvOrP68,30660
-pymodaq-4.3.0.dist-info/METADATA,sha256=zCt803_8R_s7K3cGfEskxX3Qa5SnUrZjFuxslfSfqQI,7657
-pymodaq-4.3.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-pymodaq-4.3.0.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
-pymodaq-4.3.0.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-4.3.0.dist-info/RECORD,,
+pymodaq-4.3.2.dist-info/METADATA,sha256=mpbKUYitkvphHcpbDoq-xnHedsXFQHmEclV9UCVyLgA,7657
+pymodaq-4.3.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+pymodaq-4.3.2.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
+pymodaq-4.3.2.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-4.3.2.dist-info/RECORD,,