bugfix in infer_output_dir

ttngu207 · Sep 6, 2023 · e13146f · e13146f
1 parent 350deef
commit e13146f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/element_calcium_imaging/imaging.py b/element_calcium_imaging/imaging.py
@@ -254,13 +254,9 @@ def infer_output_dir(cls, key, relative=False, mkdir=False):
                 e.g.: sub4/sess1/scan0/suite2p_0
         """
         acq_software = (scan.Scan & key).fetch1("acq_software")
-        filetypes = dict(
-            ScanImage="*.tif", Scanbox="*.sbx", NIS="*.nd2", PrairieView="*.tif"
-        )
-
         scan_dir = find_full_path(
             get_imaging_root_data_dir(),
-            get_calcium_imaging_files(key, filetypes[acq_software])[0],
+            get_calcium_imaging_files(key, acq_software)[0],
         ).parent
         root_dir = find_root_directory(get_imaging_root_data_dir(), scan_dir)
 

diff --git a/element_calcium_imaging/imaging_no_curation.py b/element_calcium_imaging/imaging_no_curation.py
@@ -254,13 +254,9 @@ def infer_output_dir(cls, key, relative=False, mkdir=False):
                 e.g.: sub4/sess1/scan0/suite2p_0
         """
         acq_software = (scan.Scan & key).fetch1("acq_software")
-        filetypes = dict(
-            ScanImage="*.tif", Scanbox="*.sbx", NIS="*.nd2", PrairieView="*.tif"
-        )
-
         scan_dir = find_full_path(
             get_imaging_root_data_dir(),
-            get_calcium_imaging_files(key, filetypes[acq_software])[0],
+            get_calcium_imaging_files(key, acq_software)[0],
         ).parent
         root_dir = find_root_directory(get_imaging_root_data_dir(), scan_dir)
 

diff --git a/element_calcium_imaging/imaging_preprocess.py b/element_calcium_imaging/imaging_preprocess.py
@@ -444,13 +444,9 @@ def infer_output_dir(cls, key, relative=False, mkdir=False):
                 e.g.: sub4/sess1/scan0/suite2p_0
         """
         acq_software = (scan.Scan & key).fetch1("acq_software")
-        filetypes = dict(
-            ScanImage="*.tif", Scanbox="*.sbx", NIS="*.nd2", PrairieView="*.tif"
-        )
-
         scan_dir = find_full_path(
             get_imaging_root_data_dir(),
-            get_calcium_imaging_files(key, filetypes[acq_software])[0],
+            get_calcium_imaging_files(key, acq_software)[0],
         ).parent
         root_dir = find_root_directory(get_imaging_root_data_dir(), scan_dir)