dcnum 0.21.0__py3-none-any.whl → 0.21.2__py3-none-any.whl

dcnum/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.21.0'
-__version_tuple__ = version_tuple = (0, 21, 0)
+__version__ = version = '0.21.2'
+__version_tuple__ = version_tuple = (0, 21, 2)

dcnum/feat/event_extractor_manager_thread.py

@@ -98,8 +98,8 @@ class EventExtractorManagerThread(threading.Thread):
             if (ldq := len(self.writer_dq)) > 1000:
                 time.sleep(1)
                 ldq2 = len(self.writer_dq)
-                stall_time = (ldq2 - 200) / (ldq - ldq2) if ldq2 > 200 else 0
-                time.sleep(stall_time)
+                stall_time = (ldq2 - 200) / (ldq - ldq2)
+                time.sleep(stall_time if stall_time > 0 else 0)
                 self.logger.warning(
                     f"Stalled {stall_time + 1:.1f}s for slow writer "
                     f"({ldq} chunks queued)")

dcnum/segm/segmenter.py

@@ -184,8 +184,8 @@ class Segmenter(abc.ABC):
 
         Parameters
         ----------
-        labels: 2d integer ndarray
-            Labeled input (contains blobs with same number)
+        labels: 2d integer or boolean ndarray
+            Labeled input (contains blobs consisting of unique numbers)
         clear_border: bool
             clear the image boarder using
             :func:`skimage.segmentation.clear_border`
@@ -196,6 +196,12 @@ class Segmenter(abc.ABC):
             if > 0, perform a binary closing with a disk
             of that radius in pixels
         """
+        if labels.dtype == np.bool_:
+            # Convert mask image to labels
+            labels, _ = ndi.label(
+                input=labels,
+                structure=ndi.generate_binary_structure(2, 2))
+
         if clear_border:
             #
             # from skimage import segmentation

{dcnum-0.21.0.dist-info → dcnum-0.21.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcnum
-Version: 0.21.0
+Version: 0.21.2
 Summary: numerics toolbox for imaging deformability cytometry
 Author: Maximilian Schlögel, Paul Müller
 Maintainer-email: Paul Müller <dev@craban.de>

{dcnum-0.21.0.dist-info → dcnum-0.21.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dcnum/__init__.py,sha256=hcawIKS7utYiOyVhOAX9t7K3xYzP1b9862VV0b6qSrQ,74
-dcnum/_version.py,sha256=ey0T2QT7DroTwq1OFrMquZ-sNrLzojab2ikTifByhUQ,413
+dcnum/_version.py,sha256=OHUp7UmUZKfwzoWtmoKqHW5bOzO4Mhs8tToTcEOwjKc,413
 dcnum/feat/__init__.py,sha256=jUJYWTD3VIoDNKrmryXbjHb1rGwYtK4b7VPWihYgUoo,325
-dcnum/feat/event_extractor_manager_thread.py,sha256=gmvWNMmMTuUENVbDAn59PEp4LiRDE0PQA4VYhfWQ8EY,7825
+dcnum/feat/event_extractor_manager_thread.py,sha256=RQ4-6GBQbMlhxn43MMplR0rWTri9Nek7m6oQeMUhvuU,7829
 dcnum/feat/gate.py,sha256=svbObmqpYdqPawpfrsEjTiUPJXf24GrNi8PXTKT-z44,7225
 dcnum/feat/queue_event_extractor.py,sha256=bNdYzMPto37FCIgBbBw-YRQ2TlTpJKCWj9r_Y4sak3E,15700
 dcnum/feat/feat_background/__init__.py,sha256=OTmMuazHNaSrZb2XW4cnJ6PlgJLbKrPbaidpEixYa0A,341
@@ -33,7 +33,7 @@ dcnum/read/hdf5_data.py,sha256=Yyq02UTILc5ZgIQXpR9Y0wuX2WT8s0g23PraI7KxmJY,23489
 dcnum/read/mapped.py,sha256=UryArlrIsHxjOyimBL2Nooi3r73zuGtnGdqdxa6PK_g,3076
 dcnum/segm/__init__.py,sha256=iiq_1A9DU5wMUcKnsZ53E7NyzCkbZCJeUDimzunE-OM,247
 dcnum/segm/segm_thresh.py,sha256=W9f9--aYmXpFjv3IASB6I90V40PJcIe_Jt_1iK-eHhw,946
-dcnum/segm/segmenter.py,sha256=aCu7WfwOXU6nza1m3sAW7WhywR_jz3kmyfF3NCQo24A,12260
+dcnum/segm/segmenter.py,sha256=rjMiBP_0TB_b1dDQMonDUq-gH0_90jVRVi-2X8s6ZKg,12492
 dcnum/segm/segmenter_cpu.py,sha256=e6XTlEUqXR2HBKZJxumpCCHprdX8Ql7dsbIcfdf4dH4,10831
 dcnum/segm/segmenter_gpu.py,sha256=opgIBSL9lYFOo405xGoLUt2GuxpVQPMlPxcNHpQVt3s,1930
 dcnum/segm/segmenter_manager_thread.py,sha256=LbNBg1R19GaDKow8pgfOFx1sE6ulS27Ky47_pJBvnK4,5850
@@ -41,8 +41,8 @@ dcnum/write/__init__.py,sha256=QvWHeZmjHI18i-YlGYuzN3i7dVWY9UCReKchrJ-gif0,260
 dcnum/write/deque_writer_thread.py,sha256=ao7F1yrVKyufgC4rC0Y2_Vt7snuT6KpI7W2qVxcjdhk,1994
 dcnum/write/queue_collector_thread.py,sha256=d_WfdsZdFnFsiAY0zVMwUlA4juIMeiWYmE_-rezBQCE,11734
 dcnum/write/writer.py,sha256=e6J8YVqhS7kzkpPIMoDMokJpqSy1WWNdOrwaJof1oVc,15601
-dcnum-0.21.0.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
-dcnum-0.21.0.dist-info/METADATA,sha256=CUlOprvoa-ThjgNoDt_liTNSR1Ao3hBdjb5J4FDn_Fo,2194
-dcnum-0.21.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dcnum-0.21.0.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
-dcnum-0.21.0.dist-info/RECORD,,
+dcnum-0.21.2.dist-info/LICENSE,sha256=YRChA1C8A2E-amJbudwMcbTCZy_HzmeY0hMIvduh1MM,1089
+dcnum-0.21.2.dist-info/METADATA,sha256=MOyVIhBgM0aORTfIKt7iAI97eHXQdQUlpO91knbXuBw,2194
+dcnum-0.21.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dcnum-0.21.2.dist-info/top_level.txt,sha256=Hmh38rgG_MFTVDpUDGuO2HWTSq80P585Het4COQzFTg,6
+dcnum-0.21.2.dist-info/RECORD,,