dclab 0.65.0__cp313-cp313-macosx_11_0_arm64.whl → 0.67.0__cp313-cp313-macosx_11_0_arm64.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,13 +1,13 @@
 dclab/kde_methods.py,sha256=f0-zDN7ETintvGB3gSzxwgBb53YtT9jZtzI70EAX50g,365
-dclab/_version.py,sha256=BT1Cb9U9MvH-WQX7Cjgfkn_LwsFhZPas-_Emage6tIU,513
+dclab/_version.py,sha256=YrLn6YVZXLYQoooUIyEiuJXAqloz6_CdzCIn0buvzN8,714
 dclab/util.py,sha256=HFT5ZQV6AW8GIIruVMldukbVVdlMyKH50GUfOogAcxI,5860
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/__init__.py,sha256=wyJWhElQRPcq09vUqUnuquTU_KHgHxv6wQxuxQ988Iw,1583
-dclab/warn.py,sha256=MjJvyQeuvIXFQ2-fHDzbmXJ0scnHqqRJlIxfuLI_utE,523
+dclab/warn.py,sha256=fy2fcZdA0YRMlVFIcOPNZJQOQLkvblJQ8pCfCx1phnw,521
 dclab/cached.py,sha256=eWTYBiI-HQM7JuPH-oxa5LLnhAX32GpRwlYg2kQ3sTA,2917
 dclab/http_utils.py,sha256=XHicbHQts5LY3zSNmYqNgAZpKTktotEiwQgJ8d2sBlk,10912
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
-dclab/downsampling.cpython-313-darwin.so,sha256=8urjfT-XABnSjOAPCg4RiEHriNYU2a4dOpj2uBVphJQ,244064
+dclab/downsampling.cpython-313-darwin.so,sha256=eqiiFrZvP3qN2Caz8VC2-M04sYEZJIW1LNytQhmeEwU,244032
 dclab/statistics.py,sha256=DWBG_Kj7cn89b_s5mqWYDCMGB881jHcCRFY-KAOBnhE,7598
 dclab/kde_contours.py,sha256=UlU64lrzMQUZH11oZndW7xf7NFCzwP3FcVujwuqXDCI,278
 dclab/isoelastics/iso_LE-2D-FEM-19-volume-deform.txt,sha256=vTcazOlOXo3BQ0NQtGB_IdHKA0neOLXZ_d3JuMU--RE,83358
@@ -38,7 +38,7 @@ dclab/lme4/lme4_template.R,sha256=CEXQIquvYCla9dCvRYgiBemI6fiVgAKnJTetJA2LAtk,25
 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/cli/task_tdms2rtdc.py,sha256=u0L1Fq9rXIeQG9b72SuUIh_qYC6fG2xXxht9_rcdCao,8283
+dclab/cli/task_tdms2rtdc.py,sha256=5VBXEnTknaA-qlb9C-px6BTG3RzBg8vmY8iPIraGi8o,8281
 dclab/cli/__init__.py,sha256=84YzzV6aE_NY-o7wvqgvUoxBLvIOEXpSUbkVcGRyzQ0,483
 dclab/cli/task_condense.py,sha256=uNZzm04VuQOXJi6uXPmaLdQCk0g8ONueiO4p67yJv0k,8546
 dclab/cli/task_verify_dataset.py,sha256=aqBNCA5pjBL6r9wdEgzmSl5BWPIBEgPAmoQpeFw4Nts,2705
@@ -66,34 +66,34 @@ dclab/external/statsmodels/nonparametric/__init__.py,sha256=-GEWgwsF27ems5WTBvR1
 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/LICENSE,sha256=ivsSBvn3c0R9mOctWRRdza7C7wdZSRYgCVxlVqUdlB8,1452
-dclab/external/skimage/_find_contours_cy.cpython-313-darwin.so,sha256=xn6VZBStT4V9j7eM5Rc0nyBSgfjj5QcbDknoBTrDUxI,188792
+dclab/external/skimage/_find_contours_cy.cpython-313-darwin.so,sha256=FvghNS_yerWJ0cS0Yh7W0-n9FWQBGrYWt1EkytYd3b0,188760
 dclab/external/skimage/pnpoly.py,sha256=r8hFNiTz5XlUoNZjosqA0iyv1FPn0l7ewbplgFgkdaw,1347
 dclab/external/skimage/_find_contours.py,sha256=16v5eeTZBmevG8SSuXtJ6yUpVPhwfSmtc8pDD0nuuOU,9340
-dclab/external/skimage/_pnpoly.cpython-313-darwin.so,sha256=L2u9TUoP1aJl5wzKscAWtZcgBiswo3PbbU0mpLQMZzA,207200
+dclab/external/skimage/_pnpoly.cpython-313-darwin.so,sha256=pSB_NxOsxgqeDiDwke48QtW_2oDQNpiEe2Nf8peIs7Q,207168
 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/_shared/geometry.pxd,sha256=kRsu9ifv_rL3kbRIgSLf86p0hn2oTMp6s013lZ9bBZM,346
 dclab/external/skimage/_shared/__init__.py,sha256=2sHZwTtJSlMTa3Q2YSvQW7jrPLMUSqDJQa-ROe5zfcw,37
-dclab/external/skimage/_shared/geometry.cpython-313-darwin.so,sha256=dYh2cqGz4qLRMXHkaHYp1vZPr3ytezzCY0xiccRrOKM,55056
+dclab/external/skimage/_shared/geometry.cpython-313-darwin.so,sha256=V1I19SkjOaL2yJR_xi97xvsUuQfSCaJawMlHwYNlqx0,55056
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
 dclab/definitions/feat_logic.py,sha256=_Rr2vK-nbRNjxk5Kf8Iohs_Q3jzUe9EZJgxB9vMwxwE,5379
 dclab/definitions/meta_parse.py,sha256=YdaTdM8DAMsIFn5ITH9OHYGTXeAOBGWtx22oVjxXcWk,2393
-dclab/definitions/__init__.py,sha256=56VL7rNTjP61gpGgN2GEUKicds2aBz_nWNwzfNxO_l8,2781
+dclab/definitions/__init__.py,sha256=4OQhbMSfCdmibhMDmttjIlCdrQC9Y0Y_SJjOON8_iWU,2779
 dclab/definitions/meta_const.py,sha256=zqE-SrD2tJMCFWdtp_IenwnbIQg0lulvbQAw9dK0Gho,13125
-dclab/definitions/feat_const.py,sha256=3zii5bXN0d0lMtkiI8dR9ivNlNQYosZASAlOg1UKKPA,9634
+dclab/definitions/feat_const.py,sha256=YRwR49jt3VVpMI5ctlxhgiTYqZR210_1HE_z6gwBKiY,9632
 dclab/definitions/meta_logic.py,sha256=wCgb7DPRHaR8DCWw_VbwNkpslUnazzWfgX0iS8oEe90,4194
-dclab/rtdc_dataset/config.py,sha256=MvBteFya3R6Ch3U6UgTakCsJoBgVykTxS_Z25STWPHU,17432
+dclab/rtdc_dataset/config.py,sha256=lcJm13LYDyPqbH1E-TI8fM6B4_G8OkCEl0LXhQGuhf4,17430
 dclab/rtdc_dataset/check.py,sha256=lJNaz4QTe2WNlxik6zSohRHTiAYuP_bKOzSDjPGTUS0,35006
 dclab/rtdc_dataset/meta_table.py,sha256=ucqBNrgI6rDAuQFuMRckY8lp1LpnYAoRgEsLObWTJCE,648
-dclab/rtdc_dataset/feat_basin.py,sha256=iBGhuRkIy-zbonIjYHCQdLd3V3_cebpBfDTvqyLzJK4,26921
+dclab/rtdc_dataset/feat_basin.py,sha256=e38J0Ty54xTBCuaelFuRLEzXdtklE_El5CFKjtI3ohc,29365
 dclab/rtdc_dataset/fmt_s3.py,sha256=bU3V_WGyqJhxPCH80X_nlNqq-jXcgoZKv_aUBIqwaL8,11877
 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=LjddGHdqZINXKUQcvCyCDmOofdBzyJIXN_z_C-zWGnM,34777
-dclab/rtdc_dataset/export.py,sha256=SzQJpq9YfYfQFsIc3mnITwBwr2w7tYRMrvoPAzo3YPs,33427
+dclab/rtdc_dataset/core.py,sha256=HNRia2qxlDwCK52ypJ9TsOTlTLqszOEvYtAoCH2od3w,34896
+dclab/rtdc_dataset/export.py,sha256=B2GViMGOu3bkmocTe-O9_U7UYFaItoVO1iHgYJ48N-k,35211
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
-dclab/rtdc_dataset/writer.py,sha256=BqP4QSzHxCSxp9z7_cJF2v04taO3ZXE3Wg6zJY6fMao,41819
+dclab/rtdc_dataset/writer.py,sha256=MdqEFf4hpoBjjvNbp120BWCdaP1XjEyS3hxO2WNwApw,42845
 dclab/rtdc_dataset/filter.py,sha256=AFPUBzOIi3pqXgUdMQ5CIi9ZeGOKC71rfSZKLMLgtog,10023
 dclab/rtdc_dataset/fmt_http.py,sha256=vXVxRLXZp2_V1v3xk4lu4VUHYXfNHJdsRkVt3trC1RU,3374
 dclab/rtdc_dataset/load.py,sha256=5_xGw2P8Mjs0gW-vGr2Kn28j6Qv3BvvMvguMibC_mM4,2761
@@ -104,10 +104,10 @@ dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=pRqiFJpBoTwL2krG3asmLw4Fyp7O-v
 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=gIcUXaO4gfQ1m8KDkY3X2KN7KyjdVPV81ls1TtHZcwk,9438
 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=Us5xdKsmxOgTSDxFjnYSFIzm5kkDj6pTKPT9JcgI1cE,8782
 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=9Q-9N52BTtOT_9avGObpe71t6MpLAKQDhbJrcETJ4a8,1553
@@ -128,15 +128,15 @@ dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=FHaDGjh4wMd18S2FFr6IVdd23l21S6s3fwZnF
 dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=a4gMIjH0TgFdz36l_F-xriHTT4LMI64ur-atHyvAp80,1694
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=cFiZcWG43jOGTY3oNl-E_vdzbm5QZU1CEB7ucrLZP_U,11167
 dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=eZiDHAGG3MCVckEMHsV-YBbL-pETVLomGk1gmpjc8-k,2175
-dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=biI9l1EO6BuSYgwZG0deacj4i1fMHQcW78AKXEcm5Wc,5373
+dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=1t_NIHIJhvqkgbUUS27ta6mzId0t3lYhgB4Pz2NV2sU,5363
 dclab/rtdc_dataset/fmt_tdms/__init__.py,sha256=3Hc6ASVHEmZBW0pCdFiLZcBtNPcEjG6c7eddqeAZRK4,18923
 dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=-jp7Z-N91e4ieumYQ1huMicj7PMJqwIr5VsNWE_-EEk,8006
-dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=Vkym0QKSw2mq1XZl5n8wDkgHXmaZwQGiMAV5AuRSJkE,5215
+dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=OdKOjW1cXURCWcb89PEcQKnkb0VqV0UA0m74maUu2GU,5213
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=WzrMqnyrzp8gsT8Pf7JKqGGv43ewx7d_qgtirURppRI,813
 dclab/rtdc_dataset/fmt_tdms/event_contour.py,sha256=kjo0wJx9F0gmmOOyR0NoLw6VEtSl3h63WXXkcbfnoS8,9627
-dclab-0.65.0.dist-info/RECORD,,
-dclab-0.65.0.dist-info/WHEEL,sha256=oqGJCpG61FZJmvyZ3C_0aCv-2mdfcY9e3fXvyUNmWfM,136
-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/METADATA,sha256=aDIGhFsgmVOULuMhp6vIRdd3uoJppcjW7tahpDRi-Dg,4766
-dclab-0.65.0.dist-info/licenses/LICENSE,sha256=gLDaVZWRrlnLdyfOrR0qfWjLbOVcjvoJ-kCLUK0fyXA,15360
+dclab-0.67.0.dist-info/RECORD,,
+dclab-0.67.0.dist-info/WHEEL,sha256=oqGJCpG61FZJmvyZ3C_0aCv-2mdfcY9e3fXvyUNmWfM,136
+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/METADATA,sha256=r6I9pE1qTWf1-zJgx95_itGLi9TcMI3vBpbGIcec8UI,4978
+dclab-0.67.0.dist-info/licenses/LICENSE,sha256=gLDaVZWRrlnLdyfOrR0qfWjLbOVcjvoJ-kCLUK0fyXA,15360