diff --git a/extraction/core/extractor.py b/extraction/core/extractor.py index b341822450fd512c15a67736f0772214d38a608a..e36bf2bbc46345f85635999e663fddccd5817849 100644 --- a/extraction/core/extractor.py +++ b/extraction/core/extractor.py @@ -27,7 +27,7 @@ from extraction.core.functions.utils import depth from agora.abc import ProcessABC, ParametersABC from agora.io.writer import Writer, load_attributes -from agora.io.cells import Cells +from agora.io.cells import CellsLinear from aliby.tile.tiler import Tiler import matplotlib.pyplot as plt @@ -127,10 +127,6 @@ class Extractor(ProcessABC): def from_img(cls, parameters: ExtractorParameters, store: str, img_meta: tuple): return cls(parameters, store=store, tiler=Tiler(*img_meta)) - # @classmethod - # def from_store(cls, parameters: ExtractorParameters, store: str, img_meta: tuple): - # return cls(parameters, store=store, tiler=Tiler(*img_meta)) - @property def channels(self): if not hasattr(self, "_channels"): @@ -324,7 +320,7 @@ class Extractor(ProcessABC): ch_tree = {ch: v for ch, v in tree.items() if ch != "general"} tree_chs = (*ch_tree,) - cells = Cells.hdf(self.local) + cells = CellsLinear(self.local) # labels if labels is None: @@ -421,7 +417,6 @@ class Extractor(ProcessABC): """ Returns the image from a correct source, either raw or bgsub - :channel: str name of channel to get :img: ndarray (trap_id, channel, tp, tile_size, tile_size, n_zstacks) of standard channels :channels: List of channels