dclab 0.62.17__cp39-cp39-macosx_11_0_arm64.whl → 0.67.3__cp39-cp39-macosx_11_0_arm64.whl

dclab/rtdc_dataset/fmt_dcor/logs.py

@@ -22,5 +22,5 @@ class DCORLogs:
     @property
     def _logs(self):
         if self._logs_cache is None:
-            self._logs_cache = self.api.get(query="logs")
+            self._logs_cache = self.api.get(query="logs", timeout=5)
         return self._logs_cache

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -27,7 +27,7 @@ class DCORTables:
     @property
     def _tables(self):
         if self._tables_cache is None:
-            table_data = self.api.get(query="tables")
+            table_data = self.api.get(query="tables", timeout=13)
             # assemble the tables
             tables = {}
             for key in table_data:

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_s3.py

@@ -42,6 +42,27 @@ S3_ACCESS_KEY_ID = os.environ.get("DCLAB_S3_ACCESS_KEY_ID")
 S3_SECRET_ACCESS_KEY = os.environ.get("DCLAB_S3_SECRET_ACCESS_KEY")
 
 
+@functools.lru_cache(maxsize=1000)
+def get_s3_session_client(access_key_id: str,
+                          secret_access_key: str,
+                          use_ssl: bool,
+                          verify_ssl: bool,
+                          endpoint_url: str
+                          ):
+    botocore_session = botocore.session.get_session()
+    s3_session = boto3.Session(
+        aws_access_key_id=access_key_id,
+        aws_secret_access_key=secret_access_key,
+        botocore_session=botocore_session)
+    s3_client = s3_session.client(
+        service_name='s3',
+        use_ssl=use_ssl,
+        verify=verify_ssl,
+        endpoint_url=endpoint_url,
+    )
+    return botocore_session, s3_session, s3_client
+
+
 class S3File(HTTPFile):
     """Monkeypatched `HTTPFile` to support authenticated access to S3"""
     def __init__(self,
@@ -74,17 +95,15 @@ class S3File(HTTPFile):
                 "not specify the full S3 URL or that you forgot to set "
                 "the `S3_ENDPOINT_URL` environment variable.")
         endpoint_url = endpoint_url.strip().rstrip("/")
-        self.botocore_session = botocore.session.get_session()
-        self.s3_session = boto3.Session(
-            aws_access_key_id=access_key_id,
-            aws_secret_access_key=secret_access_key,
-            botocore_session=self.botocore_session)
-        self.s3_client = self.s3_session.client(
-            service_name='s3',
-            use_ssl=use_ssl,
-            verify=verify_ssl,
-            endpoint_url=endpoint_url,
+        self.botocore_session, self.s3_session, self.s3_client = \
+            get_s3_session_client(
+                access_key_id=access_key_id,
+                secret_access_key=secret_access_key,
+                use_ssl=use_ssl,
+                verify_ssl=verify_ssl,
+                endpoint_url=endpoint_url,
             )
+
         # Use a configuration that allows anonymous access
         # https://stackoverflow.com/a/34866092
         if not secret_access_key:

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

@@ -44,6 +44,10 @@ FEATURES_UINT64 = [
 ]
 
 
+class StoringPerishableBasinWarning(UserWarning):
+    pass
+
+
 class RTDCWriter:
     def __init__(self,
                  path_or_h5file: str | pathlib.Path | h5py.File,
@@ -66,8 +70,8 @@ class RTDCWriter:
         compression_kwargs: dict-like
             Dictionary with the keys "compression" and "compression_opts"
             which are passed to :func:`h5py.H5File.create_dataset`. The
-            default is Zstandard compression with the lowest compression
-            level `hdf5plugin.Zstd(clevel=1)`. To disable compression, use
+            default is Zstandard compression with the compression
+            level 5 `hdf5plugin.Zstd(clevel=5)`. To disable compression, use
             `{"compression": None}`.
         compression: str or None
             Compression method used for data storage;
@@ -88,7 +92,7 @@ class RTDCWriter:
             # be backwards-compatible
             compression_kwargs = {"compression": compression}
         if compression_kwargs is None:
-            compression_kwargs = hdf5plugin.Zstd(clevel=1)
+            compression_kwargs = hdf5plugin.Zstd(clevel=5)
 
         self.mode = mode
         self.compression_kwargs = compression_kwargs
@@ -207,8 +211,10 @@ 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,
                     ):
         """Write basin information
 
@@ -242,6 +248,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
@@ -249,9 +261,13 @@ class RTDCWriter:
             This must be specified when storing internal basins, and it
             must not be specified for any other basin type.
         verify: bool
-            whether to verify the basin before storing it; You might have
+            Whether to verify the basin before storing it; You might have
             set this to False if you would like to write a basin that is
             e.g. temporarily not available
+        perishable: bool
+            Whether the basin is perishable. If this is True, then a
+            warning will be issued, because perishable basins may not be
+            accessed (e.g. time-based URL for private S3 data).
 
         Returns
         -------
@@ -261,6 +277,9 @@ class RTDCWriter:
 
             .. versionadded:: 0.58.0
         """
+        if perishable:
+            warnings.warn(f"Storing perishable basin '{basin_name}'",
+                          StoringPerishableBasinWarning)
         if basin_type == "internal":
             if internal_data is None:
                 raise ValueError(
@@ -303,19 +322,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):
@@ -381,6 +411,8 @@ class RTDCWriter:
             "type": basin_type,
             "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/statistics.py

@@ -86,7 +86,7 @@ def flow_rate(ds):
         return np.nan
 
 
-def get_statistics(ds, methods=None, features=None):
+def get_statistics(ds, methods=None, features=None, ret_dict=False):
     """Compute statistics for an RT-DC dataset
 
     Parameters
@@ -96,13 +96,16 @@ def get_statistics(ds, methods=None, features=None):
     methods: list of str or None
         The methods wih which to compute the statistics.
         The list of available methods is given with
-        `dclab.statistics.Statistics.available_methods.keys()`
+        :func:`.available_methods.keys`
         If set to `None`, statistics for all methods are computed.
     features: list of str
         Feature name identifiers are defined by
-        `dclab.definitions.feature_exists`.
+        :func:`dclab.definitions.feature_exists`.
         If set to `None`, statistics for all scalar features
         available are computed.
+    ret_dict: bool
+        Instead of returning ``(header, values)``, return a dictionary
+        with headers as keys.
 
     Returns
     -------
@@ -148,7 +151,10 @@ def get_statistics(ds, methods=None, features=None):
                 label = dfn.get_feature_label(ft, rtdc_ds=ds)
                 header.append(" ".join([mt, label]))
 
-    return header, values
+    if ret_dict:
+        return dict(zip(header, values))
+    else:
+        return header, values
 
 
 def mode(data):
@@ -191,7 +197,24 @@ def mode(data):
 # Register all the methods
 # Methods that require an axis
 Statistics(name="Mean",   req_feature=True, method=np.average)
+# Premature-Optimization warning: `np.percentile` also accepts an array
+# of percentiles as the `q` argument, which I would expect to yield better
+# performance than computing percentiles individually. Implementing this
+# would break the way we are defining statistical methods here (One
+# `Statistics` instance per method) and thus requires a considerable
+# amount of work (much more work than writing this text here). It would
+# also make understanding the code more difficult. In addition, computing
+# statistics is not done often and is extremely fast anyway for a few
+# millions of events. Don't optimize this!
+Statistics(name="10th Percentile", req_feature=True,
+           method=lambda data: np.percentile(data, 10))
+Statistics(name="25th Percentile", req_feature=True,
+           method=lambda data: np.percentile(data, 25))
 Statistics(name="Median", req_feature=True, method=np.median)
+Statistics(name="75th Percentile", req_feature=True,
+           method=lambda data: np.percentile(data, 75))
+Statistics(name="90th Percentile", req_feature=True,
+           method=lambda data: np.percentile(data, 90))
 Statistics(name="Mode",   req_feature=True, method=mode)
 Statistics(name="SD",     req_feature=True, method=np.std)
 # Methods that work on RTDCBase

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.62.17.dist-info → dclab-0.67.3.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: dclab
-Version: 0.62.17
+Version: 0.67.3
 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>
-License: GPL-2.0-or-later
+License-Expression: GPL-2.0-or-later
 Project-URL: source, https://github.com/DC-Analysis/dclab
 Project-URL: tracker, https://github.com/DC-Analysis/dclab/issues
 Project-URL: documentation, https://dclab.readthedocs.io/en/stable/
@@ -14,7 +14,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Intended Audience :: Science/Research
-Requires-Python: <4,>=3.8
+Requires-Python: <4,>=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: h5py<4,>=3.0.0
@@ -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
 -------------
@@ -122,6 +128,22 @@ We use flake8 to enforce coding style::
     flake8 tests
 
 
+Type Hinting
+~~~~~~~~~~~~
+For type hinting and docstring styling, try to keep the 
+Code Reference readable in the documentation website.
+If in doubt just ask, or look at the examples in the codebase.
+
+* Simple type combintions such as ``float`` or ``str | pathlib.Path``
+  should be included as type hints, but do not need to be included
+  in the docstring parameter description.
+* More involved type hints can have extra information in the 
+  docstring. For example for numpy arrays, ``npt.NDArray[np.bool]`` doesn't
+  render in a readable way in the Code Reference, and doesn't include shape.
+  Therefore, you can also keep the docstring parameter description with 
+  the shape and dtype information e.g., ``binary ndarray of shape (M, N)``.
+
+
 Incrementing version
 ~~~~~~~~~~~~~~~~~~~~
 Dclab gets its version from the latest git tag.

{dclab-0.62.17.dist-info → dclab-0.67.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
 dclab/kde_methods.py,sha256=f0-zDN7ETintvGB3gSzxwgBb53YtT9jZtzI70EAX50g,365
-dclab/_version.py,sha256=GEa7QH3NrBgvyLi3LNdBdNGUvveY9cblWLa2mkR4bCI,515
+dclab/_version.py,sha256=C93LipY6MoOvCWHtZWanKa2gAYf8_iZ23C55Gs_peq0,714
 dclab/util.py,sha256=HFT5ZQV6AW8GIIruVMldukbVVdlMyKH50GUfOogAcxI,5860
-dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
+dclab/downsampling.pyx,sha256=b_UAoY-TQyZsMiqV10R2Qss_O7IWmQoiwX1zGqniIxc,7504
 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=YtZHEwB-BBBo2fCvwhlJvlnWvfWFMHclqol3OIJ7atM,10910
+dclab/http_utils.py,sha256=XHicbHQts5LY3zSNmYqNgAZpKTktotEiwQgJ8d2sBlk,10912
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
-dclab/downsampling.cpython-39-darwin.so,sha256=NPJEDoRkr55DIzm4Xysvs2ozrF5F0rfYf4Z5v4Qk-jQ,258416
-dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
+dclab/downsampling.cpython-39-darwin.so,sha256=Nr3zUj4k2CFx-AfYH7oC3bzrRfEc8y-G-5EIEBkb6rw,260992
+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
 dclab/isoelastics/iso_HE-3D-FEM-22-area_um-deform.txt,sha256=IjULG1KO-hClaYPoJJnwPbF2TkS9i9jxF1tbhhQTClY,71350
@@ -18,39 +18,39 @@ dclab/isoelastics/__init__.py,sha256=d07K8Ab73_vot8Op4ZpNi_YbtlJPM8r53davAEB_zSc
 dclab/isoelastics/iso_HE-2D-FEM-22-area_um-deform.txt,sha256=bkRIbEq2UVoc8bzjfg3R9XODdjG4TyCZDLDVv9lNnqY,90298
 dclab/isoelastics/iso_LE-2D-FEM-19-area_um-deform.txt,sha256=lcTjUUnIwj_bVBrG2T2OWBK1ApuLjxJkvL2KAuU51OM,79694
 dclab/isoelastics/iso_HE-3D-FEM-22-volume-deform.txt,sha256=NlaE7yKz7N8yF65ri3H8gvjAQBEfPSXULFJtMhjYgSc,82116
-dclab/features/fl_crosstalk.py,sha256=842qE5wg4_JJT_6Gdye4Kmzosgre3fM4MBBxYtu8f0w,2684
-dclab/features/bright_bc.py,sha256=qs_8906qdTJCQiLVrQVULqRr2Oewk8x6uIi644CJHsw,2985
+dclab/features/fl_crosstalk.py,sha256=RyqcbcALxfSS72WlDbPoIrCYnQkMX0hSfxL9v8hKjpQ,2944
+dclab/features/bright_bc.py,sha256=nhMpVuSZ40q0cmMZ6MbtEDZITyz18sDIE8afQVLIfMM,3428
 dclab/features/__init__.py,sha256=rgFgFdAs9ylviKk-ap8lSlewPcLh5Myib1Xtrk8Oylk,352
-dclab/features/inert_ratio.py,sha256=qTfNffQeh-vWShA1ZE2WT-Yb8b9lDj1LwSRTad2VwxM,11936
-dclab/features/volume.py,sha256=YW--tTMTPbZN00DkRNIq35GuBvDIbSeu31MXcXNOhBE,8809
-dclab/features/bright_perc.py,sha256=QjhSEVXwU7IvsBOkeAka8oLBNKzXb3w_2R4xG1DIy9w,2024
-dclab/features/bright.py,sha256=rDQA8ke3B4Bor2X5B8WlhXrrITEGb50U-QjDGxzOIRo,2332
-dclab/features/contour.py,sha256=UwQIud9z52WxCpWVqXKImsjmFRfj-U7ksXuhOnzpTo0,5557
+dclab/features/inert_ratio.py,sha256=u2WMLHdJgkba40AEtWW6B_a2NPTspiRsPIkaA2iD-uU,12280
+dclab/features/volume.py,sha256=Pht80sbmDcnLhffkT9La6alIhur3nW-K4hdAjK2xnMo,9122
+dclab/features/bright_perc.py,sha256=uyZF4YAF0WhL7_SjUBFY-L0eXio4c_2CzHwGvUOO84A,2387
+dclab/features/bright.py,sha256=I_4LFyQ-3GW9gH7ZtBRhNbsndkKjixDvPRNAbMxIuQk,2665
+dclab/features/contour.py,sha256=aufysNbBW0OhQzTOtZ6nxBzya5AN7g0SexihpF5BLFM,5847
 dclab/features/emodulus/lut_HE-2D-FEM-22.txt,sha256=5bLgd-BBaFW9bAtEyEmlTvaG4EABXRAo73K51gd2UT8,608170
 dclab/features/emodulus/lut_LE-2D-FEM-19.txt,sha256=r36u9Bo7WJF1l1EYezMz-R-xYoxQrYozVHtXIHjwQnU,484422
-dclab/features/emodulus/__init__.py,sha256=ZurqvUYmaYghmzyrwb744dcYnF9aLKrCRyRvixCABIY,14163
-dclab/features/emodulus/pxcorr.py,sha256=pcLjCUF0vha57YE7v0qeBlMCIOQaLt6zjtQ5qEPdoz8,4837
-dclab/features/emodulus/scale_linear.py,sha256=5tZfOpG4QSSEMlwSoA_3XRQuY0tiZ3CSm2HsibZAaMA,7683
+dclab/features/emodulus/__init__.py,sha256=6ckm1PUiveEFmMW5YJv3nHyhKZFlbRHm1m0eihyBRmA,14358
+dclab/features/emodulus/pxcorr.py,sha256=UJcu-dCwxxWopeIQsT24X1BYnBhiUlIhjnGYjfgGax0,5372
+dclab/features/emodulus/scale_linear.py,sha256=vDISUWATvpprmTgbtcN-HxBNPuw9I66tuqhXgYo8hkI,8254
 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=o5s39fDnal5hkrtG8WqE_zuZG4jJzjOkZMA4MjbG7Jc,9596
+dclab/features/emodulus/load.py,sha256=fcc6ds3iE0SvGSXszB-UTIgMDse24E44Zgh_OMZVvYs,8745
+dclab/features/emodulus/viscosity.py,sha256=ZTpFJJ2uz6LcFzCohTYLfodFX0ce3nbwWBuZ8NBaeTQ,9893
 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/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
+dclab/cli/task_verify_dataset.py,sha256=IU-A3fTG1F_8JThv-eKn9PqbA15pEjVSHyyX3ieMrOI,2685
 dclab/cli/task_repack.py,sha256=uSY3xCL1pvaqgG27ou6vMSavXk6nOJXkGno2XcaLOCo,3315
 dclab/cli/common.py,sha256=uY0IexcvmScB-5AVIQhM9qMutUcSf7CM9tUrgtuawgU,7224
 dclab/cli/task_join.py,sha256=R04ZmXG2-O82E8le0ywZpy9NzOYoErw8hLx8m4q76ms,9464
 dclab/cli/task_split.py,sha256=dqW3GWkwi4ceDqRVrQx8ADGk4--KSsD3Q1knkD3ZXI4,6060
 dclab/cli/task_compress.py,sha256=LH3j41aKq5regAH-ZFdOgnXImf5DrReDJ7ITwUObUSQ,4100
 dclab/kde/contours.py,sha256=WoRqBj_xK-23FZjtaYly7E2Q8sGZ16q2ILq-DmrlmC8,6742
-dclab/kde/methods.py,sha256=SYlAjoST66hEZnRmsdZ6izMmgfebxQxTfBR5PHhzDkE,9208
+dclab/kde/methods.py,sha256=QTOK0qy2w6hcppPyzZlTaOSQCSD9Wb_dKQccJg4TWc0,9801
 dclab/kde/__init__.py,sha256=_WSLPMfxE2su6tmO5mJxUE_9ON16-pqQUQCUlzRtyKI,55
-dclab/kde/base.py,sha256=i6bNYYeQSFlq03Z5CZjhBE-V3xpY6YLWivL3guscsnE,7683
+dclab/kde/base.py,sha256=17gu0P63RatGdr-5NzKROaCwVCoA_Cial631bHHOBw0,16405
 dclab/external/__init__.py,sha256=gb0UdzoMymEURPsTXRqVTT1ZJedJ2ubH3jApBIRkwjk,93
 dclab/external/packaging/version.py,sha256=9MLL6_EYHvGA1yCGndwL5ZmmDA_wqQsW15GyKrI6siQ,14685
 dclab/external/packaging/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
@@ -65,35 +65,35 @@ 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=Sa1jdwLWzpV-QcrvNqGsFiI_VReCb1x-cwZ4UUVMUx0,204152
+dclab/external/skimage/_find_contours_cy.cpython-39-darwin.so,sha256=a7Lg3OvM36ekhCQqhcTLQalEdJAz-3VZOVb4R0UFWBQ,206456
 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=bLYrznNaDDSbOrMkgebDCwah8KnBtV3BwomN-HXTbX0,221872
+dclab/external/skimage/_pnpoly.cpython-39-darwin.so,sha256=SxQeGq81yoqjX57TsEse7R-vSC4HimoIbFxFSjc5uIg,226384
 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=V8zYYC0Jq8U52iFemzFukvRedvYDYa9mM7NVZaJiCW0,55872
+dclab/external/skimage/_shared/geometry.cpython-39-darwin.so,sha256=WXjdTXomKxmscHPK46Uob98G6lVw2hheTFfmJVXTwwA,55648
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
-dclab/definitions/feat_logic.py,sha256=SXsSlAusgtE3uXcPu84dQwYZ07zxmV37DmPednA3_dM,5823
+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=JSCxOVEg86vBPAm_pjHgGYuLExvYc2Z1Rz4ksRps-jw,9746
 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=ViKdvJcwFM8joysnrBYdZbA5t_wZix-6xn_FsvzpYsQ,21072
-dclab/rtdc_dataset/fmt_s3.py,sha256=FVw0q3CwiPwDKmz37EsjK2T5CLr4MsH3pvscu-gToVM,11278
+dclab/rtdc_dataset/feat_basin.py,sha256=vXeNt0eWngEy08anWQttrhfAwtqTRuhGtg4zyQHXJ0A,29509
+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=EjNWk9SV-2xBTRtf34XosLCOS164vGWKP5dKKLSOSq4,34441
-dclab/rtdc_dataset/export.py,sha256=RPnWNDAPW1m3vPcStjqIX-YnxDOKyWLtQ1HrA38S3Uo,30384
+dclab/rtdc_dataset/core.py,sha256=mF3cktzJVjXJB2HLqOceiYTjZgOAkPp7BshFH0zxvn4,35075
+dclab/rtdc_dataset/export.py,sha256=RMNRB_PXHnEUi4IpPEM5M3zjnayO-9Y7EoUwH1HMNtg,36751
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
-dclab/rtdc_dataset/writer.py,sha256=jc6ADyxGoujXpoXu1vF2nfZjGFMaO5LbRmoYJZ83JVo,41418
+dclab/rtdc_dataset/writer.py,sha256=JgqFbc-Ih6qYK-jKMJqDh6P1yw9fj28Y0_ab08ijga4,42965
 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
@@ -123,20 +123,20 @@ dclab/rtdc_dataset/feat_anc_ml/__init__.py,sha256=99jZlz17aBCAxI5xx42XINomMy20Hi
 dclab/rtdc_dataset/fmt_dcor/access_token.py,sha256=jotLQay138RUlv8wbdF2ishRnyE9N0KwGGBlbCL0wRI,2028
 dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=tQZ4GumqURjS3eppRrSyUq1zBPD0y_8rwznMRDXiDUs,2526
 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=NaVEwLKmOg7Mz5iAMe2S8C4xRVC_YO3zeT7g5EbQE1M,1682
-dclab/rtdc_dataset/fmt_dcor/base.py,sha256=wD127W5LvvhkUy8SvFVVwAR6EEYtzgoWJ4booh45rfA,6588
+dclab/rtdc_dataset/fmt_dcor/api.py,sha256=IhmNpEdVSGHdJUepCkmuyTVOp3fNn1WASPVohAzwhu8,6274
+dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=FHaDGjh4wMd18S2FFr6IVdd23l21S6s3fwZnFbPG83E,594
+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.62.17.dist-info/RECORD,,
-dclab-0.62.17.dist-info/WHEEL,sha256=HO9mXbqgM4Go8g994JGCRqzrGrswAcuXl8i0pdN2UG8,134
-dclab-0.62.17.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.17.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.17.dist-info/METADATA,sha256=sxoMpN4ygAI9x12l_IsEKUqi32wGJ3o2Tg2OKEx8cKQ,4756
-dclab-0.62.17.dist-info/licenses/LICENSE,sha256=gLDaVZWRrlnLdyfOrR0qfWjLbOVcjvoJ-kCLUK0fyXA,15360
+dclab-0.67.3.dist-info/RECORD,,
+dclab-0.67.3.dist-info/WHEEL,sha256=3Ay3BV466cqEtozXyfUOiOI0BMlFSRJlC2qfKO6Lfps,135
+dclab-0.67.3.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.67.3.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.67.3.dist-info/METADATA,sha256=ZeIAbqeq6aA_N8SqWWs-I0lCVqRf702Ta3IcPzyPZ5M,5724
+dclab-0.67.3.dist-info/licenses/LICENSE,sha256=gLDaVZWRrlnLdyfOrR0qfWjLbOVcjvoJ-kCLUK0fyXA,15360

{dclab-0.62.17.dist-info → dclab-0.67.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_11_0_arm64
 Generator: delocate 0.13.0