pymodaq_data 5.0.7__tar.gz → 5.0.9__tar.gz

{pymodaq_data-5.0.7 → pymodaq_data-5.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymodaq_data
-Version: 5.0.7
+Version: 5.0.9
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -27,7 +27,6 @@ License: The MIT License (MIT)
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
         THE SOFTWARE.
-License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Other Environment
 Classifier: Intended Audience :: Science/Research

{pymodaq_data-5.0.7 → pymodaq_data-5.0.9}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.7'
-__version_tuple__ = version_tuple = (5, 0, 7)
+__version__ = version = '5.0.9'
+__version_tuple__ = version_tuple = (5, 0, 9)

{pymodaq_data-5.0.7 → pymodaq_data-5.0.9}/src/pymodaq_data/data.py

@@ -3126,14 +3126,14 @@ class DataToExport(DataLowLevel):
     def remove(self, dwa: DataWithAxes):
         """ Use the DataWithAxes object comparison __eq__ to retrieve the elt to remove
 
-        If strict is True will also check for the real type and name of the object
-
         Parameters
         ----------
+        dwa: DataWithAxes
+            The da to remove from the list
         """
-        for dwa_tmp in self:
+        for ind, dwa_tmp in enumerate(self):
             if dwa_tmp == dwa and dwa_tmp.name == dwa.name:
-                return dwa_tmp
+                return self.data.pop(ind)
         raise ValueError()
 
     @property

{pymodaq_data-5.0.7 → pymodaq_data-5.0.9}/src/pymodaq_data/h5modules/data_saving.py

@@ -58,8 +58,12 @@ class DataManagement(metaclass=ABCMeta):
         self.close_file()
 
     def close_file(self):
+        self._h5saver.flush()
         self._h5saver.close_file()
 
+    def close(self):
+        self.close_file()
+
     def _get_next_node_name(self, where: Union[str, Node]) -> str:
         """Get the formatted next node name given the ones already saved
 
@@ -600,7 +604,7 @@ class DataEnlargeableSaver(DataSaverLoader):
                     self._axis_saver.add_axis(where, axis)
 
     def add_data(self, where: Union[Node, str], data: DataWithAxes,
-                 axis_values: Iterable[float] = None):
+                 axis_values: Iterable[float] = None, **kwargs):
         """ Append data to an enlargeable array node
 
         Data of dim (0, 1 or 2) will be just appended to the enlargeable array.
@@ -624,17 +628,31 @@ class DataEnlargeableSaver(DataSaverLoader):
         if self.get_last_node_name(where) is None:
             if len(data.nav_indexes) == 0:
                 data_init = data
+            elif len(data.nav_indexes) == 1:  # special case of DataND data
+                data_init = data.inav[0]
+                add_enl_axes = True
+                axis = data.get_axis_from_index(data.nav_indexes[0])[0]
+                axis_values = (axis.get_data(),)
+                self._enl_axis_names = (axis.label,)
+                self._enl_axis_units = (axis.units,)
             else:
                 raise DataDimError('It is not possible to append DataND')
             self._create_data_arrays(where, data_init, save_axes=True, add_enl_axes=add_enl_axes)
+        elif len(data.nav_indexes) == 1:  # special case of DataND data
+            add_enl_axes = True
+            axis = data.get_axis_from_index(data.nav_indexes[0])[0]
+            axis_values = (axis.get_data(),)
 
         for ind_data in range(len(data)):
             array: EARRAY = self.get_node_from_index(where, ind_data)
             array.append(data[ind_data])
-        if add_enl_axes and axis_values is not None:
+        if add_enl_axes:
             for ind_axis in range(self._n_enl_axes):
                 axis_array: EARRAY = self._axis_saver.get_node_from_index(where, ind_axis)
-                axis_array.append(np.array([axis_values[ind_axis]]))
+                if not isinstance(axis_values[ind_axis], np.ndarray):
+                    axis_array.append(np.array([axis_values[ind_axis]]))
+                else:
+                    axis_array.append(axis_values[ind_axis], expand=False)
                 axis_array.attrs['size'] += 1
 
 
@@ -862,7 +880,7 @@ class DataToExportEnlargeableSaver(DataToExportSaver):
     def add_data(self, where: Union[Node, str], data: DataToExport,
                  axis_values: List[Union[float, np.ndarray]] = None,
                  axis_value: Union[float, np.ndarray] = None,
-                 settings_as_xml='', metadata=None,
+                 settings_as_xml='', metadata=None, **kwargs
                  ):
         """
 
@@ -885,7 +903,7 @@ class DataToExportEnlargeableSaver(DataToExportSaver):
         if axis_values is None and axis_value is not None:
             axis_values = [axis_value]
 
-        super().add_data(where, data, settings_as_xml, metadata)
+        super().add_data(where, data, settings_as_xml, metadata, **kwargs)
         # a parent navigation group (same for all data nodes)
 
         where = self._get_node(where)