diff --git a/facemap/process.py b/facemap/process.py index 1d46e19..f38c645 100644 --- a/facemap/process.py +++ b/facemap/process.py @@ -258,8 +258,8 @@ def compute_SVD( ni_mov[0] += ncb ns += 1 - S_mot = np.zeros(500, "float32") - S_mov = np.zeros(500, "float32") + S_mot = [] + S_mov = [] # take SVD of concatenated spatial PCs if ns > 1: for nr in range(len(U_mot)): @@ -270,14 +270,14 @@ def compute_SVD( U_mot[nr], k=min(ncomps, U_mot[nr].shape[0] - 1) ) U_mot[nr] = usv[0] - S_mot = usv[1] + S_mot.append(usv[1]) if movSVD: U_mov[nr] = U_mov[nr][:, : ni_mov[0]] usv = utils.svdecon( U_mov[nr], k=min(ncomps, U_mov[nr].shape[0] - 1) ) U_mov[nr] = usv[0] - S_mov = usv[1] + S_mov.append(usv[1]) elif nr > 0: if motSVD: U_mot[nr] = U_mot[nr][:, : ni_mot[nr]] @@ -285,14 +285,14 @@ def compute_SVD( U_mot[nr], k=min(ncomps, U_mot[nr].shape[0] - 1) ) U_mot[nr] = usv[0] - S_mot = usv[1] + S_mot.append(usv[1]) if movSVD: U_mov[nr] = U_mov[nr][:, : ni_mov[nr]] usv = utils.svdecon( U_mov[nr], k=min(ncomps, U_mov[nr].shape[0] - 1) ) U_mov[nr] = usv[0] - S_mov = usv[1] + S_mov.append(usv[1]) utils.update_mainwindow_message(MainWindow, GUIobject, "Finished computing svd") @@ -705,7 +705,7 @@ def run( rois = proc["rois"] sy = proc["sy"] sx = proc["sx"] - savepath = proc["savepath"] if savepath is None else savepath #proc["savepath"] if savepath is not None else savepath + savepath = proc["savepath"] if savepath is None else savepath Lybin, Lxbin, iinds = binned_inds(Ly, Lx, sbin) LYbin, LXbin, sybin, sxbin = utils.video_placement(Lybin, Lxbin) @@ -788,6 +788,8 @@ def run( U_mot_reshape = U_mot.copy() U_mov_reshape = U_mov.copy() + S_mot_reshape = S_mot.copy() + S_mov_reshape = S_mov.copy() if fullSVD: if motSVD: U_mot_reshape[0] = utils.multivideo_reshape( @@ -814,7 +816,7 @@ def run( k += 1 else: U_mot, U_mov, S_mot, S_mov = [], [], [], [] - U_mot_reshape, U_mov_reshape = [], [] + U_mot_reshape, U_mov_reshape, S_mot_reshape, S_mov_reshape = [], [], [], [] # Add V_mot and/or V_mov calculation: project U onto all movie frames ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # and compute pupil (if selected)