From ec916bf714e04148ad16f103b91dfb69be2c2a6d Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Thu, 4 Apr 2024 17:27:19 +0200
Subject: [PATCH] Fixed bug where exporting patch at channel zero was confused
with white_channel being unspecified
---
model_server/base/roiset.py | 2 +-
tests/test_roiset.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/model_server/base/roiset.py b/model_server/base/roiset.py
index dd3139a1..bbe3a5f8 100644
--- a/model_server/base/roiset.py
+++ b/model_server/base/roiset.py
@@ -428,7 +428,7 @@ class RoiSet(object):
raw.data[:, :, ci, :]
)
else:
- if white_channel: # interpret as just a single channel
+ if white_channel is not None: # interpret as just a single channel
assert white_channel < raw.chroma
annotate_rgb = False
for k in ['contour_channel', 'bounding_box_channel', 'mask_channel']:
diff --git a/tests/test_roiset.py b/tests/test_roiset.py
index e281b7a0..9d32668c 100644
--- a/tests/test_roiset.py
+++ b/tests/test_roiset.py
@@ -251,7 +251,7 @@ class TestRoiSetMultichannelProducts(BaseTestRoiSetMonoProducts, unittest.TestCa
where = output_path / 'multichannel' / 'mono_2d_patches'
df_res = self.roiset.export_patches(
where,
- white_channel=3,
+ white_channel=0,
draw_bounding_box=True,
expanded=True,
pad_to=256,
--
GitLab