Update save_mat functionality for GUI usage. Fixes #1235.

Author: chriski777

suite2p/gui/io.py

@@ -457,29 +457,12 @@ def save_iscell(parent):
 
 def save_mat(parent):
     print("saving to mat")
-    matpath = os.path.join(parent.basename, "Fall.mat")
-    if "date_proc" in parent.ops:
-        parent.ops["date_proc"] = []
-    scipy.io.savemat(
-        matpath, {
-            "stat":
-                parent.stat,
-            "settings":
-                parent.ops,
-            "F":
-                parent.Fcell,
-            "Fneu":
-                parent.Fneu,
-            "spks":
-                parent.Spks,
-            "iscell":
-                np.concatenate(
-                    (parent.iscell[:, np.newaxis], parent.probcell[:, np.newaxis]),
-                    axis=1),
-            "redcell":
-                np.concatenate((np.expand_dims(parent.redcell, axis=1),
-                                np.expand_dims(parent.probredcell, axis=1)), axis=1)
-        })
+    iscell = np.concatenate(
+        (parent.iscell[:, np.newaxis], parent.probcell[:, np.newaxis]), axis=1)
+    redcell = np.concatenate(
+        (np.expand_dims(parent.redcell, axis=1), np.expand_dims(parent.probredcell, axis=1)), axis=1)
+    ops = {**parent.ops, "save_path": parent.basename}
+    io.save_mat(ops, parent.stat, parent.Fcell, parent.Fneu, parent.Spks, iscell, redcell)
 
 
 def save_merge(parent):

suite2p/io/save.py

@@ -60,11 +60,15 @@ def save_mat(ops, stat, F, Fneu, spks, iscell, redcell,
     stat = np.array(stat, dtype=object)
 
 
-    # Check for None values in ops_matlab and replace with empty arrays
-    for k, v in ops_matlab.items():
-        if v is None:
-            logger.warning(f"ops_matlab['{k}'] is None, replacing with empty array")
-            ops_matlab[k] = np.array([])
+    # Check for None values in ops_matlab and replace with empty arrays in recursive manner
+    def replace_none(d):
+        for k, v in d.items():
+            if v is None:
+                logger.warning(f"'{k}' is None, replacing with empty array")
+                d[k] = np.array([])
+            elif isinstance(v, dict):
+                replace_none(v)
+    replace_none(ops_matlab)
 
     # Handle None variables by replacing with empty arrays
     if redcell is None: