Skip to content

Commit

Permalink
conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelgarcia committed Jun 19, 2024
2 parents 82c7ee5 + eb21af5 commit 60125cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions src/spikeinterface/sortingcomponents/motion_interpolation.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def correct_motion_on_peaks(peaks, peak_locations, motion, recording):
Motion-corrected peak locations
"""
corrected_peak_locations = peak_locations.copy()


for segment_index in range(motion.num_segments):
times_s = recording.sample_index_to_time(peaks["sample_index"], segment_index=segment_index)
Expand Down Expand Up @@ -443,7 +442,6 @@ def get_traces(self, start_frame, end_frame, channel_indices):
spatial_interpolation_method=self.spatial_interpolation_method,
spatial_interpolation_kwargs=self.spatial_interpolation_kwargs,
interpolation_time_bin_centers_s=self.interpolation_time_bin_centers_s,

)

if channel_indices is not None:
Expand Down
10 changes: 5 additions & 5 deletions src/spikeinterface/widgets/motion.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ def plot_matplotlib(self, data_plot, **backend_kwargs):

class MotionInfoWidget(BaseWidget):
"""
Plot motion information from the motion_info dict returned by correct_motion().
This plot:
* the motion iself
* the peak depth vs time before correction
* the peak depth vs time after correction
Plot motion information from the motion_info dict returned by correct_motion().
This plot:
* the motion iself
* the peak depth vs time before correction
* the peak depth vs time after correction
Parameters
----------
Expand Down

0 comments on commit 60125cc

Please sign in to comment.