dclab 0.65.0__cp310-cp310-win_amd64.whl → 0.67.0__cp310-cp310-win_amd64.whl

dclab/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.65.0'
-__version_tuple__ = version_tuple = (0, 65, 0)
+__version__ = version = '0.67.0'
+__version_tuple__ = version_tuple = (0, 67, 0)
+
+__commit_id__ = commit_id = 'g52c420117'

dclab/cli/task_tdms2rtdc.py

@@ -158,7 +158,7 @@ def tdms2rtdc_parser():
                         help='Compute features, such as volume or emodulus, '
                              + 'that are otherwise computed on-the-fly. '
                              + 'Use this if you want to minimize analysis '
-                             + 'time in e.g. Shape-Out. CAUTION: ancillary '
+                             + 'time in e.g. DCscope. CAUTION: ancillary '
                              + 'feature recipes might be subject to change '
                              + '(e.g. if an error is found in the recipe). '
                              + 'Disabling this option maximizes '

dclab/definitions/__init__.py

@@ -6,7 +6,7 @@ from .feat_const import (
     # these should not be used
     feature_names, feature_labels, feature_name2label,
     # this one should also not be used, but we wait with deprecation,
-    # because Shape-Out heavily relies on it (it shouldn't)
+    # because DCscope heavily relies on it (it shouldn't)
     scalar_feature_names
     )
 from .feat_logic import (

dclab/definitions/feat_const.py

@@ -149,7 +149,7 @@ for _i in range(10):
 #: consist of the integer array `[1, 3, 5, 7, ...]` (indexing starts at zero).
 #: The `basinmap1` feature must then be referenced in the corresponding basin
 #: definition. These features should not be presented explicitly to the
-#: normal user (e.g. in Shape-Out) to avoid ambiguities, and they should
+#: normal user (e.g. in DCscope) to avoid ambiguities, and they should
 #: always be exported alongside basins that refer to them.
 for _j in range(10):
     FEATURES_SCALAR.append([f"basinmap{_j}", f"Basin mapping {_j}"])

dclab/rtdc_dataset/config.py

@@ -437,7 +437,7 @@ def load_from_file(cfg_file):
                 convfunc = dfn.get_config_value_func(sec, var)
                 val = convfunc(val)
             else:
-                # unknown parameter (e.g. plotting in Shape-Out), guess type
+                # unknown parameter (e.g. plotting in DCscope), guess type
                 var, val = keyval_str2typ(var, val)
             if len(var) != 0 and len(str(val)) != 0:
                 cfg[sec][var] = val

dclab/rtdc_dataset/core.py

@@ -741,7 +741,9 @@ class RTDCBase(abc.ABC):
                 # need the referring dataset.
                 "mapping_referrer": self,
                 # Make sure the measurement identifier is checked.
-                "measurement_identifier": self.get_measurement_identifier(),
+                "referrer_identifier": self.get_measurement_identifier(),
+                # Make sure the basin identifier is checked.
+                "basin_identifier": bdict.get("identifier"),
                 # allow to ignore basins
                 "ignored_basins": bd_keys,
                 # basin key

dclab/rtdc_dataset/export.py

@@ -39,6 +39,10 @@ class LimitingExportSizeWarning(UserWarning):
     pass
 
 
+class ContourNotExportedWarning(UserWarning):
+    pass
+
+
 class Export(object):
     def __init__(self, rtdc_ds):
         """Export functionalities for RT-DC datasets"""
@@ -228,6 +232,7 @@ class Export(object):
              logs: bool = False,
              tables: bool = False,
              basins: bool = False,
+             allow_contour: bool = False,
              meta_prefix: str = "src_",
              override: bool = False,
              compression_kwargs: Dict = None,
@@ -260,6 +265,14 @@ class Export(object):
             Whether to export basins. If filtering is disabled, basins
             are copied directly to the output file. If filtering is enabled,
             then mapped basins are exported.
+        allow_contour: bool
+            Whether to allow exporting the "contour" feature. Writing this
+            feature to an HDF5 file is extremely inefficient, because it
+            cannot be represented by an ND array and thus must be stored
+            in a group, each contour stored in a separate dataset. The
+            contour can easily be computed via the mask, so actually storing
+            the contour should be avoided. If "contour" is in `features`,
+            it will only be written to the output file if `allow_contour=True`.
         meta_prefix: str
             Prefix for log and table names in the exported file
         override: bool
@@ -318,8 +331,25 @@ class Export(object):
         # for convenience
         ds = self.rtdc_ds
 
+        # remove contour information from user-specified features
+        if "contour" in (features or []) and not allow_contour:
+            features = list(features)
+            features.remove("contour")
+            warnings.warn(
+                "Feature 'contour' not exported to output file, because "
+                "`allow_contour` is `False`. If you really need the "
+                "'contour' feature in the output file (unlikely, unless you "
+                "are venturing outside the DC Cosmos), you must set "
+                "`allow_contour=True`. Otherwise, you can safely ignore "
+                "this warning or silence it by not providing 'contour' in "
+                "`features`.",
+                ContourNotExportedWarning)
+
         if features is None:
             features = ds.features_innate
+            # silently remove contour information
+            if "contour" in features and not allow_contour:
+                features.remove("contour")
 
         # decide which metadata to export
         meta = {}
@@ -438,7 +468,6 @@ class Export(object):
                 if progress_callback:
                     progress_callback(1 - 1 / (len(features) or 1),
                                       "writing basins")
-
                 # We have to store basins. There are three options:
                 # - filtering disabled: just copy basins
                 # - filtering enabled
@@ -450,6 +479,8 @@ class Export(object):
                 basin_list = [bn.as_dict() for bn in ds.basins]
                 # In addition to the upstream basins, also store a reference
                 # to the original file from which the export was done.
+                # Get the identifier of the current dataset for the new basins.
+                basin_id = ds.get_measurement_identifier()
                 if ds.format in get_basin_classes():
                     # The dataset has a format that matches a basin format
                     # directly.
@@ -464,6 +495,7 @@ class Export(object):
                         "basin_format": ds.format,
                         "basin_locs": basin_locs,
                         "basin_descr": f"Exported with dclab {version}",
+                        "basin_id": basin_id,
                     })
                 elif (ds.format == "hierarchy"
                       and ds.get_root_parent().format in get_basin_classes()):
@@ -497,6 +529,7 @@ class Export(object):
                             child=ds,
                             child_indices=np.arange(len(ds))
                             ),
+                        "basin_id": basin_id,
                     })
 
                 for bn_dict in basin_list:

dclab/rtdc_dataset/feat_basin.py

@@ -176,7 +176,8 @@ class Basin(abc.ABC):
                  name: str = None,
                  description: str = None,
                  features: List[str] = None,
-                 measurement_identifier: str = None,
+                 referrer_identifier: str = None,
+                 basin_identifier: str = None,
                  mapping: Literal["same",
                                   "basinmap0",
                                   "basinmap1",
@@ -208,10 +209,18 @@ class Basin(abc.ABC):
         features: list of str
             List of features this basin provides; This list is enforced,
             even if the basin actually contains more features.
-        measurement_identifier: str
+        referrer_identifier: str
             A measurement identifier against which to check the basin.
+            If the basin mapping is "same", then this must match the
+            identifier of the basin exactly, otherwise it must start
+            with the basin identifier (e.g. "basin-id_referrer-sub-id").
             If this is set to None (default), there is no certainty
             that the downstream dataset is from the same measurement.
+        basin_identifier: str
+            A measurement identifier that must match the basin exactly.
+            In contrast to `referrer_identifier`, the basin identifier is
+            the identifier of the basin file. If `basin_identifier` is
+            specified, the identifier of the basin must be identical to it.
         mapping: str
             Which type of mapping to use. This can be either "same"
             when the event list of the basin is identical to that
@@ -261,8 +270,9 @@ class Basin(abc.ABC):
         # features this basin provides
         self._features = features
         #: measurement identifier of the referencing dataset
-        self.measurement_identifier = measurement_identifier
-        self._measurement_identifier_verified = False
+        self.referrer_identifier = referrer_identifier
+        self.basin_identifier = basin_identifier or None
+        self._identifiers_verification = None
         #: ignored basins
         self.ignored_basins = ignored_basins or []
         #: additional keyword arguments passed to the basin
@@ -304,13 +314,13 @@ class Basin(abc.ABC):
 
         return f"<{self.__class__.__name__} ({opt_str}) at {hex(id(self))}>"
 
-    def _assert_measurement_identifier(self):
+    def _assert_referrer_identifier(self):
         """Make sure the basin matches the measurement identifier
         """
         if not self.verify_basin(run_identifier=True):
             raise KeyError(f"Measurement identifier of basin {self.ds} "
                            f"({self.get_measurement_identifier()}) does "
-                           f"not match {self.measurement_identifier}!")
+                           f"not match {self.referrer_identifier}!")
 
     @property
     def basinmap(self):
@@ -410,7 +420,7 @@ class Basin(abc.ABC):
 
     def get_feature_data(self, feat):
         """Return an object representing feature data of the basin"""
-        self._assert_measurement_identifier()
+        self._assert_referrer_identifier()
         return self.ds[feat]
 
     def get_measurement_identifier(self):
@@ -455,20 +465,30 @@ class Basin(abc.ABC):
         # Only check for run identifier if requested and if the availability
         # check did not fail.
         if run_identifier and check_avail:
-            if not self._measurement_identifier_verified:
-                if self.measurement_identifier is None:
+            if self._identifiers_verification is None:
+                # This is the measurement identifier of the basin.
+                basin_identifier = self.get_measurement_identifier()
+
+                # Perform a sanity check for the basin identifier.
+                if (self.basin_identifier
+                        and self.basin_identifier != basin_identifier):
+                    # We should not proceed any further with this basin.
+                    self._identifiers_verification = False
+                    warnings.warn(
+                        f"Basin identifier mismatch for {self}. Expected "
+                        f"'{self.basin_identifier}', got '{basin_identifier}'")
+
+                if self.referrer_identifier is None:
                     # No measurement identifier was presented by the
                     # referencing dataset. We are in the dark.
                     # Don't perform any checks.
-                    self._measurement_identifier_verified = True
+                    self._identifiers_verification = True
                 else:
-                    # This is the measurement identifier of the basin.
-                    basin_identifier = self.get_measurement_identifier()
                     if basin_identifier is None:
                         # Again, we are in the dark, because the basin dataset
                         # does not have an identifier. This is an undesirable
                         # situation, but there is nothing we can do about it.
-                        self._measurement_identifier_verified = True
+                        self._identifiers_verification = True
                     else:
                         if self.mapping == "same":
                             # When we have identical mapping, then the
@@ -479,10 +499,10 @@ class Basin(abc.ABC):
                             # data), then the measurement identifier has to
                             # partially match.
                             verifier = str.startswith
-                        self._measurement_identifier_verified = verifier(
-                            self.measurement_identifier, basin_identifier)
+                        self._identifiers_verification = verifier(
+                            self.referrer_identifier, basin_identifier)
 
-            check_rid = self._measurement_identifier_verified
+            check_rid = self._identifiers_verification
         else:
             check_rid = True
 
@@ -547,8 +567,8 @@ class BasinProxy:
     def __getitem__(self, feat):
         if feat not in self._features:
             if feat == "contour":
-                raise NotImplementedError("Feature 'contour' cannot be "
-                                          "handled by BasinProxy.")
+                feat_obj = BasinProxyContour(feat_obj=self.ds[feat],
+                                             basinmap=self.basinmap)
             else:
                 feat_obj = BasinProxyFeature(feat_obj=self.ds[feat],
                                              basinmap=self.basinmap)
@@ -559,14 +579,61 @@ class BasinProxy:
         return len(self.basinmap)
 
 
+class BasinProxyContour:
+    def __init__(self, feat_obj, basinmap):
+        """Wrap around a contour, mapping it upon data access, no caching"""
+        self.feat_obj = feat_obj
+        self.basinmap = basinmap
+        self.is_scalar = False
+        self.shape = (len(self.basinmap), np.nan, 2)
+        self.identifier = feat_obj.identifier
+
+    def __getattr__(self, item):
+        if item in [
+            "dtype",
+        ]:
+            return getattr(self.feat_obj, item)
+        else:
+            raise AttributeError(
+                f"BasinProxyContour does not implement {item}")
+
+    def __getitem__(self, index):
+        if isinstance(index, numbers.Integral):
+            # single index, cheap operation
+            return self.feat_obj[self.basinmap[index]]
+        else:
+            raise NotImplementedError(
+                "Cannot index contours without anything else than integers.")
+
+    def __len__(self):
+        return self.shape[0]
+
+
 class BasinProxyFeature(np.lib.mixins.NDArrayOperatorsMixin):
     def __init__(self, feat_obj, basinmap):
         """Wrap around a feature object, mapping it upon data access"""
         self.feat_obj = feat_obj
         self.basinmap = basinmap
         self._cache = None
+        self._shape = None
+        self._size = None
         self.is_scalar = bool(len(self.feat_obj.shape) == 1)
 
+    @property
+    def shape(self):
+        if self._shape is None:
+            if self.is_scalar:
+                self._shape = self.basinmap.shape
+            else:
+                self._shape = (self.basinmap.size,) + self.feat_obj.shape[1:]
+        return self._shape
+
+    @property
+    def size(self):
+        if self._size is None:
+            self._size = np.prod(self.shape)
+        return self._size
+
     def __array__(self, dtype=None, copy=copy_if_needed, *args, **kwargs):
         if self._cache is None and self.is_scalar:
             self._cache = self.feat_obj[:][self.basinmap]
@@ -583,8 +650,6 @@ class BasinProxyFeature(np.lib.mixins.NDArrayOperatorsMixin):
     def __getattr__(self, item):
         if item in [
             "dtype",
-            "shape",
-            "size",
         ]:
             return getattr(self.feat_obj, item)
         else:

dclab/rtdc_dataset/fmt_hdf5/events.py

@@ -1,6 +1,7 @@
 """RT-DC hdf5 format"""
 from __future__ import annotations
 
+import pathlib
 import warnings
 
 import numbers
@@ -17,7 +18,17 @@ class H5ContourEvent:
         self._length = length
         self.h5group = h5group
         # for hashing in util.obj2bytes
-        self.identifier = (h5group.file.filename, h5group["0"].name)
+        # path within the HDF5 file
+        o_name = h5group["0"].name,
+        # filename
+        o_filename = h5group.file.filename
+        _data = [o_name, o_filename]
+        if pathlib.Path(o_filename).exists():
+            # when the file was changed
+            _data.append(pathlib.Path(h5group.file.filename).stat().st_mtime)
+            # size of the file
+            _data.append(pathlib.Path(h5group.file.filename).stat().st_size)
+        self.identifier = _data
 
     def __getitem__(self, key):
         if not isinstance(key, numbers.Integral):
@@ -168,6 +179,10 @@ class H5MaskEvent:
     def shape(self):
         return self.h5dataset.shape
 
+    @property
+    def size(self):
+        return np.prod(self.shape)
+
 
 class H5ScalarEvent(np.lib.mixins.NDArrayOperatorsMixin):
     def __init__(self, h5ds):
@@ -224,6 +239,10 @@ class H5ScalarEvent(np.lib.mixins.NDArrayOperatorsMixin):
     def shape(self):
         return self.h5ds.shape
 
+    @property
+    def size(self):
+        return len(self)
+
 
 class H5TraceEvent:
     def __init__(self, h5group):

dclab/rtdc_dataset/fmt_hierarchy/base.py

@@ -29,7 +29,7 @@ class RTDC_Hierarchy(RTDCBase):
         Children in hierarchies always update their data according to
         the filtered event data from their parent when `apply_filter`
         is called. This makes it easier to save and load hierarchy
-        children with e.g. Shape-Out and it makes the handling of
+        children with e.g. DCscope and it makes the handling of
         hierarchies more intuitive (when the parent changes,
         the child changes as well).
 

dclab/rtdc_dataset/fmt_tdms/event_trace.py

@@ -17,7 +17,7 @@ class TraceColumn(object):
 
         The trace data is loaded when __getitem__, __len__, or __iter__
         are called. This saves time and memory when the trace data is
-        not needed at all, e.g. for batch processing with Shape-Out.
+        not needed at all, e.g. for batch processing with DCscope.
         """
         self._trace = None
         self.mname = rtdc_dataset.path

dclab/rtdc_dataset/fmt_tdms/naming.py

@@ -49,7 +49,7 @@ for kk in dclab2tdms:
     tdms2dclab[dclab2tdms[kk]] = kk
 
 # Add capitalized userdef features as well.
-# see https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut/issues/212
+# see https://github.com/DC-analysis/DCscope/issues/212
 for _i in range(10):
     tdms2dclab["UserDef{}".format(_i)] = "userdef{}".format(_i)
 

dclab/rtdc_dataset/writer.py

@@ -207,6 +207,7 @@ class RTDCWriter:
                     basin_descr: str | None = None,
                     basin_feats: List[str] = None,
                     basin_map: np.ndarray | Tuple[str, np.ndarray] = None,
+                    basin_id: str = None,
                     internal_data: Dict | h5py.Group = None,
                     verify: bool = True,
                     perishable: bool = False,
@@ -243,6 +244,12 @@ class RTDCWriter:
             a case, you may specify a tuple `(feature_name, mapping_array)`
             where `feature_name` is the explicit mapping name, e.g.
             `"basinmap3"`.
+        basin_id: str
+            Identifier of the basin. This is the string returned by
+            :meth:`.RTDCBase.get_measurement_identifier`. This is
+            a unique string that identifies the data within a basin.
+            If not specified and `verify=True`, this value is automatically
+            taken from the basin file.
         internal_data: dict or instance of h5py.Group
             A dictionary or an `h5py.Group` containing the basin data.
             The data are copied to the "basin_events" group, if
@@ -310,19 +317,30 @@ class RTDCWriter:
             # We have to import this here to avoid circular imports
             from .load import new_dataset
             # Make sure the basin can be opened by dclab, verify its ID
-            cur_id = self.h5file.attrs.get("experiment:run identifier")
+            ref_id = self.h5file.attrs.get("experiment:run identifier")
             for loc in basin_locs:
                 with new_dataset(loc) as ds:
                     # We can open the file, which is great.
-                    if cur_id:
-                        # Compare the IDs.
-                        ds_id = ds.get_measurement_identifier()
-                        if not (ds_id == cur_id
+                    # Compare the IDs.
+                    bn_id = ds.get_measurement_identifier()
+                    # Check whether `basin_id` matches the actual basin
+                    if basin_id:
+                        if basin_id != bn_id:
+                            raise ValueError(
+                                f"Measurement identifier mismatch for "
+                                f"{loc}: got {bn_id}, expected {basin_id=})!")
+                    else:
+                        # If `basin_id` was not specified, set it here for
+                        # user convenience.
+                        basin_id = bn_id or None
+                    # Check whether the referrer ID matches the basin ID.
+                    if ref_id:
+                        if not (bn_id == ref_id
                                 or (basin_map is not None
-                                    and cur_id.startswith(ds_id))):
+                                    and ref_id.startswith(bn_id))):
                             raise ValueError(
                                 f"Measurement identifier mismatch between "
-                                f"{self.path} ({cur_id}) and {loc} ({ds_id})!")
+                                f"{self.path} ({ref_id}) and {loc} ({bn_id})!")
             if basin_feats:
                 for feat in basin_feats:
                     if not dfn.feature_exists(feat):
@@ -389,6 +407,7 @@ class RTDCWriter:
             "features": None if basin_feats is None else sorted(basin_feats),
             "mapping": basin_map_name,
             "perishable": perishable,
+            "identifier": basin_id,
         }
         if basin_type == "file":
             flocs = []

dclab/warn.py

@@ -9,7 +9,7 @@ class PipelineWarning(UserWarning):
     computation) in his analysis pipeline. All of these
     warnings should be subclassed from PipelineWarning
     to allow identifying them in higher-level software
-    such as Shape-Out and to present them correctly to the
+    such as DCscope and to present them correctly to the
     user.
     """
     pass

{dclab-0.65.0.dist-info → dclab-0.67.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dclab
-Version: 0.65.0
+Version: 0.67.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>
@@ -46,7 +46,13 @@ Dynamic: license-file
 
 This is a Python library for the post-measurement analysis of
 real-time deformability cytometry (RT-DC) datasets; an essential part of
-`Shape-Out <https://github.com/ZELLMECHANIK-DRESDEN/ShapeOut2>`__.
+the DC Cosmos (
+`DCscope <https://github.com/DC-analysis/DCscope>`__,
+`DCOR <https://github.com/DCOR-dev/dcor_control>`__,
+`DCOR-Aid <https://github.com/DCOR-dev/DCOR-Aid>`__,
+`DCTag <https://github.com/DC-analysis/DCTag>`__,
+`DCKit <https://github.com/DC-analysis/DCKit>`__,
+).
 
 Documentation
 -------------

{dclab-0.65.0.dist-info → dclab-0.67.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dclab/__init__.py,sha256=kSr6VI0UI-beS9beOEpERTUAV1NINHx_G6u1VmBm9D8,1624
-dclab/_version.py,sha256=_mxGrRjXWiOF95UUEGVhRBBil-513LRs9VvSfA91XWs,534
+dclab/_version.py,sha256=lCyG3P8iqvkx1I6kMK1xxqcyHbK7HEOQIwzkbrwlN0E,748
 dclab/cached.py,sha256=t01BYTf43VEsBYa0c-bMxgceF5vKoGV73b42UlLH6Lo,3014
-dclab/downsampling.cp310-win_amd64.pyd,sha256=C4wSBuvQLqGUfuDmdiHKBTbGsN-oF9mQ5Cp4ybo3uao,174080
+dclab/downsampling.cp310-win_amd64.pyd,sha256=pDqHxv66KrVwCuq91GKbCwxDdT12gRhaz-MuC2Hn3vw,174080
 dclab/downsampling.pyx,sha256=Ez6MbNbzCUzs2IXXKtAYsjtYqP22kI8hdA1IE-3mqvY,7488
 dclab/http_utils.py,sha256=aIW4ATmyk02AjQmoTm7mAWdsaQD1siEPLx47IlEcYls,11234
 dclab/kde_contours.py,sha256=cYeBtvbBqLHCz5W8AiEAAd9O3yLsSBbLcRVj1WZ1pRo,288
@@ -9,7 +9,7 @@ dclab/kde_methods.py,sha256=tY82WQsX2_5_Szb7zma9yQD-HxCg2fAkMvNs-K05jMQ,376
 dclab/polygon_filter.py,sha256=C4uBvK8zzT8irUOIgITvASlCtc0EEMM5edp4dFx-9jw,13878
 dclab/statistics.py,sha256=nluuzl9h-RokxpsYLFLTAx6gnt6ArBhmQJffZbeIlac,7824
 dclab/util.py,sha256=X9LqxrEJNClzPSko49MMsz2MlybLwkButqqQmxfnj44,6036
-dclab/warn.py,sha256=pv_W9cKBJg-mUn-_6O4xBwRmwI9QaEIW9EBEIiyL0iU,538
+dclab/warn.py,sha256=u5s1hinbH87wOL6IbcOQy1NAWn8834FeyOn8bqidsTM,536
 dclab/cli/__init__.py,sha256=IB33_cscv866CAwXnP1ZO9tlBpOldB0UQuR5P87FmSQ,493
 dclab/cli/common.py,sha256=_YEmejfizH54aBI2q5solRMz8HN421rDkLj1dRXp7Tk,7461
 dclab/cli/task_compress.py,sha256=d3ha6vEhz4g5BA3UPgm2jtWvPpEHDrVhlB7bB_dAOgc,4226
@@ -17,10 +17,10 @@ dclab/cli/task_condense.py,sha256=6gNjdkOQ2IdzYn4WGEOGMJVTNJICsQkiqX3ugyqxQgk,87
 dclab/cli/task_join.py,sha256=glg7odwm7_1-hE1-2PrMfThpwhg2L_2quFSzzNSAJag,9693
 dclab/cli/task_repack.py,sha256=FrWE73U1EmZlns4NTsW0Vx84xJoYu-fz-IPq5XsDCGg,3413
 dclab/cli/task_split.py,sha256=amzoRWig8icmuSG8j4Jl_CC-ZCPMiFRUgVNuFF91Q5I,6214
-dclab/cli/task_tdms2rtdc.py,sha256=5YjDCLl9NoZMbeZtl7csH5qx_8dvzF3p-8ndsneOhBI,8469
+dclab/cli/task_tdms2rtdc.py,sha256=MStzHA9KnjnDeWPiPGVoRbyjurGCIDYyQkuZ4ooet-I,8467
 dclab/cli/task_verify_dataset.py,sha256=OFy7aWHvA6NInndnMBg0MVZSBibvJeNHhc_C79_9PAk,2780
-dclab/definitions/__init__.py,sha256=cubgnqpBbPgk_c1_uUPggRsmtUd-baV1haybLqbMf8k,2860
-dclab/definitions/feat_const.py,sha256=I772sd6aSNv8PzhT9MHnNKbGhx6ZJt3z3_FVs5oxMtw,9836
+dclab/definitions/__init__.py,sha256=oe-prINhfmT8HeIdOCpBGMdHhI6E_QIcFGi-EGd9MGE,2858
+dclab/definitions/feat_const.py,sha256=6SpkCcQcPpZ0wPUB5SS6nnSMCeVeWJAnTsKSId5k57c,9834
 dclab/definitions/feat_logic.py,sha256=ZZlf3-uze5qFvRtlTHJQZmE9mTF3L7TMyk8YTnCCRzw,5561
 dclab/definitions/meta_const.py,sha256=X3U3orhlY_i78TYN4DUBJaOGBltNnXaRsQauH1LxuJ0,13377
 dclab/definitions/meta_logic.py,sha256=no6fTCmKFrwpmirs_9358-Ysh5aZeib1xJrL_30WkqU,4305
@@ -35,14 +35,14 @@ dclab/external/packaging/version.py,sha256=NgEgv7me4UCvFMyiNYD-nc_28b9UHUvBVh8RD
 dclab/external/skimage/LICENSE,sha256=Tdv08zzxYV32WRdYnco9P3nVyS5w17OTxIAFeRSd1wc,1480
 dclab/external/skimage/__init__.py,sha256=icOIlThkyn_hxmnM_i7OpbU7fhvqYWNpGdNGD38qthU,74
 dclab/external/skimage/_find_contours.py,sha256=auRMNfZg7B73DX7kPXxgD8gMXXB3Lk9QDWt4wlQnUWg,9556
-dclab/external/skimage/_find_contours_cy.cp310-win_amd64.pyd,sha256=05dRdui2WfHhrDA1LjcOgq50458ezuqqQ_TlASgwUnY,136704
+dclab/external/skimage/_find_contours_cy.cp310-win_amd64.pyd,sha256=QfpK3mTCje4N3wEPYAI9uCgEyPengaZlh4JZmJRcdIQ,136704
 dclab/external/skimage/_find_contours_cy.pyx,sha256=c-EobLhKjZNCpuqWxmvrcH35uAY_Bu-_hZiUHbXODms,7349
-dclab/external/skimage/_pnpoly.cp310-win_amd64.pyd,sha256=TcwABtRSlww31gsxwYGI-hMoUZm8hWFl_yCNlEDFqIY,150016
+dclab/external/skimage/_pnpoly.cp310-win_amd64.pyd,sha256=72hdA3gQ3wLak057KaGUSafjXy8HkWBbiM6vGVei0Ag,150016
 dclab/external/skimage/_pnpoly.pyx,sha256=eHV3DlIGcBhAQ12-Y58EYq8xcq0Sibyc4xTxzX9NJsk,2603
 dclab/external/skimage/measure.py,sha256=rzyI0HCr9O9GJNieVW8pcqDjTGRAdSehDUawD8QkIAE,254
 dclab/external/skimage/pnpoly.py,sha256=zB4rSxjHJyY1OsGZ7QfFQqxIEDLGK8CWPehwutoFqm4,1400
 dclab/external/skimage/_shared/__init__.py,sha256=q29esTsNh0HfQxcd2EuwdYNbEBJwo_qY4dfv7RihzoA,38
-dclab/external/skimage/_shared/geometry.cp310-win_amd64.pyd,sha256=wfOnppHCysMnJF2X3RjNy38znrsHRJjMGwqzpq4FAHI,19968
+dclab/external/skimage/_shared/geometry.cp310-win_amd64.pyd,sha256=d_9zhzMpoHXQNIoymLdGH0R_vwPvS1wMfYsvgVITXWQ,19968
 dclab/external/skimage/_shared/geometry.pxd,sha256=3gJ7fbXXsxJunSN4biE0dzEbZpX9ZqzR4cUDDN0JnAU,352
 dclab/external/skimage/_shared/geometry.pyx,sha256=b6hADE8chse63haO1Kdt13_oQ54J9tkBf7dVA22-s-M,1722
 dclab/external/statsmodels/LICENSE,sha256=8D7nwukc6YgsZCdN9mG0psM3I9j-z8fuUgFyVhnMXpU,1672
@@ -85,11 +85,11 @@ dclab/lme4/rsetup.py,sha256=_3ov0QlBH_CguoAanKmsm09JfgjfADhRimqMR16FnMk,6094
 dclab/lme4/wrapr.py,sha256=tZYvUy5LUM7sM3d8NiOIlxbrtu89LAihG4hqI6MSv2Q,15403
 dclab/rtdc_dataset/__init__.py,sha256=BuWKEUm7QUe-Kj1wMR0AXON_XN2mzXlbOgouHdnvAw4,501
 dclab/rtdc_dataset/check.py,sha256=l2QoIL3gno_Z2-e8RvYHAurHZP_oLGtZk8l6jUDiuTA,35908
-dclab/rtdc_dataset/config.py,sha256=HVJiqKlqd-SpYqnNTKSr1yUsq2Bkfq5s5zluT-8PUc0,17965
+dclab/rtdc_dataset/config.py,sha256=Dxyw-EGvooUhn3FAK--nzJotBs0E70snuQ2VqDWd2gc,17963
 dclab/rtdc_dataset/copier.py,sha256=imD0ijAz9BY0nksF2zUBeoGmeo_dUTUnBgY9TqRaD4g,14528
-dclab/rtdc_dataset/core.py,sha256=jOE21lhOC3ViA68QiykGVOs437SlCotTYRTcA9Tk2MQ,35671
-dclab/rtdc_dataset/export.py,sha256=tjJjP9Scg-ak0fI7wmmRuFEm4-h_1fkj9N6__VF8P44,34261
-dclab/rtdc_dataset/feat_basin.py,sha256=nMDw5T_lvhbllG1SmCy6dBrOc5yeNp7eX0uWyTTE1tY,27618
+dclab/rtdc_dataset/core.py,sha256=nyv6CtHTJSyEeh3_4tB62iZo9xhm7GSb55gxx9OPPBg,35792
+dclab/rtdc_dataset/export.py,sha256=QNcQiWlywCaZqp1vth8Pl9DXfBMwDF1Dn9GpeH8ZWU8,36078
+dclab/rtdc_dataset/feat_basin.py,sha256=ovjqAbf_CL50-XcNu1eSJb4cehKNehUCr00G7W7nw5U,30127
 dclab/rtdc_dataset/feat_temp.py,sha256=5QiF8Nc8MVoTtinYlvfoSuoopND-uvWVWKjMggBTHLw,3796
 dclab/rtdc_dataset/filter.py,sha256=IRaEUt0tWtZGLKYvtqzfYO2kN5yhqx9eLoHd3VOLCTE,10286
 dclab/rtdc_dataset/fmt_dict.py,sha256=-tlzOwsOCh4Vt3rSiBUvMKW7vBgrRNubU7ZHdGMB3gE,3112
@@ -97,7 +97,7 @@ dclab/rtdc_dataset/fmt_http.py,sha256=XzcgvJ4lm-eWbveBraBc5PPJeGWeUGC35p8ptnxByc
 dclab/rtdc_dataset/fmt_s3.py,sha256=yOBrwN6Fwz0EVNolVlPvZggTeIeCHUYYBVb8w1izO3Y,12231
 dclab/rtdc_dataset/load.py,sha256=odD0ZfIHBkBLgHIKv6z5PJ6yvTEfSawC3OKeRSjk_YU,2838
 dclab/rtdc_dataset/meta_table.py,sha256=srz1mq-oS3OoL-qRScvWX98smNNVXLF99zpTO3GlvwI,673
-dclab/rtdc_dataset/writer.py,sha256=Tp-cgM6FGcLodcZ1WeABzozdfI0kfxUPxm_PTNnpS2E,42819
+dclab/rtdc_dataset/writer.py,sha256=iO9LOUAt9Exndr9sgy9kszoc4f0CHpEXxhkJLGTLDsA,43864
 dclab/rtdc_dataset/feat_anc_core/__init__.py,sha256=j7vtbQGJid3hchXryo19cxnwanepdDQ_RuJVf740mZs,488
 dclab/rtdc_dataset/feat_anc_core/af_basic.py,sha256=7pM6Gn1ZkuttHNfkaLijPudddAu0jMDPGJS9HzKh8rE,2268
 dclab/rtdc_dataset/feat_anc_core/af_emodulus.py,sha256=lsJpQ409EsxnMtyhO7igquWnJxIhXz_w9f8vtIq7F1M,6830
@@ -118,12 +118,12 @@ dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=X3FOtM7V2VEIqnm2OaE3HnUoKHwzGWeSZPs
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=UnitCqiMkY8mMcUKgfLBRVBP5srpTNLrZd3BIRr2tZE,276
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=CAcYaN_6X10NK-R1IvlJj6y70lNyAVyT0OnGMs4VMB4,6583
 dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=qbYgj0RKS9k6RTu5XmYEtgdcbqnVNokD3rAxogyrWrU,822
-dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=6u2K86vqxd4qWaYk_hzRA5LMQRrduNvMxmloWWt4aMc,8488
+dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=Qr_ecgtpHNm4tXG6W5SiFmO_tbyL-itEgttZ8u3Zgdo,9058
 dclab/rtdc_dataset/fmt_hdf5/feat_defect.py,sha256=w7dfs6pULUVJ8Ypz2VBYIKokKVhCn6as6fn3GL8Z7s0,6704
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=c33YLC70h7RR4uw-RPc-vvTPTMZgSfd_0Nz9pAeA6d4,1037
 dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=AK5PpB_UDO4ovJSAGsve2YfKBbMkhntRqjC47zVtDKM,1613
 dclab/rtdc_dataset/fmt_hierarchy/__init__.py,sha256=NB8Tz6-AquG0rAiCeCSQGIzw_W1y7mNz4V4MI-yaEJ0,366
-dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=OivbnWpU9yNVoNJ6wcY8IFyTNTSAzm-lJa8gtz4GUK0,9718
+dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=WZmwHe7KBgUFzAzAIoHVMTrhxmHO2_Oe2Ih6kb8N-Hc,9716
 dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=36aIw3wyOLi6uPGUO4gG6DhLzJHFiwXTh-2bJjSqMmI,4693
 dclab/rtdc_dataset/fmt_hierarchy/hfilter.py,sha256=EQhA8grohdMYOdbzJdB4rGv7hjtnDkpXWG7REOopmB4,5992
 dclab/rtdc_dataset/fmt_hierarchy/mapper.py,sha256=lTnHKtTOpljcdzDflucsFKW4SfxP62bl_VpAvIhRBts,4344
@@ -131,12 +131,12 @@ dclab/rtdc_dataset/fmt_tdms/__init__.py,sha256=2aQki_mZeiPl0yxmDhdpveXiUOFnzjlj-
 dclab/rtdc_dataset/fmt_tdms/event_contour.py,sha256=zKmlOFXhLSYGl4uZlvZRLiv76Vf1jP4R1zUhfIaoJVg,9891
 dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=z8SIjmuJ5UtoohcmQ94i1qNJBi8HNbtsTZBVd6Bsw_o,8226
 dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=cW-Tw2PIe6X1Hc4UZJ22-mI_qFaIMWA5x0sZ7Slb1rE,2237
-dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=ktWnXfMir1v5Wfeo7tOd0txSOe1bgsXotf9Ul5T5-B4,5361
+dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=ilQ315tH_aP6xL9pR_p3ZNJkrXV2rpV_FJu9tdA6ekg,5359
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=FfxUY4LGIMPGJTYmGITmEm7X5iu8GBsj7OfZR8Zb-IE,850
-dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=SFeWiwIN7sg0qNe0Aya2bZshN1Zbw4YcOKunZ6kfIGM,5524
-dclab-0.65.0.dist-info/licenses/LICENSE,sha256=Aq3cYb2xLk3Y_aIOhaoZxi8FlVeMVs3-3FMEBvAEixM,15643
-dclab-0.65.0.dist-info/METADATA,sha256=uAUuKYkN9sH3Ii8cZsuM4bc5cL4p8ssKpTMZKFao00E,4913
-dclab-0.65.0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-dclab-0.65.0.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.65.0.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.65.0.dist-info/RECORD,,
+dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=Gu36Bvsy3apJj6Du8DpVWTmxkqOshcsGNMLPVXUGk8w,5514
+dclab-0.67.0.dist-info/licenses/LICENSE,sha256=Aq3cYb2xLk3Y_aIOhaoZxi8FlVeMVs3-3FMEBvAEixM,15643
+dclab-0.67.0.dist-info/METADATA,sha256=IVsyfVFODL-Ohuo4wW6JvUs-acpUSDM1JAxYuD8-hi4,5131
+dclab-0.67.0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+dclab-0.67.0.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.67.0.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.67.0.dist-info/RECORD,,