Skip to content

Commit f306ab5

Browse files
authored
Merge pull request #778 from fractal-analytics-platform/764-cellpose-task-output-roi-table-creation-performance-scaling
Fix wrong repeated overlap check for bounding-boxes in cellpose task
2 parents 4b62e56 + bbba757 commit f306ab5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Refactor Cellpose Task inputs: Group advanced Cellpose parameters into the `CellposeModelParams` model that's provided via `advanced_cellpose_model_params` (\#738).
1313
* Refactor Cellpose Task inputs: Support independent normalization of 2 input channels in the Cellpose task (\#738).
1414
* Rename `task.cellpose_transforms` into `tasks.cellpose_utils` (\#738).
15+
* Fix wrong repeated overlap checks for bounding-boxes in Cellpose task (\#778).
1516
* Development:
1617
* Switch to transitional pydantic.v1 imports, changes pydantic requirement to `==1.10.16` or `>=2.6.3` (\#760).
1718
* Support JSON-Schema generation for `Enum` task arguments (\#749).

fractal_tasks_core/tasks/cellpose_segmentation.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,13 +541,12 @@ def cellpose_segmentation(
541541

542542
bbox_dataframe_list.append(bbox_df)
543543

544-
overlap_list = []
545-
for df in bbox_dataframe_list:
546-
overlap_list.extend(
547-
get_overlapping_pairs_3D(df, full_res_pxl_sizes_zyx)
548-
)
544+
overlap_list = get_overlapping_pairs_3D(
545+
bbox_df, full_res_pxl_sizes_zyx
546+
)
549547
if len(overlap_list) > 0:
550548
logger.warning(
549+
f"ROI {indices} has "
551550
f"{len(overlap_list)} bounding-box pairs overlap"
552551
)
553552

0 commit comments

Comments
 (0)