Merge branch 'main' into tdc_2

SpikeInterface · Oct 12, 2023 · 51fd0e8 · 51fd0e8
2 parents 0fd8492 + 5400abb
commit 51fd0e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.github/actions/build-test-environment/action.yml b/.github/actions/build-test-environment/action.yml
@@ -37,6 +37,11 @@ runs:
     - name: git-annex install
       run: |
         wget https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz
+        mkdir /home/runner/work/installation
+        mv git-annex-standalone-amd64.tar.gz /home/runner/work/installation/
+        workdir=$(pwd)
+        cd /home/runner/work/installation
         tar xvzf git-annex-standalone-amd64.tar.gz
         echo "$(pwd)/git-annex.linux" >> $GITHUB_PATH
+        cd $workdir
       shell: bash
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer

diff --git a/src/spikeinterface/comparison/groundtruthstudy.py b/src/spikeinterface/comparison/groundtruthstudy.py
@@ -286,7 +286,7 @@ def extract_waveforms_gt(self, case_keys=None, **extract_kwargs):
             # the waveforms depend on the dataset key
             wf_folder = base_folder / self.key_to_str(dataset_key)
             recording, gt_sorting = self.datasets[dataset_key]
-            we = extract_waveforms(recording, gt_sorting, folder=wf_folder)
+            we = extract_waveforms(recording, gt_sorting, folder=wf_folder, **extract_kwargs)
 
     def get_waveform_extractor(self, key):
         # some recording are not dumpable to json and the waveforms extactor need it!

diff --git a/src/spikeinterface/widgets/spikes_on_traces.py b/src/spikeinterface/widgets/spikes_on_traces.py
@@ -162,10 +162,6 @@ def plot_matplotlib(self, data_plot, **backend_kwargs):
         max_y = np.max(traces_widget.data_plot["channel_locations"][:, 1])
 
         n = len(traces_widget.data_plot["channel_ids"])
-        order = traces_widget.data_plot["order"]
-
-        if order is None:
-            order = np.arange(n)
 
         if ax.get_legend() is not None:
             ax.get_legend().remove()
@@ -221,7 +217,7 @@ def plot_matplotlib(self, data_plot, **backend_kwargs):
                     # discontinuity
                     times[:, -1] = np.nan
                     times_r = times.reshape(times.shape[0] * times.shape[1])
-                    waveforms = traces[waveform_idxs]  # [:, :, order]
+                    waveforms = traces[waveform_idxs]
                     waveforms_r = waveforms.reshape((waveforms.shape[0] * waveforms.shape[1], waveforms.shape[2]))
 
                     for i, chan_id in enumerate(traces_widget.data_plot["channel_ids"]):