pymodaq 4.1.0__py3-none-any.whl → 4.1.1__py3-none-any.whl

pymodaq/control_modules/daq_move.py

@@ -172,7 +172,7 @@ class DAQ_Move(ParameterManager, ControlModule):
         elif cmd.command == 'rel_value':
             self._relative_value = cmd.attribute
 
-    def append_data(self, data: DataToExport = None, where: Union[Node, str] = None):
+    def append_data(self, dte: DataToExport = None, where: Union[Node, str] = None):
         """Appends current DataToExport to an ActuatorEnlargeableSaver
 
         Parameters
@@ -183,9 +183,9 @@ class DAQ_Move(ParameterManager, ControlModule):
         --------
         ActuatorEnlargeableSaver
         """
-        if data is None:
-            data = DataToExport(name=self.title, data=[self._current_value])
-        self._add_data_to_saver(data, where=where)
+        if dte is None:
+            dte = DataToExport(name=self.title, data=[self._current_value])
+        self._add_data_to_saver(dte, where=where)
         # todo: test this for logging
 
     def _add_data_to_saver(self, data: DataToExport, where=None, **kwargs):

pymodaq/extensions/daq_scan.py

@@ -70,7 +70,8 @@ class DAQScan(QObject, ParameterManager):
     live_data_1D_signal = Signal(list)
 
     params = [
-        {'title': 'Time Flow:', 'name': 'time_flow', 'type': 'group', 'expanded': False, 'children': [
+        {'title': 'Time Flow:', 'name': 'time_flow', 'type': 'group', 'expanded': False,
+         'children': [
             {'title': 'Wait time step (ms)', 'name': 'wait_time', 'type': 'int', 'value': 0,
              'tip': 'Wait time in ms after each step of acquisition (move and grab)'},
             {'title': 'Wait time between (ms)', 'name': 'wait_time_between', 'type': 'int',
@@ -85,11 +86,13 @@ class DAQScan(QObject, ParameterManager):
         {'title': 'Plotting options', 'name': 'plot_options', 'type': 'group', 'children': [
             {'title': 'Get data', 'name': 'plot_probe', 'type': 'bool_push'},
             {'title': 'Group 0D data:', 'name': 'group0D', 'type': 'bool', 'value': True},
-            {'title': 'Plot 0Ds:', 'name': 'plot_0d', 'type': 'itemselect'},
-            {'title': 'Plot 1Ds:', 'name': 'plot_1d', 'type': 'itemselect'},
+            {'title': 'Plot 0Ds:', 'name': 'plot_0d', 'type': 'itemselect', 'checkbox': True},
+            {'title': 'Plot 1Ds:', 'name': 'plot_1d', 'type': 'itemselect', 'checkbox': True},
             {'title': 'Prepare Viewers', 'name': 'prepare_viewers', 'type': 'bool_push'},
-            {'title': 'Plot at each step?', 'name': 'plot_at_each_step', 'type': 'bool', 'value': True},
-            {'title': 'Refresh Plots (ms)', 'name': 'refresh_live', 'type': 'int', 'value': 1000, 'visible': False},
+            {'title': 'Plot at each step?', 'name': 'plot_at_each_step', 'type': 'bool',
+             'value': True},
+            {'title': 'Refresh Plots (ms)', 'name': 'refresh_live', 'type': 'int',
+             'value': 1000, 'visible': False},
             ]},
     ]
 
@@ -679,6 +682,14 @@ class DAQScan(QObject, ParameterManager):
     def save_temp_live_data(self, scan_data: ScanDataTemp):
         if scan_data.scan_index == 0:
             nav_axes = self.scanner.get_nav_axes()
+            Naverage = self.settings['scan_options', 'scan_average']
+            if Naverage > 1:
+                for nav_axis in nav_axes:
+                    nav_axis.index += 1
+                nav_axes.append(data_mod.Axis('Average',
+                                              data=np.linspace(0, Naverage - 1, Naverage),
+                                              index=0))
+
             self.extended_saver.add_nav_axes(self.h5temp.raw_group, nav_axes)
 
         self.extended_saver.add_data(self.h5temp.raw_group, scan_data.data, scan_data.indexes,
@@ -694,8 +705,14 @@ class DAQScan(QObject, ParameterManager):
             average_axis = None
         try:
             self.live_plotter.load_plot_data(group_0D=self.settings['plot_options', 'group0D'],
-                                             average_axis=average_axis, average_index=self.ind_average,
-                                             target_at=self.scanner.positions[self.ind_scan])
+                                             average_axis=average_axis,
+                                             average_index=self.ind_average,
+                                             target_at=self.scanner.positions[self.ind_scan],
+                                             last_step=(self.ind_scan ==
+                                                        self.scanner.positions.size - 1 and
+                                                        self.ind_average ==
+                                                        self.settings[
+                                                            'scan_options', 'scan_average'] - 1))
         except Exception as e:
             logger.exception(str(e))
     #################
@@ -1100,7 +1117,8 @@ class DAQScanAcquisition(QObject):
                 if self.Naverage > 1:
                     for nav_axis in nav_axes:
                         nav_axis.index += 1
-                    nav_axes.append(data_mod.Axis('Average', data=np.linspace(0, self.Naverage - 1, self.Naverage),
+                    nav_axes.append(data_mod.Axis('Average', data=np.linspace(0, self.Naverage - 1,
+                                                                              self.Naverage),
                                                   index=0))
                 self.module_and_data_saver.add_nav_axes(nav_axes)
 

pymodaq/post_treatment/load_and_plot.py

@@ -59,9 +59,12 @@ class LoaderPlotter:
     def data(self) -> DataToExport:
         return self._data
 
-    def load_data(self, filter_dims: List[Union[DataDim, str]] = None, filter_full_names: List[str] = None,
-                  remove_navigation: bool = True, group_0D=False, average_axis: int=None, average_index: int = 0):
-        """Load Data from the h5 node of the dataloader and apply some filtering/manipulation before plotting
+    def load_data(self, filter_dims: List[Union[DataDim, str]] = None,
+                  filter_full_names: List[str] = None, remove_navigation: bool = True,
+                  group_0D=False, average_axis: int=None, average_index: int = 0,
+                  last_step=False):
+        """Load Data from the h5 node of the dataloader and apply some filtering/manipulation before
+        plotting
 
         Parameters
         ----------
@@ -70,14 +73,17 @@ class LoaderPlotter:
         filter_full_names: List[str]
             load only data matching these names
         remove_navigation: bool
-            if True, make navigation axes as signal axes (means DataND could be plotted on Viewer1D or
-            Viewer2D by concatenation)
+            if True, make navigation axes as signal axes (means DataND could be plotted on Viewer1D
+            or Viewer2D by concatenation)
         group_0D: bool
             if True, group all (initial) Data0D into one DataFromPlugins
         average_axis: int or None
-            which axis in the data shapes should be interpereted as the average (in general it is 0 or None)
+            which axis in the data shapes should be interpereted as the average (in general it is 0
+            or None)
         average_index: int
             which step in the averaging process are we in.
+        last_step: bool
+            tells if this is the very last step of the (averaged) scan
 
         Returns
         -------
@@ -88,14 +94,15 @@ class LoaderPlotter:
         self.dataloader.load_all('/', self._data)
 
         if average_axis is not None:
-            self.average_axis(average_axis, average_index)
+            self.average_axis(average_axis, average_index, last_step=last_step)
 
         if filter_dims is not None:
             filter_dims[:] = [enum_checker(DataDim, dim) for dim in filter_dims]
             self._data.data[:] = [data for data in self._data if data.dim in filter_dims]
 
         if filter_full_names is not None:
-            self._data.data[:] = [data for data in self._data if data.get_full_name() in filter_full_names]
+            self._data.data[:] = [data for data in self._data if data.get_full_name() in
+                                  filter_full_names]
 
         if group_0D:  # 0D initial data
             self.group_0D_data()
@@ -105,31 +112,39 @@ class LoaderPlotter:
 
         return self._data
 
-    def average_axis(self, average_axis, average_index) -> None:
+    def average_axis(self, average_axis, average_index, last_step=False) -> None:
         """ Average the data along their average axis
 
         Parameters
         ----------
         average_axis: int or None
-            which axis in the data shapes should be interpereted as the average (in general it is 0 or None)
+            which axis in the data shapes should be interpreted as the average
+            (in general it is 0 or None)
         average_index: int
             which step in the averaging process are we in.
+        last_step: bool
+            tells if this is the very last step of the (averaged) scan
         """
         for ind, data in enumerate(self._data):
             current_data = data.inav[average_index, ...]
-            if average_index == 0:
-                data_to_append = data.inav[0:average_index + 1, ...]
-            else:
-                data_to_append = data.inav[0:average_index + 1, ...].mean(axis=average_axis)
-            data_to_append.labels = [f'{label}_averaged' for label in data_to_append.labels]
-            current_data.append(data_to_append)
+            if average_index > 0:
+                if last_step:
+                    data_to_append = data.inav[0:, ...].mean(axis=average_axis)
+                else:
+                    if average_index == 1:
+                        data_to_append = data.inav[0, ...]
+                    else:
+                        data_to_append = data.inav[0:average_index, ...].mean(axis=average_axis)
+
+                data_to_append.labels = [f'{label}_averaged' for label in data_to_append.labels]
+                current_data.append(data_to_append)
             self._data[ind] = current_data
 
     def remove_navigation_axes(self):
         """Make the navigation axes as signal axes
 
-        transforms DataND into Data1D or Data2D or error... depending the exact shape of the data and the number of
-        navigation axes
+        transforms DataND into Data1D or Data2D or error... depending the exact shape of the data
+        and the number of navigation axes
         """
         for data in self._data:
             data.nav_indexes = ()
@@ -164,10 +179,17 @@ class LoaderPlotter:
         -----
         load_data
         """
-        if 'target_at' in kwargs:
-            target_at = kwargs.pop('target_at')
+
+        target_at = kwargs.pop('target_at') if 'target_at' in kwargs else None
+        last_step = kwargs.pop('last_step') if 'last_step' in kwargs else False
+
         self.load_data(**kwargs)
         self.show_data(target_at=target_at)
+        if (last_step and 'average_index' in kwargs and kwargs['average_index']
+                is not None):
+            kwargs['last_step'] = last_step
+            self.load_data(**kwargs)
+            self.show_data(target_at=target_at)
 
     def show_data(self, **kwargs):
         """Send data to their dedicated viewers
@@ -197,7 +219,8 @@ class LoaderPlotter:
         self._viewers = dict(zip(viewers_name, self.dispatcher.viewers))
         self._viewer_docks = dict(zip(viewers_name, self.dispatcher.viewer_docks))
 
-    def set_data_to_viewers(self, data: DataToExport, temp=False, target_at: Iterable[float] = None):
+    def set_data_to_viewers(self, data: DataToExport, temp=False,
+                            target_at: Iterable[float] = None):
         """Process data dimensionality and send appropriate data to their data viewers
 
         Parameters

pymodaq/resources/VERSION

@@ -1 +1 @@
-version = '4.1.0'
+version = '4.1.1'

pymodaq/utils/data.py

@@ -1588,6 +1588,13 @@ class DataWithAxes(DataBase):
         """convenience property to set attribute from axis_manager"""
         self.set_axes_manager(self.shape, axes=axes, nav_indexes=self.nav_indexes)
 
+    def axes_limits(self, axes_indexes: List[int] = None) -> List[Tuple[float, float]]:
+        """Get the limits of specified axes (all if axes_indexes is None)"""
+        if axes_indexes is None:
+            return [(axis.min(), axis.max()) for axis in self.axes]
+        else:
+            return [(axis.min(), axis.max()) for axis in self.axes if axis.index in axes_indexes]
+
     @property
     def sig_indexes(self):
         """convenience property to fetch attribute from axis_manager"""

pymodaq/utils/h5modules/data_saving.py

@@ -5,7 +5,7 @@ Created the 21/11/2022
 @author: Sebastien Weber
 """
 from time import time
-from typing import Union, List, Tuple
+from typing import Union, List, Tuple, Iterable
 
 import numpy as np
 
@@ -308,7 +308,8 @@ class DataSaverLoader(DataManagement):
                 bkg_nodes.append(node)
         return bkg_nodes
 
-    def get_data_arrays(self, where: Union[Node, str], with_bkg=False, load_all=False) -> List[np.ndarray]:
+    def get_data_arrays(self, where: Union[Node, str], with_bkg=False,
+                        load_all=False) -> List[np.ndarray]:
         """
 
         Parameters
@@ -338,15 +339,17 @@ class DataSaverLoader(DataManagement):
             getter = self._get_nodes
 
         if with_bkg:
-            return [np.atleast_1d(np.squeeze(array.read()-bkg.read())) for array, bkg in zip(getter(where), bkg_nodes)]
+            return [np.atleast_1d(np.squeeze(array.read()-bkg.read()))
+                    for array, bkg in zip(getter(where), bkg_nodes)]
         else:
             return [np.atleast_1d(np.squeeze(array.read())) for array in getter(where)]
 
     def load_data(self, where, with_bkg=False, load_all=False) -> DataWithAxes:
-        """Return a DataWithAxes object from the Data and Axis Nodes hanging from (or among) a given Node
+        """Return a DataWithAxes object from the Data and Axis Nodes hanging from (or among) a
+        given Node
 
-        Does not include navigation axes stored elsewhere in the h5file. The node path is stored in the DatWithAxis
-        using the attribute path
+        Does not include navigation axes stored elsewhere in the h5file. The node path is stored in
+        the DatWithAxis using the attribute path
 
         Parameters
         ----------
@@ -383,18 +386,21 @@ class DataSaverLoader(DataManagement):
             axes = self.get_axes(parent_node)
 
         extra_attributes = data_node.attrs.to_dict()
-        for name in ['TITLE', 'CLASS', 'VERSION', 'backend', 'source', 'data_dimension', 'distribution', 'label',
-                     'origin', 'nav_indexes', 'dtype', 'data_type', 'subdtype', 'shape', 'size', 'EXTDIM', 'path']:
+        for name in ['TITLE', 'CLASS', 'VERSION', 'backend', 'source', 'data_dimension',
+                     'distribution', 'label', 'origin', 'nav_indexes', 'dtype', 'data_type',
+                     'subdtype', 'shape', 'size', 'EXTDIM', 'path']:
             extra_attributes.pop(name, None)
 
         data = DataWithAxes(data_node.attrs['TITLE'],
-                            source=data_node.attrs['source'] if 'source' in data_node.attrs else 'raw',
+                            source=data_node.attrs['source'] if 'source' in data_node.attrs
+                            else 'raw',
                             dim=data_node.attrs['data_dimension'],
                             distribution=data_node.attrs['distribution'],
                             data=ndarrays,
                             labels=[node.attrs['label'] for node in data_nodes],
                             origin=data_node.attrs['origin'] if 'origin' in data_node.attrs else '',
-                            nav_indexes=data_node.attrs['nav_indexes'] if 'nav_indexes' in data_node.attrs else (),
+                            nav_indexes=data_node.attrs['nav_indexes'] if 'nav_indexes' in
+                                                                          data_node.attrs else (),
                             axes=axes,
                             path=data_node.path,
                             **extra_attributes)
@@ -575,7 +581,7 @@ class DataExtendedSaver(DataSaverLoader):
         where: Union[Node, str]
             the path of a given node or the node itself
         data: DataWithAxes
-        indexes: List[int]
+        indexes: Iterable[int]
             indexes where to save data in the init h5array (should have the same length as extended_shape and with values
             coherent with this shape
         """
@@ -591,7 +597,8 @@ class DataExtendedSaver(DataSaverLoader):
         for ind_data in range(len(data)):
             #todo check that getting with index is safe...
             array: CARRAY = self.get_node_from_index(where, ind_data)
-            array[tuple(indexes)] = data[ind_data]  # maybe use array.__setitem__(indexes, data[ind_data]) if it's not working
+            array[tuple(indexes)] = data[ind_data]
+            # maybe use array.__setitem__(indexes, data[ind_data]) if it's not working
 
 
 class DataToExportSaver:
@@ -619,11 +626,12 @@ class DataToExportSaver:
 
     @staticmethod
     def channel_formatter(ind: int):
-        """All DataWithAxes included in the DataToExport will be saved into a channel group indexed and
-        formatted as below"""
+        """All DataWithAxes included in the DataToExport will be saved into a channel group indexed
+        and formatted as below"""
         return f'CH{ind:02d}'
 
-    def add_data(self, where: Union[Node, str], data: DataToExport, settings_as_xml='', metadata=None):
+    def add_data(self, where: Union[Node, str], data: DataToExport, settings_as_xml='',
+                 metadata=None):
         """
 
         Parameters
@@ -642,8 +650,10 @@ class DataToExportSaver:
         dims = data.get_dim_presents()
         for dim in dims:
             dim_group = self._h5saver.get_set_group(where, dim)
-            for ind, dwa in enumerate(data.get_data_from_dim(dim)):  # dwa: DataWithAxes filtered by dim
-                dwa_group = self._h5saver.get_set_group(dim_group, self.channel_formatter(ind), dwa.name)
+            for ind, dwa in enumerate(data.get_data_from_dim(dim)):
+                # dwa: DataWithAxes filtered by dim
+                dwa_group = self._h5saver.get_set_group(dim_group, self.channel_formatter(ind),
+                                                        dwa.name)
                 # dwa_group = self._h5saver.add_ch_group(dim_group, dwa.name)
                 self._data_saver.add_data(dwa_group, dwa)
 
@@ -651,8 +661,10 @@ class DataToExportSaver:
         dims = data.get_dim_presents()
         for dim in dims:
             dim_group = self._h5saver.get_set_group(where, dim)
-            for ind, dwa in enumerate(data.get_data_from_dim(dim)):  # dwa: DataWithAxes filtered by dim
-                dwa_group = self._h5saver.get_set_group(dim_group, self.channel_formatter(ind), dwa.name)
+            for ind, dwa in enumerate(data.get_data_from_dim(dim)):
+                # dwa: DataWithAxes filtered by dim
+                dwa_group = self._h5saver.get_set_group(dim_group,
+                                                        self.channel_formatter(ind), dwa.name)
                 # dwa_group = self._get_node_from_title(dim_group, dwa.name)
                 if dwa_group is not None:
                     self._bkg_saver.add_data(dwa_group, dwa, save_axes=False)
@@ -679,8 +691,8 @@ class DataToExportEnlargeableSaver(DataToExportSaver):
         self._axis_name = axis_name
         self._axis_units = axis_units
 
-    def add_data(self, where: Union[Node, str], data: DataToExport, axis_value: Union[float, np.ndarray],
-                 settings_as_xml='', metadata=None):
+    def add_data(self, where: Union[Node, str], data: DataToExport,
+                 axis_value: Union[float, np.ndarray], settings_as_xml='', metadata=None):
         """
 
         Parameters
@@ -712,7 +724,8 @@ class DataToExportEnlargeableSaver(DataToExportSaver):
 class DataToExportTimedSaver(DataToExportEnlargeableSaver):
     """Specialized DataToExportEnlargeableSaver to save data as a function of a time axis
 
-    Only one element ca be added at a time, the time axis value are enlarged using the data to be added timestamp
+    Only one element ca be added at a time, the time axis value are enlarged using the data to be
+    added timestamp
 
     Notes
     -----
@@ -721,8 +734,10 @@ class DataToExportTimedSaver(DataToExportEnlargeableSaver):
     def __init__(self, h5saver: H5Saver):
         super().__init__(h5saver, 'time', 's')
 
-    def add_data(self, where: Union[Node, str], data: DataToExport, settings_as_xml='', metadata=None):
-        super().add_data(where, data, axis_value=data.timestamp, settings_as_xml=settings_as_xml, metadata=metadata)
+    def add_data(self, where: Union[Node, str], data: DataToExport, settings_as_xml='',
+                 metadata=None):
+        super().add_data(where, data, axis_value=data.timestamp, settings_as_xml=settings_as_xml,
+                         metadata=metadata)
 
 
 class DataToExportExtendedSaver(DataToExportSaver):
@@ -755,7 +770,7 @@ class DataToExportExtendedSaver(DataToExportSaver):
             for axis in axes:
                 self._nav_axis_saver.add_axis(nav_group, axis)
 
-    def add_data(self, where: Union[Node, str], data: DataToExport, indexes: List[int],
+    def add_data(self, where: Union[Node, str], data: DataToExport, indexes: Iterable[int],
                  distribution=DataDistribution['uniform'],
                  settings_as_xml='', metadata={}):
         """
@@ -766,8 +781,8 @@ class DataToExportExtendedSaver(DataToExportSaver):
             the path of a given node or the node itself
         data: DataToExport
         indexes: List[int]
-            indexes where to save data in the init h5array (should have the same length as extended_shape and with values
-            coherent with this shape
+            indexes where to save data in the init h5array (should have the same length as
+            extended_shape and with values coherent with this shape
         settings_as_xml: str
             The settings parameter as an XML string
         metadata: dict
@@ -777,9 +792,12 @@ class DataToExportExtendedSaver(DataToExportSaver):
         dims = data.get_dim_presents()
         for dim in dims:
             dim_group = self._h5saver.get_set_group(where, dim)
-            for ind, dwa in enumerate(data.get_data_from_dim(dim)):  # dwa: DataWithAxes filtered by dim
-                dwa_group = self._h5saver.get_set_group(dim_group, self.channel_formatter(ind), dwa.name)
-                self._data_saver.add_data(dwa_group, dwa, indexes=indexes, distribution=distribution)
+            for ind, dwa in enumerate(data.get_data_from_dim(dim)):
+                # dwa: DataWithAxes filtered by dim
+                dwa_group = self._h5saver.get_set_group(dim_group,
+                                                        self.channel_formatter(ind), dwa.name)
+                self._data_saver.add_data(dwa_group, dwa, indexes=indexes,
+                                          distribution=distribution)
 
 
 class DataLoader:
@@ -823,7 +841,8 @@ class DataLoader:
 
         Returns
         -------
-        GROUP: returns the group named SPECIAL_GROUP_NAMES['nav_axes'] holding all NavAxis for those data
+        GROUP: returns the group named SPECIAL_GROUP_NAMES['nav_axes'] holding all NavAxis for
+        those data
 
         See Also
         --------
@@ -874,10 +893,11 @@ class DataLoader:
         for child in children_dict:
             if isinstance(children_dict[child], GROUP):
                 self.load_all(children_dict[child], data, with_bkg=with_bkg)
-            elif 'data_type' in children_dict[child].attrs and 'data' in children_dict[child].attrs['data_type']:
+            elif ('data_type' in children_dict[child].attrs and 'data' in
+                  children_dict[child].attrs['data_type']):
 
-                data_list.append(self.load_data(children_dict[child].path, with_bkg=with_bkg, load_all=True))
+                data_list.append(self.load_data(children_dict[child].path,
+                                                with_bkg=with_bkg, load_all=True))
                 break
         data_tmp = DataToExport(name=where.name, data=data_list)
         data.append(data_tmp)
-

pymodaq/utils/h5modules/h5logging.py

@@ -72,56 +72,13 @@ class H5Logger(AbstractLogger):
 
     def add_detector(self, name, settings):
         pass
-        # if name not in self.h5saver.raw_group.children_name():
-        #     group = self.h5saver.add_det_group(self.h5saver.raw_group, name, settings)
-        #     self.h5saver.add_navigation_axis(np.array([0.0, ]),
-        #                                      group, 'time_axis', enlargeable=True,
-        #                                      title='Time axis',
-        #                                      metadata=dict(label='Time axis', units='s', nav_index=0))
 
     def add_actuator(self, name, settings):
         pass
-        # if name not in self.h5saver.raw_group.children_name():
-        #     group = self.h5saver.add_move_group(self.h5saver.raw_group, name, settings)
-        #     self.h5saver.add_navigation_axis(np.array([0.0, ]),
-        #                              group, 'time_axis', enlargeable=True,
-        #                              title='Time axis',
-        #                              metadata=dict(label='Time axis', units='s', nav_index=0))
-
-    def add_data(self, data: DataToExport):
-        self.module_and_data_saver.add_data()
-
-        # name = data['name']
-        # group = self.h5saver.get_group_by_title(self.h5saver.raw_group, name)
-        # time_array = self.h5saver.get_node(group, 'Logger_time_axis')
-        # time_array.append(np.array([data['acq_time_s']]))
-        #
-        # data_types = ['data0D', 'data1D']
-        # if self.settings['save_2D']:
-        #     data_types.extend(['data2D', 'dataND'])
-        #
-        # for data_type in data_types:
-        #     if data_type in data.keys() and len(data[data_type]) != 0:
-        #         if not self.h5saver.is_node_in_group(group, data_type):
-        #             data_group = self.h5saver.add_data_group(group, data_type, metadata=dict(type='scan'))
-        #         else:
-        #             data_group = self.h5saver.get_node(group, utils.capitalize(data_type))
-        #         for ind_channel, channel in enumerate(data[data_type]):
-        #             channel_group = self.h5saver.get_group_by_title(data_group, channel)
-        #             if channel_group is None:
-        #                 channel_group = self.h5saver.add_CH_group(data_group, title=channel)
-        #                 data_array = self.h5saver.add_data(channel_group, data[data_type][channel],
-        #                                            scan_type='scan1D', enlargeable=True)
-        #             else:
-        #                 data_array = self.h5saver.get_node(channel_group, 'Data')
-        #             if data_type == 'data0D' and not isinstance(data[data_type][channel]['data'], np.ndarray):
-        #                 #this is a security as accessing an element in an array can be converted
-        #                 # to a scalar... Made some other attempts but found this is the most reliable here.
-        #                 logger.debug('Some data seems to not be properly formated as ndarrays')
-        #                 data_array.append(np.array([data[data_type][channel]['data']]))
-        #             else:
-        #                 data_array.append(data[data_type][channel]['data'])
-        # self.h5saver.flush()
+
+    def add_data(self, dte: DataToExport):
+        self.module_and_data_saver.add_data(dte)
+
         self.settings.child('N_saved').setValue(self.settings.child('N_saved').value() + 1)
 
     def stop_logger(self):

pymodaq/utils/h5modules/module_saving.py

@@ -361,7 +361,8 @@ class ScanSaver(ModuleSaver):
         for detector in self._module.modules_manager.detectors:
             detector.module_and_data_saver.add_nav_axes(self._module_group, axes)
 
-    def add_data(self, indexes: Tuple[int] = None, distribution=DataDistribution['uniform']):
+    def add_data(self, dte: DataToExport = None, indexes: Tuple[int] = None,
+                 distribution=DataDistribution['uniform']):
         for detector in self._module.modules_manager.detectors:
             try:
                 detector.insert_data(indexes, where=self._module_group, distribution=distribution)
@@ -381,20 +382,18 @@ class LoggerSaver(ScanSaver):
     """
     group_type = GroupType['data_logger']
 
-    def __init__(self, module):
-        self._module_group: GROUP = None
-        self._module: H5Logger = module
-        self._h5saver = None
-
-    def add_data(self):
-        for detector in self._module.modules_manager.detectors:
-            try:
-                detector.append_data(data=None, where=self._module_group)
-            except Exception as e:
-                pass
+    def add_data(self, dte: DataToExport):
+        """Add data to it's corresponding control module
 
-        for actuator in self._module.modules_manager.actuators:
-            try:
-                actuator.append_data(data=None, where=self._module_group)
-            except Exception as e:
-                pass
+        The name of the control module is the DataToExport name attribute
+        """
+        if dte.name in self._module.modules_manager.detectors_name:
+            control_module = self._module.modules_manager.detectors[
+                self._module.modules_manager.detectors_name.index(dte.name)]
+        elif dte.name in self._module.modules_manager.actuators_name:
+            control_module = self._module.modules_manager.actuators[
+                self._module.modules_manager.actuators_name.index(dte.name)]
+        else:
+            return
+
+        control_module.append_data(dte=dte, where=self._module_group)

pymodaq/utils/h5modules/saving.py

@@ -417,19 +417,19 @@ class H5SaverLowLevel(H5Backend):
         return group
 
     def show_file_content(self):
-        form = QtWidgets.QWidget()
+        win = QtWidgets.QMainWindow()
         if not self.isopen():
             if self.h5_file_path is not None:
                 if self.h5_file_path.exists():
-                    self.analysis_prog = browsing.H5Browser(form, h5file_path=self.h5_file_path)
+                    self.analysis_prog = browsing.H5Browser(win, h5file_path=self.h5_file_path)
                 else:
                     logger.warning('The h5 file path has not been defined yet')
             else:
                 logger.warning('The h5 file path has not been defined yet')
         else:
             self.flush()
-            self.analysis_prog = browsing.H5Browser(form, h5file=self.h5file)
-        form.show()
+            self.analysis_prog = browsing.H5Browser(win, h5file=self.h5file)
+        win.show()
 
 
 class H5SaverBase(H5SaverLowLevel, ParameterManager):
@@ -806,8 +806,9 @@ class H5SaverBase(H5SaverLowLevel, ParameterManager):
 
     def value_changed(self, param):
         if param.name() == 'show_file':
-            param.setValue(False)
-            self.show_file_content()
+            if param.value():
+                param.setValue(False)
+                self.show_file_content()
 
         elif param.name() == 'base_path':
             try:
@@ -824,21 +825,6 @@ class H5SaverBase(H5SaverLowLevel, ParameterManager):
     def update_status(self, status):
         logger.warning(status)
 
-    def show_file_content(self):
-        win = QtWidgets.QMainWindow()
-        if not self.isopen():
-            if self.h5_file_path is not None:
-                if self.h5_file_path.exists():
-                    self.analysis_prog = browsing.H5Browser(win, h5file_path=self.h5_file_path)
-                else:
-                    logger.warning('The h5 file path has not been defined yet')
-            else:
-                logger.warning('The h5 file path has not been defined yet')
-        else:
-            self.flush()
-            self.analysis_prog = browsing.H5Browser(win, h5file=self.h5file)
-        win.show()
-
 
 class H5Saver(H5SaverBase, QObject):
     """

pymodaq/utils/managers/modules_manager.py

@@ -43,8 +43,8 @@ class ModulesManager(QObject, ParameterManager):
 
     params = [
         {'title': 'Actuators/Detectors Selection', 'name': 'modules', 'type': 'group', 'children': [
-            {'title': 'detectors', 'name': 'detectors', 'type': 'itemselect'},
-            {'title': 'Actuators', 'name': 'actuators', 'type': 'itemselect'},
+            {'title': 'detectors', 'name': 'detectors', 'type': 'itemselect', 'checkbox': True},
+            {'title': 'Actuators', 'name': 'actuators', 'type': 'itemselect', 'checkbox': True},
         ]},
 
         {'title': "Moves done?", 'name': 'move_done', 'type': 'led', 'value': False},

pymodaq/utils/parameter/pymodaq_ptypes/itemselect.py

@@ -1,3 +1,5 @@
+from copy import deepcopy
+
 from qtpy import QtWidgets, QtCore, QtGui
 from pyqtgraph.parametertree.Parameter import ParameterItem
 from pyqtgraph.parametertree.parameterTypes.basetypes import WidgetParameterItem
@@ -41,7 +43,7 @@ class ItemSelect_pb(QtWidgets.QWidget):
 
 
 class ItemSelect(QtWidgets.QListWidget):
-    def __init__(self, hasCheckbox=False):
+    def __init__(self, hasCheckbox=True):
         QtWidgets.QListWidget.__init__(self)
         self.hasCheckbox = hasCheckbox # Boolean indicating if listwidget item uses checkbox ot not
         self.selItems = [] # Dummy variable to keep track of click order
@@ -69,11 +71,11 @@ class ItemSelect(QtWidgets.QListWidget):
             # Clean up list with non existing entries      
             [self.selItems.remove(item) for item in self.selItems if item not in allitems]        
             for item in self.all_items():
-                if item.checkState()!=0: # Item is selected
+                if item.checkState() != 0: # Item is selected
                     if item.text() not in self.selItems: # if item not in list then add it
                         self.selItems.append(item.text())
                 else: # Item is not selected
-                    if item.text() in self.selItems: # if item in list then remove it
+                    if item.text() in self.selItems:  # if item in list then remove it
                         self.selItems.remove(item.text())
             selitems = self.selItems.copy() #need to copy to correctly emit signal when changed
             
@@ -83,7 +85,7 @@ class ItemSelect(QtWidgets.QListWidget):
             
         return dict(all_items=allitems, selected=selitems)
 
-    def all_items(self):
+    def all_items(self) -> list:
         """
             Get the all_items list from the self QtWidget attribute.
 
@@ -94,16 +96,16 @@ class ItemSelect(QtWidgets.QListWidget):
         """
         return [self.item(ind) for ind in range(self.count())]
     
-    def select_item(self, item:QtWidgets.QListWidgetItem, doSelect:bool = False):
+    def select_item(self, item: QtWidgets.QListWidgetItem, doSelect:bool = False):
         """
             Function to select item. The selection depends if the item uses checkbox or not.
         """        
         if self.hasCheckbox:
-            item.setCheckState(int(2*doSelect)) # 2=QtCore.Qt.Checked, 0=QtCore.Qt.Unchecked                                                   
+            item.setCheckState(int(2*doSelect))  # 2=QtCore.Qt.Checked, 0=QtCore.Qt.Unchecked
         else:
             item.setSelected(doSelect)
 
-    def set_value(self, values):
+    def set_value(self, values: dict):
         """
             Set values to the all_items attributes filtering values by the 'selected' key.
 
@@ -113,34 +115,35 @@ class ItemSelect(QtWidgets.QListWidget):
             =============== ============== =======================================
         """
         # Remove values in selected if they do not exist in all
-        [values['selected'].remove(value) for value in values['selected'] if value not in values['all_items']]
+        values = deepcopy(values)
+        [values['selected'].remove(value) for value in values['selected'] if value
+         not in values['all_items']]
         
         allitems_text = []
         # Check existing items and remove unused ones
         for item in self.all_items():     
-            if item.text() not in values['all_items']: # Remove items from list if text not in values
+            if item.text() not in values['all_items']:  # Remove items from list if text not
+                # in values
                 item = self.takeItem(self.row(item))
             else:
-                allitems_text.append(item.text()) # Add items to list
+                allitems_text.append(item.text())  # Add items to list
         # Create items if needed
-        for value in values['all_items']: # Loop through all values
-            if value not in allitems_text: # Test if object already exists
+        for value in values['all_items']:  # Loop through all values
+            if value not in allitems_text:  # Test if object already exists
                 item = QtWidgets.QListWidgetItem(value) # Create object
-                if self.hasCheckbox: # Add checkbox if required
+                if self.hasCheckbox:  # Add checkbox if required
                     item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)      
-                    self.select_item(item, doSelect=False) # Make sure item is not selected (checkbox not appearing somehow without)                                                       
-                self.addItem(item) # Add object to widget 
+                    self.select_item(item, doSelect=False)
+                    # Make sure item is not selected (checkbox not appearing somehow without)
+                self.addItem(item)  # Add object to widget
                  
-        allitems = self.all_items() # All selectable items                
-        # Selection process        
-        for value in values['selected']: # Loop through selected to retain selection order       
-            for item in allitems: # Loop through all items        
-                if item.text()==value:
-                    self.select_item(item, doSelect=True)
-                    allitems.remove(item) # Remove item from list if found
-                else:
-                    self.select_item(item, doSelect=False) 
-                    
+        allitems = self.all_items()  # All selectable items
+        # Selection process
+        for item in allitems:
+            self.select_item(item, doSelect=False)
+        for value in values['selected']:  # Loop through selected to retain selection order
+            item = allitems[[item.text() for item in allitems].index(value)]
+            self.select_item(item, doSelect=True)
         QtWidgets.QApplication.processEvents()
 
 
@@ -156,12 +159,13 @@ class ItemSelectParameterItem(WidgetParameterItem):
         self.hideWidget = False
         opts = self.param.opts
         
-        if 'checkbox' in opts and opts['checkbox']:      
+        if 'checkbox' in opts and opts['checkbox']:
             w = ItemSelect_pb(checkbox=opts['checkbox'])
             w.sigChanged = w.itemselect.itemChanged
         else:
             w = ItemSelect_pb()
             w.sigChanged = w.itemselect.itemSelectionChanged
+
             
         if 'dragdrop' in opts and opts['dragdrop']:        
             w.itemselect.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)

pymodaq/utils/plotting/data_viewers/viewerND.py

@@ -165,26 +165,34 @@ class UniformDataDisplayer(BaseDataDisplayer):
         processor: DataProcessorFactory = data_processors
         self.update_processor(processor)
 
-    def init_rois(self, data: DataRaw):
-        means = []
-        for axis in data.axes_manager.get_nav_axes():
-            means.append(axis.mean())
-        if len(data.nav_indexes) == 1:
-            self._navigator1D.set_crosshair_position(*means)
-        elif len(data.nav_indexes) == 2:
-            self._navigator2D.set_crosshair_position(*means)
-
-        mins = []
-        maxs = []
-        for axis in data.axes_manager.get_signal_axes():
-            mins.append(axis.min())
-            maxs.append(axis.max())
-        if len(data.axes_manager.sig_indexes) == 1:
-            self._viewer1D.roi.setPos((mins[0], maxs[0]))
-        elif len(data.axes_manager.sig_indexes) > 1:
-            self._viewer2D.roi.setPos((0, 0))
-            self._viewer2D.roi.setSize((len(data.get_axis_from_index(data.axes_manager.sig_indexes[1])),
-                                      len(data.get_axis_from_index(data.axes_manager.sig_indexes[0]))))
+    def init_rois(self, nav_axes_limits: List[Tuple[float, float]] = None,
+                  sig_axis_limits: List[Tuple[float, float]] = None):
+
+        if len(nav_axes_limits) == 1:
+            self._navigator1D.crosshair.set_crosshair_position(np.mean(nav_axes_limits[0]))
+
+        if len(nav_axes_limits) == 2:
+            self._navigator2D.crosshair.set_crosshair_position(
+                *self._navigator2D.view.unscale_axis(np.mean(nav_axes_limits[1]),
+                                                     np.mean(nav_axes_limits[0]))
+            )
+        if len(sig_axis_limits) == 1:
+            self._viewer1D.roi.setPos((float(np.mean(sig_axis_limits[0]) -
+                                             np.abs(np.diff(sig_axis_limits[0])) / 3),
+                                       float(np.mean(sig_axis_limits[0]) +
+                                             np.abs(np.diff(sig_axis_limits[0])) / 3))
+                                      )
+        if len(sig_axis_limits) == 2:
+            scaled_axes = np.array(self._viewer2D.view.unscale_axis(np.array(sig_axis_limits[1]),
+                                                                    np.array(sig_axis_limits[0])))
+
+            self._viewer2D.roi.setSize(
+                float(np.diff(scaled_axes[0])) / 3,
+                float(np.diff(scaled_axes[1])) / 3)
+
+            self._viewer2D.roi.setPos(
+                float(np.mean(scaled_axes[0])) - float(np.diff(scaled_axes[0])) / 6,
+                float(np.mean(scaled_axes[1])) - float(np.diff(scaled_axes[1])) / 6)
 
     def updated_nav_integration(self):
         """ Means the ROI select of the 2D viewer has been moved """
@@ -317,7 +325,8 @@ class SpreadDataDisplayer(BaseDataDisplayer):
         processor = data_processors  # if len(data.axes_manager.sig_shape) > 1 else math_processors1D
         self.update_processor(processor)
 
-    def init_rois(self, data: DataRaw):
+    def init_rois(self, nav_axes_limits: List[Tuple[float, float]] = None,
+                  sig_axis_limits: List[Tuple[float, float]] = None):
         pass
 
     def update_viewer_data(self, posx=0, posy=0):
@@ -520,13 +529,17 @@ class ViewerND(ParameterManager, ActionManager, ViewerBase):
                                                        self.axes_viewer)
 
         self.navigator1D.crosshair.crosshair_dragged.connect(self.data_displayer.update_viewer_data)
+
         self.navigator1D.ROI_select_signal.connect(self.data_displayer.updated_nav_integration)
+
         self.navigator2D.crosshair_dragged.connect(self.data_displayer.update_viewer_data)
+
         self.navigator2D.ROI_select_signal.connect(self.data_displayer.updated_nav_integration)
         self.axes_viewer.navigation_changed.connect(self.data_displayer.update_viewer_data)
         self.data_displayer.data_dim_signal.connect(self.update_data_dim)
 
         self.viewer1D.roi.sigRegionChanged.connect(self.data_displayer.update_nav_data_from_roi)
+
         self.viewer2D.roi.sigRegionChanged.connect(self.data_displayer.update_nav_data_from_roi)
 
         self.get_action('filters').currentTextChanged.connect(self.data_displayer.update_filter)
@@ -553,7 +566,8 @@ class ViewerND(ParameterManager, ActionManager, ViewerBase):
 
         if force_update:
             self.update_widget_visibility(data)
-            self.data_displayer.init_rois(data)
+            self.data_displayer.init_rois(data.axes_limits(data.nav_indexes),
+                                          data.axes_limits(data.sig_indexes))
         self.data_to_export_signal.emit(self.data_to_export)
 
     def set_data_test(self, data_shape='3D'):
@@ -636,9 +650,10 @@ class ViewerND(ParameterManager, ActionManager, ViewerBase):
                                         Axis(data=t, index=2, label='t_axis', units='tunits')])
             elif data_shape == '2D':
                 data = [np.sum(data, axis=(2, 3))]
-                dataraw = DataRaw('NDdata', data=data, dim='DataND', nav_indexes=[0, 1],
+                dataraw = DataRaw('NDdata', data=data, dim='DataND', nav_indexes=[0],
                                   axes=[Axis(data=y, index=0, label='y_axis', units='yunits'),
-                                        Axis(data=x, index=1, label='x_axis', units='xunits')])
+                                        Axis(data=x, index=1, label='x_axis', units='xunits')],
+                                  )
             elif data_shape == '1D':
                 data = [np.sum(data, axis=(0, 1, 2))]
                 dataraw = DataRaw('NDdata', data=data, dim='DataND', nav_indexes=[],

pymodaq/utils/scanner/scanners/_1d_scanners.py

@@ -120,7 +120,8 @@ class Scan1DSparse(Scan1DBase):
         {'title': 'Parsed string:', 'name': 'parsed_string', 'type': 'text', 'value': '0:0.1:1', }
         ]
     n_axes = 1
-    distribution = DataDistribution['spread']
+    distribution = DataDistribution['uniform']  # because in 1D it doesn't matter is spread or
+    # uniform, one can easily plot both types on a regulat 1D plot
 
     def __init__(self, actuators: List = None, **_ignored):
         super().__init__(actuators=actuators)

{pymodaq-4.1.0.dist-info → pymodaq-4.1.1.dist-info}/METADATA

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

{pymodaq-4.1.0.dist-info → pymodaq-4.1.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ pymodaq/dashboard.py,sha256=aKG7XhO7e4S_9nv1MdrCFW5xJ2ADJ6evDIgaPy6ih3w,63635
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/control_modules/daq_move.py,sha256=KQszvOpM6TBzLpeoGOWwHSW3lqTLRwATQy7wRuti7IE,36582
+pymodaq/control_modules/daq_move.py,sha256=Lkq6hVzBulTpU8VnQ71Mo59p61v9mjjH3Qfif0iuCuI,36578
 pymodaq/control_modules/daq_move_ui.py,sha256=sviVOHASH4zjCIfhWzh42v35_n4JaUwUh-t5dFzQBo4,14530
 pymodaq/control_modules/daq_viewer.py,sha256=XJ6PHOg_Emz2-Leg9Fw2k91Mlmz00RFk3xm4NGZnJFI,58421
 pymodaq/control_modules/daq_viewer_ui.py,sha256=EfWnXQYcq4x5qOA2GIuYRBcD0L5Gak44lJ7WqwOrFe4,15646
@@ -36,7 +36,7 @@ pymodaq/examples/Labview_TCP_Client/cmd_types.ctl,sha256=gwuDyGcte11Zqx0C-U8ljRy
 pymodaq/extensions/__init__.py,sha256=EnlA2Pv8B2HSYzHz_QJhxvWBSEaE1BvFQEA_puxuD9U,321
 pymodaq/extensions/console.py,sha256=SOKQCZtOB6sqtI7JoiG7sRfL1KWLGGI_3VGDEva2Ufg,2522
 pymodaq/extensions/daq_logger.py,sha256=7G7LzL_Xu7PEQUk-N-3lQXEochysCmvv_bbf2nGUpmE,19508
-pymodaq/extensions/daq_scan.py,sha256=5c8yIBWOkfHyRNITTWACo6t0vKhTWZh-86j4dA4sogM,53043
+pymodaq/extensions/daq_scan.py,sha256=TGoaJcVgYBJ6hffqVGcM89t5cW3RqOZ6f1FSSaFZQYI,54032
 pymodaq/extensions/daq_scan_ui.py,sha256=zp9dCOnsWdPRe0LuU8hxhTf8L3t2eo-MjBd8xiHX_mk,10134
 pymodaq/extensions/h5browser.py,sha256=udE8v4SLr2w9SaYVynFFkxUuz94qme3vFPf1nng3O1M,736
 pymodaq/extensions/utils.py,sha256=lGyPCnN8PEWuSNbQisHjd4PBMjlnh_Zz2BqJplkvqE4,1881
@@ -45,7 +45,7 @@ pymodaq/extensions/pid/daq_move_PID.py,sha256=EiTJz4fLcjVL1UxnFREu2oZEz2nl-iL5xg
 pymodaq/extensions/pid/pid_controller.py,sha256=-0_Flv4PnF9N3CyJ45LRtVbLmH9P5rhwCSGJxnkge6Q,28317
 pymodaq/extensions/pid/utils.py,sha256=OPMKbfnjj4fW0I5jPRBuMjn0thPNFrTQLwd3or6xUPw,8476
 pymodaq/post_treatment/__init__.py,sha256=xaaLFZJ7OLqI_7yPurFk89A7m2ywSbYDXAsdE-QQ8Zg,81
-pymodaq/post_treatment/load_and_plot.py,sha256=pUXX4zasoFptgZda0xa8RdowyKwRd9bdt1HIOJYUdEo,10077
+pymodaq/post_treatment/load_and_plot.py,sha256=CZP8MbJUzhKMmnpwb-Z1nw_HBR5sZ5rRsVmHSRVtsp4,10954
 pymodaq/post_treatment/process_to_scalar.py,sha256=NHntybqpDhDjQJ224Dhf9Ij_ql-fAEMRT6egA6UEGfA,11568
 pymodaq/post_treatment/daq_analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/post_treatment/daq_measurement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,7 +53,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=pdUwXg40aaxCR0lds3UgUKPSY4O9GTPbtEk87I7zXLo,17
+pymodaq/resources/VERSION,sha256=BRayochAiCccQkfIWF1yVCj5pLS-_7G_RzWifJ9lAHA,17
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/config_scan_template.toml,sha256=zlbFO6pOdrLOFJTVMXfek8YpvOo29tqv0aTjGnB7_mA,570
 pymodaq/resources/config_template.toml,sha256=b91pWeFlKKN-HPpYkwzBLEsEQnoKEM6GmNKQq7aCfts,3352
@@ -302,7 +302,7 @@ pymodaq/utils/chrono_timer.py,sha256=rwX8apS8B-IKhA0Cp2H9tLz0BRN7G3Pg5ptozvd3MKM
 pymodaq/utils/config.py,sha256=iaZpoI-l5KkCKlE49k6IPcRXKB_Ai6bi72Vaf6a2Xbg,12480
 pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
 pymodaq/utils/daq_utils.py,sha256=LCz6wM1sAkKPf4CMnYB9HXGiizlVpN5Yj4KXo6D-oRg,30312
-pymodaq/utils/data.py,sha256=SiEus3OXaBQpf-kATlMjCpbQf5dIDeRJA2EwNCnLyTc,85788
+pymodaq/utils/data.py,sha256=0LTET3_W8MnU97P-n_a6rgn1SBmv5CF9UXEo19ieiz8,86167
 pymodaq/utils/enums.py,sha256=WNU6w3tsNpP7HQnNrQ6eKnDTXulOlZufQRr11__-l0M,1822
 pymodaq/utils/exceptions.py,sha256=wLO6VlofzfwWkOOWMN2B-3NEWMfpgygyeEdakIx_rAs,668
 pymodaq/utils/factory.py,sha256=OLPxzbgpvIuxMN9e59O768NN25FXagcLuE8juvVbhT0,2311
@@ -337,11 +337,11 @@ pymodaq/utils/gui_utils/widgets/tree_toml.py,sha256=Csq1v1_sqdCEvrb4VCewfsMVMpu-
 pymodaq/utils/h5modules/__init__.py,sha256=x3_4ELvG9onTKEFgIt9xEGg_mA1bB07dvVbU9q0xQKw,104
 pymodaq/utils/h5modules/backends.py,sha256=6n_6HoeQ5gLE_e9pme-ByzN8oidtvQn04TGfk0FPxSc,33040
 pymodaq/utils/h5modules/browsing.py,sha256=4MGKUDYbxC-C2bWcjBRuHB9pGWxqcAiqxtwH_3O_gKM,23299
-pymodaq/utils/h5modules/data_saving.py,sha256=jLZAYqck8_4b1jDEmcFiZ-z1rYU85pAiNljuO9YpMrg,33637
+pymodaq/utils/h5modules/data_saving.py,sha256=9KktJr7i4KB95lcUb5qKT4vxAiNm_mu2Q0JLVIuz4lY,34234
 pymodaq/utils/h5modules/exporter.py,sha256=iCfUjkuGjs3-ijcUkt38NMrjO8tI9wXShvwYHJIUU70,3670
-pymodaq/utils/h5modules/h5logging.py,sha256=d3MNIxV0TAyKwTDIBGxYYhgvKmPK6T-7Piznjdfy76w,5490
-pymodaq/utils/h5modules/module_saving.py,sha256=8_NV2L3iQRp0l_T0T6Wo2LHtgp9WYZ6FjcX9tsl6_os,13586
-pymodaq/utils/h5modules/saving.py,sha256=0kwKrb6LPXBRO605pji1gYciodUMn6KAip91gfXY1oE,34597
+pymodaq/utils/h5modules/h5logging.py,sha256=UhRo9YvjU5Ujw_i5aPHXOgOdw_IszxmekOa7gYUY5AQ,2492
+pymodaq/utils/h5modules/module_saving.py,sha256=r9rzHQhePS78yRZd4Sb-4vccLGNY8n_ulB0qJb6HogA,13761
+pymodaq/utils/h5modules/saving.py,sha256=0Cw3cgc_kfI6nWTTLjUkeUpYcA00VIgx5QkJypUwkP8,34013
 pymodaq/utils/h5modules/utils.py,sha256=0isF661xthXlT3hFJvXTcgGqkZcGQmSanTNAGSInez4,3368
 pymodaq/utils/h5modules/exporters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/h5modules/exporters/base.py,sha256=tUXUoTFPHJY9itHR2CajvwrJPVX5gmupMwO-GIQ43Cg,3961
@@ -350,7 +350,7 @@ pymodaq/utils/h5modules/exporters/hyperspy.py,sha256=rheeVJQO0BAF606D_0S_j8huzOL
 pymodaq/utils/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/managers/action_manager.py,sha256=l6p_JjEkFce1CskZzDO8be1BMslCYdS0d4U53yHBDHo,17227
 pymodaq/utils/managers/batchscan_manager.py,sha256=jcL08YvFafX5kiy03BV1_6obt2Xogiby5pvTKeN8_ho,13905
-pymodaq/utils/managers/modules_manager.py,sha256=MF9sjL_g6b3k9pgH3G31gYHk_vby6NxsKo_VGDB4lqI,20785
+pymodaq/utils/managers/modules_manager.py,sha256=RKpt1RU0VrELBPmTAlLB_B5k-5KX7deHnequgOFfYKk,20821
 pymodaq/utils/managers/overshoot_manager.py,sha256=fe_CR1Bkw85BER34MoVFlm-xtKl9Hr9bkf2nyaz9hXg,7158
 pymodaq/utils/managers/parameter_manager.py,sha256=BX_wPzx02zYgqZHl0pnGHOq3fwE__l38d6xtDQILmAQ,11426
 pymodaq/utils/managers/preset_manager.py,sha256=u_gssDcJ-z6oj9Wyrppt1H-FW9pbeihxA8jU00hEFpM,8205
@@ -364,7 +364,7 @@ pymodaq/utils/parameter/pymodaq_ptypes/__init__.py,sha256=NNPGOTfpft27W4mxHbqcgf
 pymodaq/utils/parameter/pymodaq_ptypes/bool.py,sha256=yz9-zn6T5NN7SDEWwf8tfw8Ezbllbt1rOd8vHGqw3mI,761
 pymodaq/utils/parameter/pymodaq_ptypes/date.py,sha256=ND9lnRxbEE_KNb1utypYM9rvC7d01GJYNa13XJpadqE,3829
 pymodaq/utils/parameter/pymodaq_ptypes/filedir.py,sha256=IVFbN08Dr3NdRNMufBef1vWr2igiULq3CBu10-yLqSQ,4571
-pymodaq/utils/parameter/pymodaq_ptypes/itemselect.py,sha256=3ZDsoiFQDE1XGmQG7Ifl14vm63ajKdL67qMWa_X8aog,11145
+pymodaq/utils/parameter/pymodaq_ptypes/itemselect.py,sha256=Zxg1HpRDz8R0aQ38ZGD5vfXwIyR6bPddDTHul_zxGes,11002
 pymodaq/utils/parameter/pymodaq_ptypes/led.py,sha256=oDKM3k4aPy_CArgQIEqjLx3KG5CR7NrywacJKalmKQ4,1129
 pymodaq/utils/parameter/pymodaq_ptypes/list.py,sha256=bXGlUxKVAA5_QY41BmzG2iWWoh1Qq-w-QHgMo-_Kc7Q,5716
 pymodaq/utils/parameter/pymodaq_ptypes/numeric.py,sha256=lzklQWAnzh9LDC20hdlGbAj2NdVzNDDeJke1KnPi7GU,560
@@ -386,7 +386,7 @@ pymodaq/utils/plotting/data_viewers/viewer1D.py,sha256=aR-Qbxd1Pr28DF4kLJDp4Ph65
 pymodaq/utils/plotting/data_viewers/viewer1Dbasic.py,sha256=sfqiuNPlsF2SbhFwVfLD7CzfKD7UUlHITb5LC1clXE0,7407
 pymodaq/utils/plotting/data_viewers/viewer2D.py,sha256=EnJ8NYay9iRm6dsyMtKjGX4Uqx8lSXO1Ci0j1_kpVH8,42182
 pymodaq/utils/plotting/data_viewers/viewer2D_basic.py,sha256=aRLu8JVZZI8PH6Lxl8oITpHwUXaUY3PyLW6eHzkf76o,5588
-pymodaq/utils/plotting/data_viewers/viewerND.py,sha256=g7JpPBfxoDvCEWi0FUvPzKj1HeVtAo9PK5-GoN5Rehs,37453
+pymodaq/utils/plotting/data_viewers/viewerND.py,sha256=BV2cs_HWH9vaZ0JwoDo-oFNCBcAHwLiJAH9fwZTWOM8,38315
 pymodaq/utils/plotting/items/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/plotting/items/axis_scaled.py,sha256=YVSqpSs2gfALdsH_wKheYf6fgEQ0-7tU2zWu709K3h4,3245
 pymodaq/utils/plotting/items/crosshair.py,sha256=hVoM3dDtRmYGfzZJsP-Yhyfnx2HV1g-nLSQMVl6ZZXY,3064
@@ -402,7 +402,7 @@ pymodaq/utils/scanner/scan_config.py,sha256=mRAhHrkulXcO05IjmalTxmUPTGkH_sHJQu6I
 pymodaq/utils/scanner/scan_factory.py,sha256=tKYY72xdVpc73fOhAUzkQ8NbKAtnNnW2C3C_qrCm_HE,9601
 pymodaq/utils/scanner/scanner.py,sha256=OrKQa0g_R5ZHW7xVpLAEw5v1Ju9RUayfvDK5xmRPOPU,10843
 pymodaq/utils/scanner/utils.py,sha256=xHQaNvWwVLnQvI8fVbLqMO1M6XOJjV5n39e3f7v8Zjc,3682
-pymodaq/utils/scanner/scanners/_1d_scanners.py,sha256=R9Bd5nMjyXwIl_CwLVtLlYm5eEquwGapXRo5-M5yDo8,7578
+pymodaq/utils/scanner/scanners/_1d_scanners.py,sha256=rmqyHCSCD5HynuFELlzRd7URliz1rlwBcGA6TK1uceM,7694
 pymodaq/utils/scanner/scanners/_2d_scanners.py,sha256=-25DBTJrO7k7REREGH5i-6DbVRApc76B3OaJeeJTC1M,15560
 pymodaq/utils/scanner/scanners/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymodaq/utils/scanner/scanners/sequential.py,sha256=7hcjg0csoA-umV3hd51AdiD0THZjcI2JorMzhS81BO4,7842
@@ -415,8 +415,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=zpgf1KTYvRnD7wY3YT1ym3vHw6T1Zd3Y3eBAr91B_SY,23205
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=eZswNZWKyL6ZFHuSROf3nL53fVgDNXMV1PMK5lJNS1o,30490
-pymodaq-4.1.0.dist-info/METADATA,sha256=YlJMnNMDX2bqcThxagZhtvbFSo8jKwqt2GTqatP42QU,7575
-pymodaq-4.1.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-pymodaq-4.1.0.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
-pymodaq-4.1.0.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-4.1.0.dist-info/RECORD,,
+pymodaq-4.1.1.dist-info/METADATA,sha256=prS3VxXw5Dg2M1nbiLTUVRqr66qf5g_H695iBNbTBbg,7575
+pymodaq-4.1.1.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+pymodaq-4.1.1.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
+pymodaq-4.1.1.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-4.1.1.dist-info/RECORD,,