Merge branch 'staging' of https://github.com/datajoint/element-interface

into staging
datajoint · Jun 26, 2024 · c189c48 · c189c48
2 parents 990f6b1 + ddf8a83
commit c189c48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/element_interface/caiman_loader.py b/element_interface/caiman_loader.py
@@ -293,8 +293,10 @@ def _get_image(self, img_type):
             )
         else:
             img_ = np.dstack(
-                pln_cm.motion_correction[img_type][...]
-                for pln_cm in self.planes.values()
+                [
+                    pln_cm.motion_correction[img_type][...]
+                    for pln_cm in self.planes.values()
+                ]
             )
         return img_
 

diff --git a/element_interface/run_caiman.py b/element_interface/run_caiman.py
@@ -1,6 +1,7 @@
-import pathlib
-
 import cv2
+import os
+import pathlib
+import shutil
 
 try:
     cv2.setNumThreads(0)
@@ -45,7 +46,7 @@ def run_caiman(
     opts = params.CNMFParams(params_dict=parameters)
 
     c, dview, n_processes = cm.cluster.setup_cluster(
-        backend="local", n_processes=None, single_thread=False
+        backend="multiprocessing", n_processes=None
     )
 
     try: