VideoMaker trodes fixes and resume from fail (#1174)

* Additional 'start from fail' measures * WIP: fix TrodesPosVideo * WIP: get n_frames on trodes vid * WIP: error on upscaled data * ✅ : Add missing index * blackify * More test fixes for headless VideoMaker * pre-commit lint * revert matplotlib backend
LorenFrankLab · Nov 7, 2024 · 0c5a903 · 0c5a903
1 parent dc08c25
commit 0c5a903
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,9 +65,10 @@ dj.FreeTable(dj.conn(), "common_session.session_group").drop()
     - Minor fix to `DLCCentroid` make function order #1112, #1148
     - Video creator tools:
         - Pass output path as string to `cv2.VideoWriter` #1150
-        - Set `DLCPosVideo` default processor to `matplotlib`, remove support
-            for `open-cv` #1168
-        - `VideoMaker` class to process frames in multithreaded batches #1168
+        - Set `DLCPosVideo` default processor to `matplotlib`, remove support for
+            `open-cv` #1168
+        - `VideoMaker` class to process frames in multithreaded batches #1168, #1174
+        - `TrodesPosVideo` updates for `matplotlib` processor #1174
 
 - Spike Sorting
 

diff --git a/dj_local_conf_example.json b/dj_local_conf_example.json
@@ -53,4 +53,4 @@
     },
     "kachery_zone": "franklab.default"
   }
-}
+}
diff --git a/notebooks/40_Extracting_Clusterless_Waveform_Features.ipynb b/notebooks/40_Extracting_Clusterless_Waveform_Features.ipynb
@@ -404,7 +404,7 @@
     "for sorting_id in sorting_ids:\n",
     "    try:\n",
     "        sgs.CurationV1.insert_curation(sorting_id=sorting_id)\n",
-    "    except KeyError as e:\n",
+    "    except KeyError:\n",
     "        pass\n",
     "\n",
     "SpikeSortingOutput.insert(\n",

diff --git a/notebooks/py_scripts/40_Extracting_Clusterless_Waveform_Features.py b/notebooks/py_scripts/40_Extracting_Clusterless_Waveform_Features.py
@@ -176,7 +176,7 @@
 for sorting_id in sorting_ids:
     try:
         sgs.CurationV1.insert_curation(sorting_id=sorting_id)
-    except KeyError as e:
+    except KeyError:
         pass
 
 SpikeSortingOutput.insert(

diff --git a/src/spyglass/position/v1/dlc_utils.py b/src/spyglass/position/v1/dlc_utils.py
@@ -434,7 +434,9 @@ def find_mp4(
         .rsplit(video_filepath.parent.as_posix(), maxsplit=1)[-1]
         .split("/")[-1]
     )
-    return _convert_mp4(video_file, video_path, output_path, videotype="mp4")
+    return _convert_mp4(
+        video_file, video_path, output_path, videotype="mp4", count_frames=True
+    )
 
 
 def _convert_mp4(