Skip to content

Commit 12b5123

Browse files
committed
Fix assign_reg_io for ndarray input
1 parent e6ed85f commit 12b5123

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

suite2p/registration/register.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -801,22 +801,22 @@ def assign_reg_io(f_reg, f_raw=None, f_reg_chan2=None,
801801
Tiff output directory for the alternate channel.
802802
"""
803803
if f_reg_chan2 is None or not align_by_chan2:
804-
f_align_in = f_reg if not f_raw else f_raw
805-
f_alt_in = f_reg_chan2 if not f_raw_chan2 else f_raw_chan2
806-
f_align_out = f_reg if f_raw else None
807-
f_alt_out = f_reg_chan2 if f_raw_chan2 else None
804+
f_align_in = f_reg if f_raw is None else f_raw
805+
f_alt_in = f_reg_chan2 if f_raw_chan2 is None else f_raw_chan2
806+
f_align_out = f_reg if f_raw is not None else None
807+
f_alt_out = f_reg_chan2 if f_raw_chan2 is not None else None
808808
else:
809-
f_align_in = f_reg_chan2 if not f_raw_chan2 else f_raw_chan2
810-
f_alt_in = f_reg if not f_raw else f_raw
811-
f_align_out = f_reg_chan2 if f_raw_chan2 else None
812-
f_alt_out = f_reg if f_raw else None
809+
f_align_in = f_reg_chan2 if f_raw_chan2 is None else f_raw_chan2
810+
f_alt_in = f_reg if f_raw is None else f_raw
811+
f_align_out = f_reg_chan2 if f_raw_chan2 is not None else None
812+
f_alt_out = f_reg if f_raw is not None else None
813813

814814
if f_alt_in is not None:
815815
if f_align_in.shape[0] != f_alt_in.shape[0]:
816816
raise ValueError("number of frames in f_align_in and f_alt_in must match")
817817

818+
tif_root_align, tif_root_alt = None, None
818819
if save_path:
819-
tif_root_align, tif_root_alt = None, None
820820
if reg_tif:
821821
tifroot = os.path.join(save_path, "reg_tif")
822822
os.makedirs(tifroot, exist_ok=True)

0 commit comments

Comments
 (0)