dcnum 0.25.3__py3-none-any.whl → 0.25.5__py3-none-any.whl

dcnum/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.25.3'
-__version_tuple__ = version_tuple = (0, 25, 3)
+__version__ = version = '0.25.5'
+__version_tuple__ = version_tuple = (0, 25, 5)

dcnum/read/hdf5_data.py

@@ -198,11 +198,17 @@ class HDF5Data:
                         self.logs[key] = alog
                 # tables
                 for tab in sorted(h5.get("tables", {}).keys()):
-                    tabdict = {}
-                    for tkey in h5["tables"][tab].dtype.fields.keys():
-                        tabdict[tkey] = \
-                            np.array(h5["tables"][tab][tkey]).reshape(-1)
-                    self.tables[tab] = tabdict
+                    fields = h5["tables"][tab].dtype.fields
+                    if fields is None:
+                        # No individual curves, but an image array
+                        self.tables[tab] = h5["tables"][tab][:]
+                    else:
+                        # List of curves with predefined dtypes
+                        tabdict = {}
+                        for tkey in fields.keys():
+                            tabdict[tkey] = \
+                                np.array(h5["tables"][tab][tkey]).reshape(-1)
+                        self.tables[tab] = tabdict
                 # basins
                 basins = self.extract_basin_dicts(h5)
                 self.basins = sorted(basins, key=lambda x: x["name"])
@@ -593,8 +599,11 @@ def concatenated_hdf5_data(paths: List[pathlib.Path],
         raise ValueError(
             f"Invalid type for `path_out`: {type(path_out)} ({path_out}")
 
-    if len(paths) <= 1:
-        raise ValueError("Please specify at least two files in `paths`!")
+    if len(paths) == 0:
+        raise ValueError("Please specify at least one file in `paths`!")
+    elif len(paths) == 1:
+        warnings.warn("Only one file passed to `concatenated_hdf5_data`; this "
+                      "is equivalent to using `HDF5Data`, but slower.")
 
     frames = []
 

{dcnum-0.25.3.dist-info → dcnum-0.25.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: dcnum
-Version: 0.25.3
+Version: 0.25.5
 Summary: numerics toolbox for imaging deformability cytometry
 Author: Maximilian Schlögel, Paul Müller, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>
@@ -17,16 +17,16 @@ Classifier: Intended Audience :: Science/Research
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: h5py <4,>=3.0.0
-Requires-Dist: hdf5plugin <6,>=3.3.1
-Requires-Dist: mahotas <2,>=1
-Requires-Dist: numba <1,>=0.60
-Requires-Dist: numpy <3,>=1.21
-Requires-Dist: opencv-python-headless <5,>=4
-Requires-Dist: scikit-image <1,>=0.24
-Requires-Dist: scipy <2,>=1.8.0
+Requires-Dist: h5py<4,>=3.0.0
+Requires-Dist: hdf5plugin<6,>=3.3.1
+Requires-Dist: mahotas<2,>=1
+Requires-Dist: numba<1,>=0.60
+Requires-Dist: numpy<3,>=1.21
+Requires-Dist: opencv-python-headless<5,>=4
+Requires-Dist: scikit-image<1,>=0.24
+Requires-Dist: scipy<1.15.0,>=1.8.0
 Provides-Extra: torch
-Requires-Dist: torch >=2.2 ; extra == 'torch'
+Requires-Dist: torch>=2.2; extra == "torch"
 
 |dcnum|
 =======

{dcnum-0.25.3.dist-info → dcnum-0.25.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dcnum/__init__.py,sha256=hcawIKS7utYiOyVhOAX9t7K3xYzP1b9862VV0b6qSrQ,74
-dcnum/_version.py,sha256=WAZCgo0SVz4U2DvN4bd88NvYl0ugBMftcoN0hrufMnY,413
+dcnum/_version.py,sha256=9fxGcLLejSq2kXz456dcZ6KQ3PScn-5vo0OgINlsUs0,413
 dcnum/os_env_st.py,sha256=ujEVzn1G5sxZfJSITOMw48e2O_oMFu2VD6oj5QCUFSU,3025
 dcnum/feat/__init__.py,sha256=jUJYWTD3VIoDNKrmryXbjHb1rGwYtK4b7VPWihYgUoo,325
 dcnum/feat/event_extractor_manager_thread.py,sha256=FAxSyRfaNAuBWNplxHngp5h-44s0qIP24XX_oETdfMk,7836
@@ -31,7 +31,7 @@ dcnum/read/__init__.py,sha256=LYHyZHgiNTpjV5oEcty-7Kh5topLpHT_cFlNl-QX8gg,262
 dcnum/read/cache.py,sha256=LNA5nnDyrw8Nj07E7XfG2GcHEoWm6vA6Qo_8N-n-sGw,6492
 dcnum/read/const.py,sha256=GG9iyXDtEldvJYOBnhZjlimzIeBMAt4bSr2-xn2gzzc,464
 dcnum/read/detect_flicker.py,sha256=CeUyxI6LaX_lCNvBPm_yzsiWmiNcZYqbNZCtvKPdkcU,1827
-dcnum/read/hdf5_data.py,sha256=JVk9YWw1rPgTPxaMZsw2ehk4FJq9UqhmB1SW7yhPw50,25867
+dcnum/read/hdf5_data.py,sha256=Q4sFT1HBrkrKCX1TUaOpibvz8VFj0ETMa9lw_xIF6tw,26360
 dcnum/read/mapped.py,sha256=zU2fYdZfLNHn0rKHxDzBhNFMu4--WWa8nSeE2likyZA,3637
 dcnum/segm/__init__.py,sha256=9cLEAd3JWE8IGqDHV-eSDIYOGBfOepd8OcebtNs8Omk,309
 dcnum/segm/segm_thresh.py,sha256=iVhvIhzO0Gw0t3rXOgH71rOI0CNjJJQq4Gg6BulUhK8,948
@@ -50,8 +50,8 @@ dcnum/write/__init__.py,sha256=sK79IlvCFIqf2oFABVeyYedMnHOsEIQpxAauEeNO-Tw,273
 dcnum/write/deque_writer_thread.py,sha256=ao7F1yrVKyufgC4rC0Y2_Vt7snuT6KpI7W2qVxcjdhk,1994
 dcnum/write/queue_collector_thread.py,sha256=KwwNIDFEF2DU83woKES5K05MxxOhDxPMZLLeyPugfDo,11542
 dcnum/write/writer.py,sha256=oHlq4bDHQxb33-3Fw1xnzJwACecLyH-6koGK8SN0cSk,20528
-dcnum-0.25.3.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
-dcnum-0.25.3.dist-info/METADATA,sha256=3X_VmFjWOWNOs0p8n_af4bsBw4kxmyPvNlMEgKPRic4,2326
-dcnum-0.25.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-dcnum-0.25.3.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
-dcnum-0.25.3.dist-info/RECORD,,
+dcnum-0.25.5.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
+dcnum-0.25.5.dist-info/METADATA,sha256=sZNOKsa8U5IYQKn0jDGFzTVQvnJfMREuv_4ctHNU5Js,2321
+dcnum-0.25.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dcnum-0.25.5.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
+dcnum-0.25.5.dist-info/RECORD,,

{dcnum-0.25.3.dist-info → dcnum-0.25.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any