Merge pull request #132 from MouseLand/dev

Bug fixes from github issues posted
MouseLand · Oct 27, 2023 · 8396935 · 8396935
2 parents 763a0e7 + aa9e234
commit 8396935
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/facemap/gui/gui.py b/facemap/gui/gui.py
@@ -583,16 +583,6 @@ def make_buttons(self):
         self.show_batch_button.setFont(QFont("Arial", 10, QFont.Bold))
         self.show_batch_button.clicked.connect(self.show_batch)
         self.labels_groupbox.layout().addWidget(self.show_batch_button, 0, 2)
-        """
-        self.batchname = []
-        # TODO: Change batchname to be displayed in a pop-up message box that lists the filenames!!
-        for k in range(1):
-            self.batchname.append(QLabel(""))
-            self.batchname[-1].setStyleSheet("color: white;")
-            self.batchname[-1].setAlignment(QtCore.Qt.AlignCenter)
-            self.labels_groupbox.layout().addWidget(self.batchname[-1], k + 1, 0, 1, 2)
-            # self.scene_grid_layout.addWidget(self.batchname[-1], 6 + k, 0, 1, 4)
-        """
 
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Video playback options ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         self.current_frame_lineedit = QLineEdit()
@@ -1239,7 +1229,6 @@ def save_ROIs(self):
         self.batchlist.append(savename)
         _, filename = os.path.split(savename)
         filename, _ = os.path.splitext(filename)
-        self.batchname[len(self.batchlist) - 1].setText(filename)
         self.processbatch.setEnabled(True)
 
     def process_batch(self):

diff --git a/facemap/gui/ops_user.npy b/facemap/gui/ops_user.npy
diff --git a/facemap/process.py b/facemap/process.py
@@ -454,7 +454,7 @@ def process_ROIs(
                     if movSVD:  # use raw frames for movSVD
                         imbin_mov = imbin[1:, :]
                     if fullSVD:
-                        M[t : t + imbin_mot.shape[0]] += imbin_mot.sum(axis=(-2, -1))
+                        M[0][t : t + imbin_mot.shape[0]] += imbin_mot.sum(axis=-1)
                         if motSVD:
                             imall_mot[:, ir[ii]] = imbin_mot - avgmotion[ii].flatten()
                         if movSVD:
@@ -703,7 +703,7 @@ def run(
             rois = proc["rois"]
             sy = proc["sy"]
             sx = proc["sx"]
-            savepath = proc["savepath"] if savepath is not None else savepath
+            savepath = proc["savepath"] if savepath is None else savepath #proc["savepath"] if savepath is not None else savepath
 
     Lybin, Lxbin, iinds = binned_inds(Ly, Lx, sbin)
     LYbin, LXbin, sybin, sxbin = utils.video_placement(Lybin, Lxbin)