cellprofiler-library-nightly 5.0.0.dev641__tar.gz → 5.0.0.dev643__tar.gz

{cellprofiler_library_nightly-5.0.0.dev641/cellprofiler_library_nightly.egg-info → cellprofiler_library_nightly-5.0.0.dev643}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev641
+Version: 5.0.0.dev643
 Summary: cellprofiler-library implements CellProfiler's image processing and mathematical code, and is usable as a standalone library
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>

{cellprofiler_library_nightly-5.0.0.dev641 → cellprofiler_library_nightly-5.0.0.dev643}/cellprofiler_library/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '5.0.0.dev641'
-__version_tuple__ = version_tuple = (5, 0, 0, 'dev641')
+__version__ = version = '5.0.0.dev643'
+__version_tuple__ = version_tuple = (5, 0, 0, 'dev643')
 
-__commit_id__ = commit_id = 'ge11ff330d'
+__commit_id__ = commit_id = 'g229e6671e'

{cellprofiler_library_nightly-5.0.0.dev641 → cellprofiler_library_nightly-5.0.0.dev643}/cellprofiler_library/modules/_measureobjectintensitydistribution.py

@@ -104,6 +104,11 @@ def record_bin_measurements(
                 TemplateMeasurementFormat(TemplateMeasurementFormat.RD_RADIAL_CV),
                 TemplateMeasurementFormat.RD_OVERFLOW_RADIAL_CV,
             ),
+            (
+                numpy.full(nobjects, nbin + 1),
+                TemplateMeasurementFormat(TemplateMeasurementFormat.RD_BIN_NUM),
+                TemplateMeasurementFormat.RD_OVERFLOW_BIN_NUM,
+            ),
         ):
             if nbin == bin_count:
                 measurement_name = overflow_feature % image_name

{cellprofiler_library_nightly-5.0.0.dev641 → cellprofiler_library_nightly-5.0.0.dev643}/cellprofiler_library/opts/measureobjectintensitydistribution.py

@@ -42,12 +42,14 @@ class Feature(str, Enum):
     RADIAL_CV = "RadialCV"
     ZERNIKE_MAGNITUDE = "ZernikeMagnitude"
     ZERNIKE_PHASE = "ZernikePhase"
+    BIN_NUMBER = "BinNumber"
 
 
 F_ALL = [
     Feature.FRAC_AT_D.value,
     Feature.MEAN_FRAC.value,
     Feature.RADIAL_CV.value,
+    Feature.BIN_NUMBER.value,
 ]
 
 
@@ -56,12 +58,14 @@ class MeasurementChoice(str, Enum):
     FRAC_AT_D = "Fraction at Distance"
     MEAN_FRAC = "Mean Fraction"
     RADIAL_CV = "Radial CV"
+    BIN_NUM = "Bin Number"
 
 
 MEASUREMENT_CHOICES = [
     MeasurementChoice.FRAC_AT_D.value,
     MeasurementChoice.MEAN_FRAC.value,
     MeasurementChoice.RADIAL_CV.value,
+    MeasurementChoice.BIN_NUM.value,
 ]
 
 """Format strings used to build per-bin feature names."""
@@ -76,6 +80,7 @@ class TemplateMeasurementFormat(str):
     RD_FRAC_AT_D = "_".join((C_RADIAL_DISTRIBUTION, Feature.FRAC_AT_D.value + FF_GENERIC))
     RD_MEAN_FRAC = "_".join((C_RADIAL_DISTRIBUTION, Feature.MEAN_FRAC.value + FF_GENERIC))
     RD_RADIAL_CV = "_".join((C_RADIAL_DISTRIBUTION, Feature.RADIAL_CV.value + FF_GENERIC))
+    RD_BIN_NUM = "_".join((C_RADIAL_DISTRIBUTION, Feature.BIN_NUMBER.value + FF_GENERIC))
     RD_OVERFLOW_FRAC_AT_D = "_".join(
         (C_RADIAL_DISTRIBUTION, Feature.FRAC_AT_D.value, "%s", FF_OVERFLOW)
     )
@@ -85,10 +90,14 @@ class TemplateMeasurementFormat(str):
     RD_OVERFLOW_RADIAL_CV = "_".join(
         (C_RADIAL_DISTRIBUTION, Feature.RADIAL_CV.value, "%s", FF_OVERFLOW)
     )
+    RD_OVERFLOW_BIN_NUM = "_".join(
+        (C_RADIAL_DISTRIBUTION, Feature.BIN_NUMBER.value, "%s", FF_OVERFLOW)
+    )
 
 
 MEASUREMENT_ALIASES = {
     MeasurementChoice.FRAC_AT_D.value: TemplateMeasurementFormat(TemplateMeasurementFormat.RD_FRAC_AT_D),
     MeasurementChoice.MEAN_FRAC.value: TemplateMeasurementFormat(TemplateMeasurementFormat.RD_MEAN_FRAC),
     MeasurementChoice.RADIAL_CV.value: TemplateMeasurementFormat(TemplateMeasurementFormat.RD_RADIAL_CV),
+    MeasurementChoice.BIN_NUM.value: TemplateMeasurementFormat(TemplateMeasurementFormat.RD_BIN_NUM),
 }

{cellprofiler_library_nightly-5.0.0.dev641 → cellprofiler_library_nightly-5.0.0.dev643/cellprofiler_library_nightly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cellprofiler-library-nightly
-Version: 5.0.0.dev641
+Version: 5.0.0.dev643
 Summary: cellprofiler-library implements CellProfiler's image processing and mathematical code, and is usable as a standalone library
 Author: Anne Carpenter, Thouis (Ray) Jones, Lee Kamentsky, Vebjorn Ljosa, David Logan, Mark Bray, Madison Swain-Bowden, Allen Goodman, Claire McQuinn, Alice Lucas, Callum Tromans-Coia
 Author-email: Beth Cimini <bcimini@broadinstitute.org>, David Stirling <dstirling@glencoesoftware.com>, Nodar Gogoberidze <ngogober@broadinstitute.org>