dclab 0.62.11__cp312-cp312-macosx_11_0_arm64.whl → 0.62.13__cp312-cp312-macosx_11_0_arm64.whl

dclab/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.62.11'
-__version_tuple__ = version_tuple = (0, 62, 11)
+__version__ = version = '0.62.13'
+__version_tuple__ = version_tuple = (0, 62, 13)

dclab/features/emodulus/viscosity.py

@@ -120,6 +120,10 @@ def get_viscosity(medium: str = "0.49% MC-PBS",
     if medium == "water":
         # We ignore the `model`, because it's user convenient.
         eta = get_viscosity_water_kestin_1978(temperature=temperature)
+    elif not flow_rate:
+        # When flow rate is zero, we cannot compute the viscosity for
+        # anything other than water above.
+        eta = np.nan
     elif medium in ["0.49% MC-PBS", "0.59% MC-PBS", "0.83% MC-PBS"]:
         kwargs = {"medium": medium,
                   "temperature": temperature,

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -29,14 +29,36 @@ class DCORTables:
             # assemble the tables
             tables = {}
             for key in table_data:
-                columns, data = table_data[key]
-                tab_data = np.asarray(data)
-                if columns is not None:
-                    # We have a rec-array (named columns)
-                    ds_dt = np.dtype({'names': columns,
-                                      'formats': [np.float64] * len(columns)})
-                    tab_data = np.rec.array(tab_data, dtype=ds_dt)
-                tables[key] = tab_data
+                tables[key] = DCORTable(table_data[key])
 
             self._tables_cache = tables
         return self._tables_cache
+
+
+class DCORTable:
+    def __init__(self, table_content):
+        self._columns, data = table_content
+        self._tab_data = np.asarray(data)
+        if self._columns is not None:
+            # We have a rec-array (named columns)
+
+            ds_dt = np.dtype({'names': self._columns,
+                              'formats': [np.float64] * len(self._columns)})
+            self._tab_data = np.rec.array(self._tab_data, dtype=ds_dt)
+
+    def __array__(self, *args, **kwargs):
+        return self._tab_data.__array__(*args, **kwargs)
+
+    @property
+    def meta(self):
+        # TODO: Implement metadata sending from DCOR.
+        return {}
+
+    def has_graphs(self):
+        return self._columns is not None
+
+    def keys(self):
+        return self._columns
+
+    def __getitem__(self, key):
+        return self._tab_data[key]

dclab/rtdc_dataset/fmt_hdf5/tables.py

@@ -5,7 +5,7 @@ class H5Tables:
 
     def __getitem__(self, key):
         if key in self.keys():
-            tab = self.h5file["tables"][key]
+            tab = H5Table(self.h5file["tables"][key])
         else:
             raise KeyError(f"Table '{key}' not found or empty "
                            f"in {self.h5file.file.filename}!")
@@ -28,3 +28,30 @@ class H5Tables:
                         names.append(key)
             self._cache_keys = names
         return self._cache_keys
+
+
+class H5Table:
+    def __init__(self, h5_ds):
+        self._h5_ds = h5_ds
+        self._keys = None
+        self._meta = None
+
+    def __array__(self, *args, **kwargs):
+        return self._h5_ds.__array__(*args, **kwargs)
+
+    @property
+    def meta(self):
+        if self._meta is None:
+            self._meta = dict(self._h5_ds.attrs)
+        return self._meta
+
+    def has_graphs(self):
+        return self.keys() is not None
+
+    def keys(self):
+        if self._keys is None:
+            self._keys = self._h5_ds.dtype.names
+        return self._keys
+
+    def __getitem__(self, key):
+        return self._h5_ds[key]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.11
+Version: 0.62.13
 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>

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

@@ -1,5 +1,5 @@
 dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/_version.py,sha256=6RN4LVuzVUBmwpWRGtSDrQrJ0GhR_RYa4tyvcOaVVUg,415
+dclab/_version.py,sha256=BStrLKf1_ahS_0f5AwaERVLxxQT0VoDKL1AD-6iDlyw,415
 dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
@@ -9,7 +9,7 @@ dclab/http_utils.py,sha256=YtZHEwB-BBBo2fCvwhlJvlnWvfWFMHclqol3OIJ7atM,10910
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
 dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
-dclab/downsampling.cpython-312-darwin.so,sha256=9_fzsWLqwD57tXwT_879ifgvqnX-h4We-gND8p482ac,258896
+dclab/downsampling.cpython-312-darwin.so,sha256=w81HHsVVeAiLpBMQLBc6hcqqUgYwxiRQ2arkp4TNT-g,258896
 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
 dclab/isoelastics/iso_HE-2D-FEM-22-volume-deform.txt,sha256=aLOWxev_hvyP2yWquomcogn3Ze4SBfvqz-qmTOOibNw,97512
@@ -33,7 +33,7 @@ dclab/features/emodulus/pxcorr.py,sha256=pcLjCUF0vha57YE7v0qeBlMCIOQaLt6zjtQ5qEP
 dclab/features/emodulus/scale_linear.py,sha256=5tZfOpG4QSSEMlwSoA_3XRQuY0tiZ3CSm2HsibZAaMA,7683
 dclab/features/emodulus/lut_HE-3D-FEM-22.txt,sha256=1Sg4ys0ykT7Q_jFM28XS0uJ85nZd_ha7BDXdN2rsPIA,47248
 dclab/features/emodulus/load.py,sha256=Q9rII-7Om-f0m183VNeJUxNno7at1reigKtbzdrWgjE,8557
-dclab/features/emodulus/viscosity.py,sha256=aBm1pQa9cFAOBnO07UWMj87bw6fQpmW1IlWWD0MEtgw,9438
+dclab/features/emodulus/viscosity.py,sha256=o5s39fDnal5hkrtG8WqE_zuZG4jJzjOkZMA4MjbG7Jc,9596
 dclab/lme4/lme4_template.R,sha256=CEXQIquvYCla9dCvRYgiBemI6fiVgAKnJTetJA2LAtk,2570
 dclab/lme4/__init__.py,sha256=5WPFMTK-Yia3NJuwZEEBQ3fCyW3DiFgpZFrAwU33TV4,272
 dclab/lme4/rsetup.py,sha256=kH9VFtcK83ZaF9jvh1n5kcmGmPLLsmCPia_ElEHBLes,5890
@@ -61,17 +61,17 @@ 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/_pnpoly.cpython-312-darwin.so,sha256=MAyxGAbuICazyXPxkD63KtqvFK8ThwAq5NN9xDfQ7ew,222256
+dclab/external/skimage/_pnpoly.cpython-312-darwin.so,sha256=h1ZmU-btnmzUbHmCszg6u3DmVSRpKp6EIJzHgXHwu8w,222256
 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/_find_contours_cy.cpython-312-darwin.so,sha256=G1l9RK76un8q02OFk_CTDWGci3Oh-aHzCay_O18V2hI,204536
+dclab/external/skimage/_find_contours_cy.cpython-312-darwin.so,sha256=hea_Wbo17ppTfliXvCij8lKKgREvIbD_WwoumTSTAqQ,204536
 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-312-darwin.so,sha256=-EDWQLUvzJ-IDeIlSxhY_ZDWW_8WSwU4W2HwDZdc8JE,55920
+dclab/external/skimage/_shared/geometry.cpython-312-darwin.so,sha256=QRg9wHvcAaooVL-DhhMCTn4LttHGxzmo1oL-UgMGuh0,55920
 dclab/external/skimage/_shared/geometry.pyx,sha256=miCHUh6mBDbRRIoaF_0xAER1MRzsCAzFdlYQZhV7RmE,1667
 dclab/definitions/feat_logic.py,sha256=SXsSlAusgtE3uXcPu84dQwYZ07zxmV37DmPednA3_dM,5823
 dclab/definitions/meta_parse.py,sha256=YdaTdM8DAMsIFn5ITH9OHYGTXeAOBGWtx22oVjxXcWk,2393
@@ -105,7 +105,7 @@ dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=mJZR92Qoa71EwDVDYAP9KtOcjvRyjtA2wO1D
 dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=JUuPviS4lEXMjfNgJE-jkeArAwUVkdA1bmAszJGjPvc,8231
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=yWLYK-Fq0EYnp2eYfl1Ze02RBMOWg-iALJWs4dFSxxY,270
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=-mDewfv_aOeHaJykuJIWsqr9a7-moKhoGhqw9cR4ebg,1004
-dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=G226awNz7NA2V9l1F6jCeyVcJ8V4AJgLYhOfG1Q_5t8,872
+dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=DFIYoeNiGO0dut-wK1gBX-kuPD603mw_2VbFDtPkDNg,1505
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=_PgmDq2K7RGCuhV9J4YZwg9noW1hi2w14ZP8ooRR8Lw,6391
 dclab/rtdc_dataset/feat_anc_core/af_fl_max_ctc.py,sha256=gV3FqM0AoOHzWwhU45e3fvBb2MwGVadLL6piVW0YF1s,3687
 dclab/rtdc_dataset/feat_anc_core/af_image_contour.py,sha256=39jvhzz2GmfXDYXu1d3kie7tpBzUkUL_JTxfau-2mt8,3531
@@ -120,7 +120,7 @@ dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=tQZ4GumqURjS3eppRrSyUq1zBPD0y_8rwznM
 dclab/rtdc_dataset/fmt_dcor/__init__.py,sha256=WjO1uM_Vlof15Y7HkhkV5Xv75q9TDIdOBIuS_I38qps,210
 dclab/rtdc_dataset/fmt_dcor/api.py,sha256=COPRnPfPBcxbQGxHFEbGxp2CjK-Mgnt3cIu20-Zz04M,4245
 dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=1JsMr_4r5j8rkfrrUsiN42_l92GcvDjapYxopZKimnw,583
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=XTZlESy4Ht9sqKpROSYJO3msqGw1kyD_41-M5XPlKNY,1181
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=FY7AuJ9DEN55nQsCCyAp8ZlqO4hrwP5EDkQOov2OOfk,1635
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=wD127W5LvvhkUy8SvFVVwAR6EEYtzgoWJ4booh45rfA,6588
 dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=eZiDHAGG3MCVckEMHsV-YBbL-pETVLomGk1gmpjc8-k,2175
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=biI9l1EO6BuSYgwZG0deacj4i1fMHQcW78AKXEcm5Wc,5373
@@ -129,9 +129,9 @@ dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=-jp7Z-N91e4ieumYQ1huMicj7PMJqw
 dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=Vkym0QKSw2mq1XZl5n8wDkgHXmaZwQGiMAV5AuRSJkE,5215
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=WzrMqnyrzp8gsT8Pf7JKqGGv43ewx7d_qgtirURppRI,813
 dclab/rtdc_dataset/fmt_tdms/event_contour.py,sha256=kjo0wJx9F0gmmOOyR0NoLw6VEtSl3h63WXXkcbfnoS8,9627
-dclab-0.62.11.dist-info/RECORD,,
-dclab-0.62.11.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab-0.62.11.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
-dclab-0.62.11.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.11.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.11.dist-info/METADATA,sha256=ldFV7htY9AHLU56II3PuY7fWKKYcqRPfh819DEa0NcQ,4755
+dclab-0.62.13.dist-info/RECORD,,
+dclab-0.62.13.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
+dclab-0.62.13.dist-info/WHEEL,sha256=VujM3ypTCyUW6hcTDdK2ej0ARVMxlU1Djlh_zWnDgqk,109
+dclab-0.62.13.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.62.13.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.62.13.dist-info/METADATA,sha256=WtnYmez3PYa8IxgLQu5z2n8IZMbzCLxIctZujrctsaQ,4755