Skip to content

Commit ddf0cde

Browse files
committed
[FIX] remove redundant classes parameter to writing segmentations
1 parent 60977c3 commit ddf0cde

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

src/scportrait/pipeline/_utils/sdata_io.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ def _write_segmentation_object_sdata(
242242
self,
243243
segmentation_object: Labels2DModel,
244244
segmentation_label: str,
245-
classes: set[str] | None = None,
246245
overwrite: bool = False,
247246
) -> None:
248247
"""Write segmentation object to SpatialData.
@@ -268,7 +267,6 @@ def _write_segmentation_sdata(
268267
self,
269268
segmentation: xarray.DataArray | np.ndarray,
270269
segmentation_label: str,
271-
classes: set[str] | None = None,
272270
chunks: ChunkSize2D = (1000, 1000),
273271
overwrite: bool = False,
274272
) -> None:
@@ -292,7 +290,7 @@ def _write_segmentation_sdata(
292290
if not get_chunk_size(mask) == chunks:
293291
mask.data = mask.data.rechunk(chunks)
294292

295-
self._write_segmentation_object_sdata(mask, segmentation_label, classes=classes, overwrite=overwrite)
293+
self._write_segmentation_object_sdata(mask, segmentation_label, overwrite=overwrite)
296294

297295
def _write_points_object_sdata(self, points: PointsModel, points_name: str, overwrite: bool = False) -> None:
298296
"""Write points object to SpatialData.

src/scportrait/pipeline/segmentation/segmentation.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,16 +307,12 @@ def _save_segmentation_sdata(self, labels, classes, masks=None):
307307
if "nuclei" in masks:
308308
ix = masks.index("nuclei")
309309

310-
self.filehandler._write_segmentation_sdata(
311-
labels[ix], self.nuc_seg_name, classes=classes, overwrite=self.overwrite
312-
)
310+
self.filehandler._write_segmentation_sdata(labels[ix], self.nuc_seg_name, overwrite=self.overwrite)
313311
self.filehandler._add_centers(self.nuc_seg_name, overwrite=self.overwrite)
314312

315313
if "cytosol" in masks:
316314
ix = masks.index("cytosol")
317-
self.filehandler._write_segmentation_sdata(
318-
labels[ix], self.cyto_seg_name, classes=classes, overwrite=self.overwrite
319-
)
315+
self.filehandler._write_segmentation_sdata(labels[ix], self.cyto_seg_name, overwrite=self.overwrite)
320316
self.filehandler._add_centers(self.cyto_seg_name, overwrite=self.overwrite)
321317

322318
def save_map(self, map_name):

src/scportrait/pipeline/segmentation/workflows.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -587,13 +587,11 @@ def _perform_size_filtering(
587587
self.filehandler._write_segmentation_sdata(
588588
mask,
589589
segmentation_label=f"debugging_seg_size_filter_results_{mask_name}",
590-
classes=filter.ids,
591590
)
592591
else:
593592
self.filehandler._write_segmentation_sdata(
594593
mask[0],
595594
segmentation_label=f"debugging_seg_size_filter_results_{mask_name}",
596-
classes=filter.ids,
597595
)
598596
# then this does not need to be plotted as it can be visualized from there
599597
plot_results = False
@@ -700,10 +698,10 @@ def _perform_mask_matching_filtering(
700698
if self.save_filter_results:
701699
# add filtering results to sdata object
702700
self.filehandler._write_segmentation_sdata(
703-
mask_nuc[0], segmentation_label="debugging_seg_match_mask_results_nucleus", classes=None
701+
mask_nuc[0], segmentation_label="debugging_seg_match_mask_results_nucleus"
704702
)
705703
self.filehandler._write_segmentation_sdata(
706-
mask_cyto[0], segmentation_label="debugging_seg_match_mask_result_cytosol", classes=None
704+
mask_cyto[0], segmentation_label="debugging_seg_match_mask_result_cytosol"
707705
)
708706

709707
# then no plotting needs to be performed as the results can be viewed in the sdata object

0 commit comments

Comments
 (0)