diff --git a/src/agora/io/metadata.py b/src/agora/io/metadata.py index 8d94986fb38d4a3dca93d8edabb9dc424da493b7..56f70b548c3fb7440c65e97061500927a05c489d 100644 --- a/src/agora/io/metadata.py +++ b/src/agora/io/metadata.py @@ -189,10 +189,13 @@ def parse_swainlab_metadata(filedir: t.Union[str, Path]): filedir = Path(filedir) filepath = find_file(filedir, "*.log") if filepath: + # new log files raw_parse = parse_from_swainlab_grammar(filepath) minimal_meta = get_meta_swainlab(raw_parse) else: + # old log files if filedir.is_file() or str(filedir).endswith(".zarr"): + # log file is in parent directory filedir = filedir.parent legacy_parse = parse_logfiles(filedir) minimal_meta = ( diff --git a/src/aliby/tile/tiler.py b/src/aliby/tile/tiler.py index 3ea9817f773e49376d95be49119ccca7170ae40c..27c1e814d4682228149fc0343d9a1a564cc7ad14 100644 --- a/src/aliby/tile/tiler.py +++ b/src/aliby/tile/tiler.py @@ -367,9 +367,9 @@ class Tiler(StepABC): full: an array of images """ full = self.image[t, c] - if hasattr(full, "compute"): # If using dask fetch images here + if hasattr(full, "compute"): + # if using dask fetch images full = full.compute(scheduler="synchronous") - return full @property