Trying to complete meaningful test with both raw and derived channels

tests/test_roiset.py

@@ -74,18 +74,8 @@ class TestRoiSetMonoProducts(BaseTestRoiSetMonoProducts, unittest.TestCase):
         self.assertTrue(zmask_acc.is_mask())
 
     def test_create_roiset_with_no_objects(self):
-
-        obmap = InMemoryDataAccessor(np.zeros(self.seg_mask.shape, self.seg_mask.dtype))
-
-        roiset = RoiSet(
-            self.stack_ch_pa,
-            obmap,
-            params=RoiSetMetaParams(
-                mask_type='boxes',
-                filters={'area': {'min': 1e3, 'max': 1e4}},
-                expand_box_by=(128, 2)
-            )
-        )
+        zero_obmap = InMemoryDataAccessor(np.zeros(self.seg_mask.shape, self.seg_mask.dtype))
+        roiset = RoiSet(self.stack_ch_pa, zero_obmap)
         self.assertEqual(roiset.count, 0)
 
     def test_slices_are_valid(self):
@@ -212,7 +202,7 @@ class TestRoiSetMonoProducts(BaseTestRoiSetMonoProducts, unittest.TestCase):
         return roiset
 
     def test_classify_by_multiple_channels(self):
-        roiset = self._make_roi_set()
+        roiset = RoiSet.from_segmentation(self.stack, self.seg_mask)
         roiset.classify_by('dummy_class', [0, 1], DummyInstanceSegmentationModel())
         self.assertTrue(all(roiset.get_df()['classify_by_dummy_class'].unique() == [1]))
         self.assertTrue(all(np.unique(roiset.object_class_maps['dummy_class'].data) == [0, 1]))
@@ -223,14 +213,22 @@ class TestRoiSetMonoProducts(BaseTestRoiSetMonoProducts, unittest.TestCase):
             def infer(self, img, mask):
                 return PatchStack(super().infer(img, mask).data * img.chroma)
 
-        roiset = self._make_roi_set()
+        roiset = RoiSet.from_segmentation(
+            self.stack,
+            self.seg_mask,
+            params=RoiSetMetaParams(
+                # mask_type=mask_type,
+                filters={'area': {'min': 1e3, 'max': 1e4}},
+                # expand_box_by=(128, 2)
+            )
+        )
         roiset.classify_by(
             'multiple_input_model',
             [0, 1],
             ModelWithDerivedInputs(),
             derived_channel_functions=[
-                lambda acc: PatchStack(2 * acc.data),
-                lambda acc: PatchStack((0.5 * acc.data).astype('uint8'))
+                lambda acc: PatchStack(2 * acc.get_channels([0]).data),
+                lambda acc: PatchStack((0.5 * acc.get_channels([1]).data).astype('uint8'))
             ]
         )
         self.assertTrue(all(roiset.get_df()['classify_by_multiple_input_model'].unique() == [3]))