Use generators and simplify code

lens-biophotonics · Nov 20, 2024 · a61a4f4 · a61a4f4
1 parent d6d33be
commit a61a4f4
Show file tree

Hide file tree

Showing 13 changed files with 1,354 additions and 1,304 deletions.
diff --git a/foa3d/__main__.py b/foa3d/__main__.py
@@ -1,7 +1,7 @@
 from foa3d.input import get_cli_parser, load_microscopy_image
-from foa3d.pipeline import parallel_odf_over_scales, parallel_frangi_over_slices
+from foa3d.pipeline import parallel_frangi_over_slices, parallel_odf_over_scales
 from foa3d.printing import print_pipeline_heading
-from foa3d.utils import delete_tmp_folder
+from foa3d.utils import delete_tmp_data
 
 
 def foa3d(cli_args):
@@ -13,10 +13,10 @@ def foa3d(cli_args):
     out_img = parallel_frangi_over_slices(cli_args, save_dirs, in_img)
 
     # generate 3D fiber ODF maps over the spatial scales of interest using concurrent workers
-    parallel_odf_over_scales(cli_args, save_dirs, out_img['vec'], out_img['iso'], out_img['px_sz'], in_img['name'])
+    parallel_odf_over_scales(cli_args, save_dirs, out_img, in_img['name'])
 
     # delete temporary folder
-    delete_tmp_folder(save_dirs['tmp'], (in_img, out_img))
+    delete_tmp_data(save_dirs['tmp'], (in_img, out_img))
 
 
 def main():