dclab 0.62.11__cp39-cp39-macosx_11_0_arm64.whl → 2.18.0__cp39-cp39-macosx_11_0_arm64.whl

dclab/rtdc_dataset/export.py

@@ -224,7 +224,6 @@ class Export(object):
         skip_checks: bool
             Disable checking whether all features have the same length.
 
-
         .. versionchanged:: 0.58.0
 
            The ``basins`` keyword argument was added, and it is now possible
@@ -319,21 +318,18 @@ class Export(object):
 
             # write export log
             hw.store_log(time.strftime("dclab-export_%Y-%m-%d_%H.%M.%S"),
-                         json.dumps(
-                             {"dclab version": version_tuple,
-                              "kwargs": {
-                                  "features": features,
-                                  "filtered": filtered,
-                                  "logs": logs,
-                                  "tables": tables,
-                                  "basins": basins,
-                                  "meta_prefix": meta_prefix,
-                                  "skip_checks": skip_checks
-                                  }
-                              },
-                             indent=2,
-                             sort_keys=True,
-                         ).split("\n"))
+                         json.dumps({
+                             "dclab version": version_tuple,
+                             "kwargs": {
+                                 "features": features,
+                                 "filtered": filtered,
+                                 "logs": logs,
+                                 "tables": tables,
+                                 "basins": basins,
+                                 "meta_prefix": meta_prefix,
+                                 "skip_checks": skip_checks
+                             }
+                         }).split("\n"))
 
             if logs:
                 # write logs

dclab/rtdc_dataset/feat_basin.py

@@ -9,18 +9,11 @@ import abc
 import numbers
 import threading
 from typing import Dict, List, Literal
-import uuid
 import warnings
 import weakref
 
 import numpy as np
 
-from ..util import copy_if_needed
-
-
-class BasinFeatureMissingWarning(UserWarning):
-    """Used when a badin feature is defined but not stored"""
-
 
 class CyclicBasinDependencyFoundWarning(UserWarning):
     """Used when a basin is defined in one of its sub-basins"""
@@ -75,7 +68,6 @@ class Basin(abc.ABC):
                                   ] = "same",
                  mapping_referrer: Dict = None,
                  ignored_basins: List[str] = None,
-                 key: str = None,
                  **kwargs):
         """
 
@@ -111,10 +103,6 @@ class Basin(abc.ABC):
             :class:`.RTDCBase`.
         ignored_basins: list of str
             List of basins to ignore in subsequent basin instantiations
-        key: str
-            Unique key to identify this basin; normally computed from
-            a JSON dump of the basin definition. A random string is used
-            if None is specified.
         kwargs:
             Additional keyword arguments passed to the `load_dataset`
             method of the `Basin` subclass.
@@ -130,8 +118,6 @@ class Basin(abc.ABC):
         self.name = name
         #: lengthy description of the basin
         self.description = description
-        # defining key of the basin
-        self.key = key or str(uuid.uuid4())
         # features this basin provides
         self._features = features
         #: measurement identifier of the referencing dataset
@@ -375,7 +361,6 @@ class BasinProxy:
             dataset to the downstream dataset
         """
         self.ds = ds
-        self.basins_get_dicts = ds.basins_get_dicts
         self.basinmap = basinmap
         self._features = {}
 
@@ -420,7 +405,7 @@ class BasinProxyFeature(np.lib.mixins.NDArrayOperatorsMixin):
         self._cache = None
         self.is_scalar = bool(len(self.feat_obj.shape) == 1)
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._cache is None and self.is_scalar:
             self._cache = self.feat_obj[:][self.basinmap]
         else:
@@ -511,19 +496,6 @@ class InternalH5DatasetBasin(Basin):
         if self._features is None:
             raise ValueError("You must specify features when defining "
                              "internal basins.")
-        # Redefine the features if necessary
-        h5root = self._basinmap_referrer().h5file
-        available_features = []
-        for feat in self._features:
-            if self.location in h5root and feat in h5root[self.location]:
-                available_features.append(feat)
-            else:
-                warnings.warn(
-                    f"Feature '{feat}' is defined as an internal basin, "
-                    f"but it cannot be found in '{self.location}'.",
-                    BasinFeatureMissingWarning)
-        self._features.clear()
-        self._features += available_features
 
     def _load_dataset(self, location, **kwargs):
         from .fmt_dict import RTDC_Dict
@@ -535,7 +507,8 @@ class InternalH5DatasetBasin(Basin):
         return RTDC_Dict(ds_dict)
 
     def is_available(self):
-        return bool(self._features)
+        h5root = self._basinmap_referrer().h5file
+        return self.location in h5root
 
     def verify_basin(self, *args, **kwargs):
         """It's not necessary to verify internal basins"""

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -30,13 +30,11 @@ class DCORTables:
             tables = {}
             for key in table_data:
                 columns, data = table_data[key]
+                ds_dt = np.dtype({'names': columns,
+                                  'formats': [np.float64] * len(columns)})
                 tab_data = np.asarray(data)
-                if columns is not None:
-                    # We have a rec-array (named columns)
-                    ds_dt = np.dtype({'names': columns,
-                                      'formats': [np.float64] * len(columns)})
-                    tab_data = np.rec.array(tab_data, dtype=ds_dt)
-                tables[key] = tab_data
+                rec_arr = np.rec.array(tab_data, dtype=ds_dt)
+                tables[key] = rec_arr
 
             self._tables_cache = tables
         return self._tables_cache

dclab/rtdc_dataset/fmt_hdf5/base.py

@@ -175,15 +175,10 @@ class RTDC_HDF5(RTDCBase):
 
     def basins_get_dicts(self):
         """Return list of dicts for all basins defined in `self.h5file`"""
-        return self.basin_get_dicts_from_h5file(self.h5file)
-
-    @staticmethod
-    def basin_get_dicts_from_h5file(h5file):
-        """Return list of dicts for all basins defined in `h5file`"""
         basins = []
         # Do not sort anything here, sorting is done in `RTDCBase`.
-        for bk in h5file.get("basins", []):
-            bdat = list(h5file["basins"][bk])
+        for bk in self.h5file.get("basins", []):
+            bdat = list(self.h5file["basins"][bk])
             if isinstance(bdat[0], bytes):
                 bdat = [bi.decode("utf") for bi in bdat]
             bdict = json.loads(" ".join(bdat))

dclab/rtdc_dataset/fmt_hdf5/events.py

@@ -7,7 +7,7 @@ import numbers
 import numpy as np
 
 from ... import definitions as dfn
-from ...util import copy_if_needed
+
 
 from . import feat_defect
 
@@ -140,7 +140,7 @@ class H5MaskEvent:
         self.identifier = (self.h5dataset.file.filename, self.h5dataset.name)
         self.dtype = np.dtype(bool)
 
-    def __array__(self, dtype=np.bool_, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=np.bool_, copy=False, *args, **kwargs):
         if dtype is not np.uint8:
             warnings.warn("Please avoid calling the `__array__` method of the "
                           "`H5MaskEvent`. It may consume a lot of memory.",
@@ -180,7 +180,7 @@ class H5ScalarEvent(np.lib.mixins.NDArrayOperatorsMixin):
         # attrs
         self._ufunc_attrs = dict(self.h5ds.attrs)
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._array is None:
             self._array = np.asarray(self.h5ds, *args, **kwargs)
         return np.array(self._array, dtype=dtype, copy=copy)

dclab/rtdc_dataset/fmt_hierarchy/base.py

@@ -60,6 +60,7 @@ class RTDC_Hierarchy(RTDCBase):
 
         self._events = {}
 
+        #: hierarchy parent
         self.hparent = hparent
 
         self.config = self._create_config()  # init config

dclab/rtdc_dataset/fmt_hierarchy/events.py

@@ -3,7 +3,6 @@ import warnings
 
 import numpy as np
 
-from ...util import copy_if_needed
 from .mapper import map_indices_child2parent
 
 
@@ -38,7 +37,7 @@ class ChildNDArray(ChildBase):
         super(ChildNDArray, self).__init__(child)
         self.feat = feat
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         warnings.warn("Please avoid calling the `__array__` method of the "
                       "`ChildNDArray`. It may consume a lot of memory. "
                       "Consider using a generator instead.",
@@ -70,7 +69,7 @@ class ChildScalar(np.lib.mixins.NDArrayOperatorsMixin):
         self._ufunc_attrs = {}
         self.ndim = 1  # matplotlib might expect this from an array
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         if self._array is None:
             hparent = self.child.hparent
             filt_arr = hparent.filter.all
@@ -122,7 +121,7 @@ class ChildTraceItem(ChildBase):
         super(ChildTraceItem, self).__init__(child)
         self.flname = flname
 
-    def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
+    def __array__(self, dtype=None, copy=False, *args, **kwargs):
         warnings.warn("Please avoid calling the `__array__` method of the "
                       "`ChildTraceItem`. It may consume a lot of memory. "
                       "Consider using a generator instead.",

dclab/rtdc_dataset/linker.py

@@ -0,0 +1,124 @@
+"""Tools for linking HDF5 datasets across files"""
+from __future__ import annotations
+
+import io
+import pathlib
+from typing import BinaryIO, Literal
+
+import h5py
+
+
+class ExternalDataForbiddenError(BaseException):
+    """Raised when a dataset contains external data
+
+    External data are a security risk, because they could be
+    used to access data that are not supposed to be accessed.
+    This is especially critical when the data are accessed within
+    a web server process (e.g. in DCOR).
+    """
+    pass
+
+
+def assert_no_external(h5):
+    """Raise ExternalDataForbiddenError if `h5` refers to external data"""
+    has_ext, path_ext = check_external(h5)
+    if has_ext:
+        raise ExternalDataForbiddenError(
+            f"Dataset {h5.file.filename} contains external data, but these "
+            f"are not permitted for security reasons ({path_ext})!")
+
+
+def check_external(h5):
+    """Check recursively, whether an h5py object contains external data
+
+    External data includes binary data in external files, virtual
+    datasets, and external links.
+
+    Returns a tuple of either
+
+    - `(True, path_ext)` if the object contains external data
+    - `(False, None)` if this is not the case
+
+    where `path_ext` is the path to the group or dataset in `h5`.
+
+    .. versionadded:: 0.51.0
+
+    """
+    for key in h5:
+        obj = h5[key]
+        if (obj.file != h5.file  # not in same file
+                or (isinstance(obj, h5py.Dataset)
+                    and (obj.is_virtual  # virtual dataset
+                         or obj.external))):  # external dataset
+            # These are external data
+            return True, f"{h5.name}/{key}".replace("//", "/")
+        elif isinstance(obj, h5py.Group):
+            # Perform recursive check for external data
+            has_ext, path_ext = check_external(obj)
+            if has_ext:
+                return True, path_ext
+    else:
+        return False, None
+
+
+def combine_h5files(
+        paths: list,
+        external: Literal["follow", "raise"] = "follow"
+        ) -> BinaryIO:
+    """Create an in-memory file that combines multiple .rtdc files
+
+    The .rtdc files must have the same number of events. The in-memory
+    file is populated with the "events" data from `paths` according to
+    the order that `paths` are given in. Metadata, including logs, basins,
+    and tables are only taken from the first path.
+
+    .. versionadded:: 0.51.0
+
+    Parameters
+    ----------
+    paths: list of str or pathlib.Path
+        Paths of the input .rtdc files. The first input file is always
+        used as a source for the metadata. The other files only complement
+        the features.
+    external: str
+        Defines how external (links, binary, virtual) data in `paths`
+        should be handled. The default is to "follow" external datasets or
+        links to external data. In a zero-trust context, you can set this
+        to "raise" which will cause an :class:`.ExternalDataForbiddenError`
+        exception when external data are encountered.
+
+    Returns
+    -------
+    fd: BinaryIO
+        seekable, file-like object representing an HDF5 file opened in
+        binary mode; This can be passed to `:class:h5py.File`
+    """
+    fd = io.BytesIO()
+    with h5py.File(fd, "w", libver="latest") as hv:
+        for ii, pp in enumerate(paths):
+            pp = pathlib.Path(pp).resolve()
+            with h5py.File(pp, libver="latest") as h5:
+                if external == "raise":
+                    # Check for external data
+                    assert_no_external(h5)
+                if ii == 0:
+                    # Only write attributes once.
+                    # Interestingly, writing the attributes takes
+                    # the most time. Maybe there is some shortcut
+                    # that can be taken (since e.g. we know we don't have to
+                    # check for existing attributes).
+                    # https://github.com/h5py/h5py/blob/master/
+                    # h5py/_hl/attrs.py
+                    hv.attrs.update(h5.attrs)
+                    # Also, write basins/logs/tables/... (anything that is
+                    # not events) only once.
+                    for group in h5:
+                        if group != "events":
+                            hv[group] = h5py.ExternalLink(str(pp), group)
+                # Append features
+                hve = hv.require_group("events")
+                for feat in h5["events"]:
+                    if feat not in hve:
+                        hve[feat] = h5py.ExternalLink(str(pp),
+                                                      f"/events/{feat}")
+    return fd

dclab/rtdc_dataset/writer.py

@@ -389,7 +389,7 @@ class RTDCWriter:
                     flocs.append(str(pp.resolve()))
                     # Also store the relative path for user convenience.
                     # Don't use pathlib.Path.relative_to, because that
-                    # only has `walk_up` since Python 3.12.
+                    # is deprecated in Python 3.12.
                     # Also, just look in subdirectories which simplifies
                     # path resolution.
                     this_parent = str(self.path.parent) + os.sep
@@ -408,7 +408,7 @@ class RTDCWriter:
         else:
             raise ValueError(f"Unknown basin type '{basin_type}'")
 
-        b_lines = json.dumps(b_data, indent=2, sort_keys=True).split("\n")
+        b_lines = json.dumps(b_data, indent=2).split("\n")
         basins = self.h5file.require_group("basins")
         key = hashobj(b_lines)
         if key not in basins:
@@ -616,7 +616,7 @@ class RTDCWriter:
                     convfunc = dfn.get_config_value_func(sec, ck)
                     self.h5file.attrs[idk] = convfunc(value)
 
-    def store_table(self, name, cmp_array, h5_attrs=None):
+    def store_table(self, name, cmp_array):
         """Store a compound array table
 
         Tables are semi-metadata. They may contain information collected
@@ -629,33 +629,16 @@ class RTDCWriter:
         ----------
         name: str
             Name of the table
-        cmp_array: np.recarray, h5py.Dataset, np.ndarray, or dict
+        cmp_array: np.recarray, h5py.Dataset, or dict
             If a np.recarray or h5py.Dataset are provided, then they
             are written as-is to the file. If a dictionary is provided,
             then the dictionary is converted into a numpy recarray.
-            If a numpy array is provided, then the array is written
-            as a raw table (no column names) to the file.
-        h5_attrs: dict, optional
-            Attributes to store alongside the corresponding HDF5 dataset
         """
-        if h5_attrs is None:
-            h5_attrs = {}
-
-        if isinstance(cmp_array, np.recarray):
+        if isinstance(cmp_array, (np.recarray, h5py.Dataset)):
             # A table is a compound array (np.recarray). If we are here,
-            # this means that the user passed an instance of np.recarray.
-            pass
-        elif isinstance(cmp_array, h5py.Dataset):
-            # An instance of h5py.Dataset (which we trust to be a proper
+            # this means that the user passed an instance of np.recarray
+            # or an instance h5py.Dataset (which we trust to be a proper
             # compound dataset at this point). No additional steps needed.
-            h5_attrs.update(cmp_array.attrs)
-            pass
-        elif isinstance(cmp_array, np.ndarray):
-            # A numpy array was passed. This usually means we have something
-            # that we can look at, so we add image tags.
-            h5_attrs['CLASS'] = np.bytes_('IMAGE')
-            h5_attrs['IMAGE_VERSION'] = np.bytes_('1.2')
-            h5_attrs['IMAGE_SUBCLASS'] = np.bytes_('IMAGE_GRAYSCALE')
             pass
         elif isinstance(cmp_array, dict):
             # The user passed a dict which we now have to convert to a
@@ -676,18 +659,16 @@ class RTDCWriter:
         else:
             raise NotImplementedError(
                 f"Cannot convert {type(cmp_array)} to table!")
-
-        # data
         group = self.h5file.require_group("tables")
         tab = group.create_dataset(
             name,
             data=cmp_array,
             fletcher32=True,
             **self.compression_kwargs)
-
-        # metadata
-        if h5_attrs:
-            tab.attrs.update(h5_attrs)
+        # Also store metadata
+        if hasattr(cmp_array, "attrs"):
+            for key in cmp_array.attrs:
+                tab.attrs[key] = cmp_array.attrs[key]
 
     def version_brand(self, old_version=None, write_attribute=True):
         """Perform version branding

dclab/util.py

@@ -10,12 +10,6 @@ import numpy as np
 from .rtdc_dataset.config import Configuration, ConfigurationDict
 
 
-if np.lib.NumpyVersion(np.__version__) >= "2.0.0":
-    copy_if_needed = None
-else:
-    copy_if_needed = False
-
-
 class file_monitoring_lru_cache:
     """Decorator for caching data extracted from files
 

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: dclab
-Version: 0.62.11
+Version: 2.18.0
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>
@@ -23,7 +23,7 @@ Requires-Dist: importlib-resources>=6.0
 Requires-Dist: numpy<3,>=1.21
 Requires-Dist: scipy<2,>=1.10.0
 Provides-Extra: all
-Requires-Dist: dclab[dcor,export,http,s3,tdms]; extra == "all"
+Requires-Dist: dclab[dcor,export,http,lme4,s3,tdms]; extra == "all"
 Provides-Extra: dcor
 Requires-Dist: requests<3,>=2.31.0; extra == "dcor"
 Provides-Extra: export
@@ -31,6 +31,8 @@ Requires-Dist: fcswrite>=0.5.0; extra == "export"
 Requires-Dist: imageio[ffmpeg]; extra == "export"
 Provides-Extra: http
 Requires-Dist: requests<3,>=2.31.0; extra == "http"
+Provides-Extra: lme4
+Requires-Dist: rpy2>=2.9.4; extra == "lme4"
 Provides-Extra: s3
 Requires-Dist: boto3>=1.34.31; extra == "s3"
 Provides-Extra: tdms

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/_version.py,sha256=6RN4LVuzVUBmwpWRGtSDrQrJ0GhR_RYa4tyvcOaVVUg,415
-dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
+dclab/_version.py,sha256=QyMxKDzFsqXDA7bVrQozJznaASbsECKe57aBBNAljsA,413
+dclab/util.py,sha256=FcRsWcyKkKkfX2nZCShjJ5wPccr7U7NHsIDd_WEws6w,5141
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
 dclab/warn.py,sha256=MjJvyQeuvIXFQ2-fHDzbmXJ0scnHqqRJlIxfuLI_utE,523
 dclab/cached.py,sha256=eWTYBiI-HQM7JuPH-oxa5LLnhAX32GpRwlYg2kQ3sTA,2917
-dclab/http_utils.py,sha256=YtZHEwB-BBBo2fCvwhlJvlnWvfWFMHclqol3OIJ7atM,10910
+dclab/http_utils.py,sha256=TGqgiaUV-Z6Wiae__Yze-uHRWX57846ZnlV10ajzv2E,10562
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
-dclab/downsampling.cpython-39-darwin.so,sha256=2ix5-wLq-gofGpmUsaC3iZ7ak2FAQsIioQknSKbl0jc,258416
+dclab/downsampling.cpython-39-darwin.so,sha256=p0NgLD140J39RVPkIcyC85teASyFbYVKF0l9q8xCDqA,258416
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
 dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
 dclab/isoelastics/iso_LE-2D-FEM-19-volume-deform.txt,sha256=vTcazOlOXo3BQ0NQtGB_IdHKA0neOLXZ_d3JuMU--RE,83358
@@ -34,10 +34,10 @@ dclab/features/emodulus/scale_linear.py,sha256=5tZfOpG4QSSEMlwSoA_3XRQuY0tiZ3CSm
 dclab/features/emodulus/lut_HE-3D-FEM-22.txt,sha256=1Sg4ys0ykT7Q_jFM28XS0uJ85nZd_ha7BDXdN2rsPIA,47248
 dclab/features/emodulus/load.py,sha256=Q9rII-7Om-f0m183VNeJUxNno7at1reigKtbzdrWgjE,8557
 dclab/features/emodulus/viscosity.py,sha256=aBm1pQa9cFAOBnO07UWMj87bw6fQpmW1IlWWD0MEtgw,9438
-dclab/lme4/lme4_template.R,sha256=CEXQIquvYCla9dCvRYgiBemI6fiVgAKnJTetJA2LAtk,2570
-dclab/lme4/__init__.py,sha256=5WPFMTK-Yia3NJuwZEEBQ3fCyW3DiFgpZFrAwU33TV4,272
-dclab/lme4/rsetup.py,sha256=kH9VFtcK83ZaF9jvh1n5kcmGmPLLsmCPia_ElEHBLes,5890
-dclab/lme4/wrapr.py,sha256=rdIc2hS8GhgdU9WFA6pLzohJGlBga-mkm60qqqk6VO4,15017
+dclab/lme4/__init__.py,sha256=Y_oqYEqNnHCjxfdzkoP0ZXPCQx6XSKqwt1pAgdGF2dA,235
+dclab/lme4/rsetup.py,sha256=siVWXt0niXAqD20d2quOjVzaZc4-zF0i81G_HRZE6q0,6951
+dclab/lme4/wrapr.py,sha256=MzJDUZ7L_5xDWVtl5vrDgTJoum2vrxfP0dYwPMcHIPY,16977
+dclab/lme4/rlibs.py,sha256=3oHSrSykeQB9ldvrV4Ite9EffIURUwCo3bn4uBpVeSk,2539
 dclab/cli/task_tdms2rtdc.py,sha256=u0L1Fq9rXIeQG9b72SuUIh_qYC6fG2xXxht9_rcdCao,8283
 dclab/cli/__init__.py,sha256=84YzzV6aE_NY-o7wvqgvUoxBLvIOEXpSUbkVcGRyzQ0,483
 dclab/cli/task_condense.py,sha256=uNZzm04VuQOXJi6uXPmaLdQCk0g8ONueiO4p67yJv0k,8546
@@ -61,52 +61,53 @@ dclab/external/statsmodels/nonparametric/kernel_density.py,sha256=3UyzLuZS68TkNT
 dclab/external/statsmodels/nonparametric/__init__.py,sha256=-GEWgwsF27ems5WTBvR1zo4SWJ0pRTWyHVagnIYer3g,43
 dclab/external/statsmodels/nonparametric/kernels.py,sha256=fuy4kStFz2ZA9pqgfUb4cly-YBpXLu4TJ9-ZujayuIw,1075
 dclab/external/skimage/measure.py,sha256=y1idCqD9TUxp3-QnOiWR_d674OKaeqBJ4MN2-gVP6ro,247
-dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=W_JhGQUFjTgYMCKav2Gi6siCbW8KPH0fgkVLhLiMv7k,204152
+dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=mbbVAIjkayiIBDhsGKg9Aq87fdoFHJEWWB-Lgg1owQs,204152
 dclab/external/skimage/LICENSE,sha256=ivsSBvn3c0R9mOctWRRdza7C7wdZSRYgCVxlVqUdlB8,1452
 dclab/external/skimage/pnpoly.py,sha256=r8hFNiTz5XlUoNZjosqA0iyv1FPn0l7ewbplgFgkdaw,1347
 dclab/external/skimage/_find_contours.py,sha256=16v5eeTZBmevG8SSuXtJ6yUpVPhwfSmtc8pDD0nuuOU,9340
 dclab/external/skimage/__init__.py,sha256=-B2QUKHAFzQuBWuuKvPDC5JIl0Zb-x3OGmbwPaE9VwQ,72
 dclab/external/skimage/_pnpoly.pyx,sha256=Qdn6xPazDschBqbr46DzB75MB2MnqvdnoTSBMK7kUGE,2504
 dclab/external/skimage/_find_contours_cy.pyx,sha256=pZJOBhMHzYEMkcz4WQVyjn7jDNrdjCfet47FU1hRAxk,7161
-dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=yhndZoAGT8Ou40t0FpkWi4QnTukPONPsze3LN3NvJT8,221872
+dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=hUnNOnjTM_SFRIb0kYbZotulkCcgM3vQ570Smt3bsOA,221872
 dclab/external/skimage/_shared/geometry.pxd,sha256=kRsu9ifv_rL3kbRIgSLf86p0hn2oTMp6s013lZ9bBZM,346
 dclab/external/skimage/_shared/__init__.py,sha256=2sHZwTtJSlMTa3Q2YSvQW7jrPLMUSqDJQa-ROe5zfcw,37
-dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=tE4mn9G6EYe6dlAM0AK7LK3y_7qZRDo7ZKn_8nCAOEY,55872
+dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=iwpZ95HtYCxIRUTW9ES8_w1Yj33q9TFyM_q7GpKzUuQ,55872
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
 dclab/definitions/feat_logic.py,sha256=SXsSlAusgtE3uXcPu84dQwYZ07zxmV37DmPednA3_dM,5823
 dclab/definitions/meta_parse.py,sha256=YdaTdM8DAMsIFn5ITH9OHYGTXeAOBGWtx22oVjxXcWk,2393
 dclab/definitions/__init__.py,sha256=56VL7rNTjP61gpGgN2GEUKicds2aBz_nWNwzfNxO_l8,2781
-dclab/definitions/meta_const.py,sha256=zqE-SrD2tJMCFWdtp_IenwnbIQg0lulvbQAw9dK0Gho,13125
+dclab/definitions/meta_const.py,sha256=Nci-QFl6cxe2p8tvfGVIWsRO8NArFOyiA2jPFUIY23M,12399
 dclab/definitions/feat_const.py,sha256=3zii5bXN0d0lMtkiI8dR9ivNlNQYosZASAlOg1UKKPA,9634
 dclab/definitions/meta_logic.py,sha256=wCgb7DPRHaR8DCWw_VbwNkpslUnazzWfgX0iS8oEe90,4194
 dclab/rtdc_dataset/config.py,sha256=MvBteFya3R6Ch3U6UgTakCsJoBgVykTxS_Z25STWPHU,17432
-dclab/rtdc_dataset/check.py,sha256=lJNaz4QTe2WNlxik6zSohRHTiAYuP_bKOzSDjPGTUS0,35006
-dclab/rtdc_dataset/feat_basin.py,sha256=ViKdvJcwFM8joysnrBYdZbA5t_wZix-6xn_FsvzpYsQ,21072
+dclab/rtdc_dataset/check.py,sha256=6l9E2amboqgU9go1BaPtOJgeDgl4GSUuGteF1B2M2X8,32406
+dclab/rtdc_dataset/feat_basin.py,sha256=nxcFjhQiFqsdW0wucEjOMyvZFjCNdS7fFFVrvKvI0EE,19997
 dclab/rtdc_dataset/fmt_s3.py,sha256=OavOOGa2oOyG-VSfehFf6JVNs2k5iZalRm6ZTBu6sY4,10642
 dclab/rtdc_dataset/feat_temp.py,sha256=XbDIS1iUUkRH0Zp9uVlwvK_untJ7hkOnKshK1Drsnt8,3694
 dclab/rtdc_dataset/__init__.py,sha256=MUHSGVQJ4Zc0IyU2lf01dpDWyOyNveHip-UjSkmPNvQ,486
-dclab/rtdc_dataset/core.py,sha256=hho2XD4-s-mag8xtaukf7NC-_XyE8W0dql2wAoGuS3A,37998
-dclab/rtdc_dataset/export.py,sha256=F_HgQUlK9ywINFgYrigPXLxcG-8qgSR5aalHjxNNeMs,29614
+dclab/rtdc_dataset/core.py,sha256=DEaN6-w0she-ylE6ZuNRLmB4Q77fiv7xC01IzUTz-jk,37672
+dclab/rtdc_dataset/export.py,sha256=OxixysUUAlAoOnqip_GtkDSeLPenMQVNeO8zDipxjgo,29484
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
-dclab/rtdc_dataset/writer.py,sha256=KVane_1X2fHJCJjLJ6kAWWHxnKOabO2Akb_54ANu1aU,41172
+dclab/rtdc_dataset/linker.py,sha256=vp2yaqcbb5LESu8MO9WG9--NJor2MWkNcCfoAvlEKq0,4629
+dclab/rtdc_dataset/writer.py,sha256=tOL-Hn9qC9bhJgJvQQgE8sTwS3DV5IB1mCd1M79qK7o,40427
 dclab/rtdc_dataset/filter.py,sha256=AFPUBzOIi3pqXgUdMQ5CIi9ZeGOKC71rfSZKLMLgtog,10023
 dclab/rtdc_dataset/fmt_http.py,sha256=vXVxRLXZp2_V1v3xk4lu4VUHYXfNHJdsRkVt3trC1RU,3374
 dclab/rtdc_dataset/load.py,sha256=wGJuIv7pH1zpBhg6Cj_H0wxHZb-KwHR8TWnyDosCBBA,2473
-dclab/rtdc_dataset/copier.py,sha256=-2ISiOs4ytxN_ttXQGhaepuD2Ppy80G9UlDSZVyEoOU,14175
+dclab/rtdc_dataset/copier.py,sha256=8xSogZ73SU7y2HaTRY1zCml5Q8pZSJsDLiUozCDzwfY,11990
 dclab/rtdc_dataset/feat_anc_plugin/__init__.py,sha256=Em8nKxzex6M46Q86pRoSdrzb02XBiTY9u-npODvwrwk,119
 dclab/rtdc_dataset/feat_anc_plugin/plugin_feature.py,sha256=ED7vAtHgMXoanbeoUdklDAocj0Pq_cpckmCJ-YWqwr8,12381
-dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=pRqiFJpBoTwL2krG3asmLw4Fyp7O-vZDzbUIBpWx7QQ,4547
+dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=tr4S0_chhQidxWmcTook6fXJNtmtfdFfhkTjtl4rwV4,4485
 dclab/rtdc_dataset/fmt_hierarchy/mapper.py,sha256=dgGLO1ki2upV9QP6h7DCyNGgcMw45bzFbXc1CyyFAGw,4210
 dclab/rtdc_dataset/fmt_hierarchy/__init__.py,sha256=0e0lmGjeb9e7skZy1ksfEOFkwKLIu1N6MnuY1aUWkWA,355
 dclab/rtdc_dataset/fmt_hierarchy/hfilter.py,sha256=niYjYz6R-D2S2zurgmmIqrmsSFJ3tVgAS-UxweImAEU,5852
-dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=TaDFysJYhRMDDKwVpQn9qcpfmPZofHkvpu46TyHGht4,9440
+dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=PLmqx-ExfJqVfgVjQNGM6jQ5r9b-zA-t4NwWzrk1ank,9468
 dclab/rtdc_dataset/fmt_hdf5/feat_defect.py,sha256=MeIxPz799x-sljbmSb0n40eVLw_iPnbCfOm07_lTBxo,6540
 dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=mJZR92Qoa71EwDVDYAP9KtOcjvRyjtA2wO1DkCBfBQc,792
-dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=JUuPviS4lEXMjfNgJE-jkeArAwUVkdA1bmAszJGjPvc,8231
+dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=uJFMSkP8f-cmNdzC4X2LDayw2Q1P1k9qV252TmzC5h8,8179
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=yWLYK-Fq0EYnp2eYfl1Ze02RBMOWg-iALJWs4dFSxxY,270
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=-mDewfv_aOeHaJykuJIWsqr9a7-moKhoGhqw9cR4ebg,1004
 dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=G226awNz7NA2V9l1F6jCeyVcJ8V4AJgLYhOfG1Q_5t8,872
-dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=_PgmDq2K7RGCuhV9J4YZwg9noW1hi2w14ZP8ooRR8Lw,6391
+dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=bwbbdt2FXniYANsR1dUF_zeUqT5ByGVv5KfEarnDEhw,6206
 dclab/rtdc_dataset/feat_anc_core/af_fl_max_ctc.py,sha256=gV3FqM0AoOHzWwhU45e3fvBb2MwGVadLL6piVW0YF1s,3687
 dclab/rtdc_dataset/feat_anc_core/af_image_contour.py,sha256=39jvhzz2GmfXDYXu1d3kie7tpBzUkUL_JTxfau-2mt8,3531
 dclab/rtdc_dataset/feat_anc_core/__init__.py,sha256=hEWMqg2rmbxW86Fe-dkTD4b0Zmp-dJe6gPsMjspPGXA,464
@@ -120,7 +121,7 @@ dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=tQZ4GumqURjS3eppRrSyUq1zBPD0y_8rwznM
 dclab/rtdc_dataset/fmt_dcor/__init__.py,sha256=WjO1uM_Vlof15Y7HkhkV5Xv75q9TDIdOBIuS_I38qps,210
 dclab/rtdc_dataset/fmt_dcor/api.py,sha256=COPRnPfPBcxbQGxHFEbGxp2CjK-Mgnt3cIu20-Zz04M,4245
 dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=1JsMr_4r5j8rkfrrUsiN42_l92GcvDjapYxopZKimnw,583
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=XTZlESy4Ht9sqKpROSYJO3msqGw1kyD_41-M5XPlKNY,1181
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=CNDnzhVlz83jDAXe4DagTGH6_U7Vvv2W8QrqbhJr8e0,1069
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=wD127W5LvvhkUy8SvFVVwAR6EEYtzgoWJ4booh45rfA,6588
 dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=eZiDHAGG3MCVckEMHsV-YBbL-pETVLomGk1gmpjc8-k,2175
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=biI9l1EO6BuSYgwZG0deacj4i1fMHQcW78AKXEcm5Wc,5373
@@ -129,9 +130,9 @@ dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=-jp7Z-N91e4ieumYQ1huMicj7PMJqw
 dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=Vkym0QKSw2mq1XZl5n8wDkgHXmaZwQGiMAV5AuRSJkE,5215
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=WzrMqnyrzp8gsT8Pf7JKqGGv43ewx7d_qgtirURppRI,813
 dclab/rtdc_dataset/fmt_tdms/event_contour.py,sha256=kjo0wJx9F0gmmOOyR0NoLw6VEtSl3h63WXXkcbfnoS8,9627
-dclab-0.62.11.dist-info/RECORD,,
-dclab-0.62.11.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab-0.62.11.dist-info/WHEEL,sha256=md3JO_ifs5j508p3TDNMgtQVtnQblpGEt_Wo4W56l8Y,107
-dclab-0.62.11.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.11.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.11.dist-info/METADATA,sha256=ldFV7htY9AHLU56II3PuY7fWKKYcqRPfh819DEa0NcQ,4755
+dclab-2.18.0.dist-info/RECORD,,
+dclab-2.18.0.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
+dclab-2.18.0.dist-info/WHEEL,sha256=ivZiYbV7UW2V9O45eOEv1Q7_vy1G1C3RUsz-H7JDooI,107
+dclab-2.18.0.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-2.18.0.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-2.18.0.dist-info/METADATA,sha256=WTNyL58XdjHtE11bxXQWGntyi981Fv5pWGaxXshj1Iw,4824

{dclab-0.62.11.dist-info → dclab-2.18.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_11_0_arm64