fixing bug with multiplane registration

MouseLand · Feb 6, 2024 · 361421f · 361421f
1 parent 193e7f1
commit 361421f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/suite2p/io/utils.py b/suite2p/io/utils.py
@@ -342,7 +342,7 @@ def init_ops(ops):
             ops["save_path"] = os.path.join(ops["save_path0"], "suite2p", "plane%d" % j)
 
         if ("fast_disk" not in ops) or len(ops["fast_disk"]) == 0:
-            ops["fast_disk"] = ops["save_path0"].copy()
+            ops["fast_disk"] = ops["save_path0"]
         fast_disk = os.path.join(ops["fast_disk"], "suite2p", "plane%d" % j)
         ops["ops_path"] = os.path.join(ops["save_path"], "ops.npy")
         ops["reg_file"] = os.path.join(fast_disk, "data.bin")

diff --git a/suite2p/registration/register.py b/suite2p/registration/register.py
@@ -262,7 +262,11 @@ def register_frames(refAndMasks, frames, rmin=-np.inf, rmax=np.inf, bidiphase=0,
                 else:
                     for output, output_best in zip(outputs[:-1], outputs_best):
                         output_best[i] = output[0]
-        frames, ymax, xmax, cmax, ymax1, xmax1, cmax1 = outputs_best
+        if len(outputs_best)==7:
+            frames, ymax, xmax, cmax, ymax1, xmax1, cmax1 = outputs_best
+        else:
+            frames, ymax, xmax, cmax = outputs_best
+            ymax1, xmax1, cmax1 = None, None, None
         return frames, ymax, xmax, cmax, ymax1, xmax1, cmax1, (zpos_best, cmax_all)
     else:
         if len(refAndMasks) == 7 or not isinstance(refAndMasks, np.ndarray):
@@ -306,7 +310,7 @@ def register_frames(refAndMasks, frames, rmin=-np.inf, rmax=np.inf, bidiphase=0,
             maxregshift=ops["maxregshift"],
             smooth_sigma_time=ops["smooth_sigma_time"],
         )
-
+        
         for frame, dy, dx in zip(frames, ymax, xmax):
             frame[:] = rigid.shift_frame(frame=frame, dy=dy, dx=dx)
 
@@ -638,6 +642,7 @@ def registration_wrapper(f_reg, f_raw=None, f_reg_chan2=None, f_raw_chan2=None,
     else:
         nchannels = 1
 
+
     outputs = compute_reference_and_register_frames(f_align_in, f_align_out=f_align_out,
                                                     refImg=refImg, ops=ops)
     refImg, rmin, rmax, mean_img, rigid_offsets, nonrigid_offsets, zest = outputs