sortingview 0.13.0__tar.gz → 0.13.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. {sortingview-0.13.0/sortingview.egg-info → sortingview-0.13.5}/PKG-INFO +9 -1
  2. {sortingview-0.13.0 → sortingview-0.13.5}/setup.cfg +1 -1
  3. {sortingview-0.13.0 → sortingview-0.13.5}/setup.py +1 -1
  4. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/prepare_spikesortingview_data.py +94 -20
  5. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/version.py +1 -1
  6. sortingview-0.13.5/sortingview/views/PlotlyFigure.py +20 -0
  7. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/TabLayout.py +5 -2
  8. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/View.py +12 -8
  9. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/__init__.py +1 -0
  10. {sortingview-0.13.0 → sortingview-0.13.5/sortingview.egg-info}/PKG-INFO +9 -1
  11. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview.egg-info/SOURCES.txt +1 -0
  12. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview.egg-info/requires.txt +1 -1
  13. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_average_waveforms.py +7 -1
  14. {sortingview-0.13.0 → sortingview-0.13.5}/LICENSE +0 -0
  15. {sortingview-0.13.0 → sortingview-0.13.5}/README.md +0 -0
  16. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/Figure.py +0 -0
  17. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/MultiTimeseries.py +0 -0
  18. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/SpikeSortingView.py +0 -0
  19. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/__init__.py +0 -0
  20. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_autocorrelograms_view.py +0 -0
  21. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_average_waveforms_view.py +0 -0
  22. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_autocorrelograms.py +0 -0
  23. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_average_waveforms.py +0 -0
  24. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_electrode_geometry.py +0 -0
  25. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_live_cross_correlograms.py +0 -0
  26. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_mountain_layout.py +0 -0
  27. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_raster_plot.py +0 -0
  28. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_spike_amplitudes.py +0 -0
  29. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_summary.py +0 -0
  30. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_create_units_table.py +0 -0
  31. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_cross_correlograms_view.py +0 -0
  32. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_electrode_geometry_view.py +0 -0
  33. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_raster_plot_view.py +0 -0
  34. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_sorting_summary_view.py +0 -0
  35. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_spike_amplitudes_view.py +0 -0
  36. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/_units_table_view.py +0 -0
  37. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_console_view.py +0 -0
  38. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_epochs.py +0 -0
  39. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_position_pdf_plot.py +0 -0
  40. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_position_plot.py +0 -0
  41. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_raw_traces_plot.py +0 -0
  42. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/create_spike_raster_plot.py +0 -0
  43. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/helpers/__init__.py +0 -0
  44. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/SpikeSortingView/helpers/compute_correlogram_data.py +0 -0
  45. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/__init__.py +0 -0
  46. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/sortingview_view_url.py +0 -0
  47. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/Autocorrelograms.py +0 -0
  48. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/AverageWaveforms.py +0 -0
  49. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/Box.py +0 -0
  50. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/ConfusionMatrix.py +0 -0
  51. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/CrossCorrelograms.py +0 -0
  52. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/ElectrodeGeometry.py +0 -0
  53. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/EphysTraces.py +0 -0
  54. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/Image.py +0 -0
  55. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/LayoutItem.py +0 -0
  56. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/Markdown.py +0 -0
  57. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/MountainLayout.py +0 -0
  58. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/PositionPlot.py +0 -0
  59. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/RasterPlot.py +0 -0
  60. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SortingCuration.py +0 -0
  61. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SortingCuration2.py +0 -0
  62. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SortingSelection.py +0 -0
  63. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SortingSummary.py +0 -0
  64. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SpikeAmplitudes.py +0 -0
  65. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/SpikeLocations.py +0 -0
  66. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/Splitter.py +0 -0
  67. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/TiledImage.py +0 -0
  68. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/TimeseriesGraph.py +0 -0
  69. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/UnitImages.py +0 -0
  70. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/UnitLocations.py +0 -0
  71. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/UnitMetricsGraph.py +0 -0
  72. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/UnitSimilarityMatrix.py +0 -0
  73. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/UnitsTable.py +0 -0
  74. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/franklab/DecodedLinearPositionV1.py +0 -0
  75. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/franklab/TrackPositionAnimationV1.py +0 -0
  76. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview/views/franklab/__init__.py +0 -0
  77. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview.egg-info/dependency_links.txt +0 -0
  78. {sortingview-0.13.0 → sortingview-0.13.5}/sortingview.egg-info/top_level.txt +0 -0
  79. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_autocorrelograms.py +0 -0
  80. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_confusion_matrix.py +0 -0
  81. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_cross_correlograms.py +0 -0
  82. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_large_timeseries_graph.py +0 -0
  83. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_layout.py +0 -0
  84. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_markdown.py +0 -0
  85. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_position_plot.py +0 -0
  86. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_raster_plot.py +0 -0
  87. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_sorting_curation_2.py +0 -0
  88. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_sorting_selection.py +0 -0
  89. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_spike_amplitudes.py +0 -0
  90. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_spike_locations.py +0 -0
  91. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_tab_layout.py +0 -0
  92. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_tiled_image.py +0 -0
  93. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_track_position_animation.py +0 -0
  94. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_unit_locations.py +0 -0
  95. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_unit_metrics_graph.py +0 -0
  96. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_unit_similarity_matrix.py +0 -0
  97. {sortingview-0.13.0 → sortingview-0.13.5}/tests/test_units_table.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sortingview
3
- Version: 0.13.0
3
+ Version: 0.13.5
4
4
  Summary: Web app for viewing results of ephys spike sorting
5
5
  Home-page: https://github.com/magland/sortingview
6
6
  Author: Jeremy Magland and Jeff Soules
@@ -10,3 +10,11 @@ Classifier: Programming Language :: Python :: 3
10
10
  Classifier: License :: OSI Approved :: Apache Software License
11
11
  Classifier: Operating System :: OS Independent
12
12
  License-File: LICENSE
13
+ Requires-Dist: spikeinterface>=0.97.0
14
+ Requires-Dist: kachery-cloud>=0.4.0
15
+ Requires-Dist: figurl>=0.2.22
16
+ Requires-Dist: matplotlib
17
+ Requires-Dist: click
18
+ Requires-Dist: pynwb
19
+ Requires-Dist: pyyaml
20
+ Requires-Dist: h5py
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = sortingview
3
- version = 0.13.0
3
+ version = 0.13.5
4
4
  author = Jeremy Magland and Jeff Soules
5
5
  author_email = jmagland@flatironinstitute.org
6
6
  description = Web app for viewing results of ephys spike sorting
@@ -8,7 +8,7 @@ setup(
8
8
  install_requires=[
9
9
  'spikeinterface>=0.97.0',
10
10
  'kachery-cloud>=0.4.0',
11
- 'figurl>=0.2.18',
11
+ 'figurl>=0.2.22',
12
12
  'matplotlib',
13
13
  'click',
14
14
  'pynwb',
@@ -19,6 +19,15 @@ def prepare_spikesortingview_data(
19
19
  channel_neighborhood_size: int,
20
20
  bandpass_filter: bool = False,
21
21
  ) -> str:
22
+ # NOTE(DS): for data longer than 25hours with fs = 20000; num_frame is too large for int32
23
+ if recording.get_num_frames() > (2**31 - 1):
24
+ int_type = np.int64
25
+ else:
26
+ int_type = np.int32
27
+ # int_type = np.int64 #NOTE(DS): to test in short recording
28
+
29
+ print(f"int_type: {int_type}")
30
+
22
31
  if bandpass_filter:
23
32
  recording = spre.bandpass_filter(recording)
24
33
  unit_ids = np.array(sorting.get_unit_ids()).astype(np.int32)
@@ -27,20 +36,42 @@ def prepare_spikesortingview_data(
27
36
  num_frames = recording.get_num_frames()
28
37
  num_frames_per_segment = math.ceil(segment_duration_sec * sampling_frequency)
29
38
  num_segments = math.ceil(num_frames / num_frames_per_segment)
39
+ if hasattr(recording, "has_scaleable_traces") and callable(getattr(recording, "has_scaleable_traces")):
40
+ scalable = recording.has_scaleable_traces()
41
+ elif hasattr(recording, "has_scaled") and callable(getattr(recording, "has_scaled")):
42
+ scalable = recording.has_scaled()
43
+ else:
44
+ scalable = False
45
+
30
46
  with kcl.TemporaryDirectory() as tmpdir:
31
47
  output_file_name = tmpdir + "/spikesortingview.h5"
32
48
  with h5py.File(output_file_name, "w") as f:
33
49
  f.create_dataset("unit_ids", data=unit_ids)
34
- f.create_dataset("sampling_frequency", data=np.array([sampling_frequency]).astype(np.float32))
50
+ f.create_dataset(
51
+ "sampling_frequency",
52
+ data=np.array([sampling_frequency]).astype(np.float32),
53
+ )
35
54
  f.create_dataset("channel_ids", data=channel_ids)
36
- f.create_dataset("num_frames", data=np.array([num_frames]).astype(np.int32))
55
+ f.create_dataset("num_frames", data=np.array([num_frames]).astype(int_type))
37
56
  channel_locations = recording.get_channel_locations()
38
57
  f.create_dataset("channel_locations", data=np.array(channel_locations))
39
58
  f.create_dataset("num_segments", data=np.array([num_segments]).astype(np.int32))
40
- f.create_dataset("num_frames_per_segment", data=np.array([num_frames_per_segment]).astype(np.int32))
41
- f.create_dataset("snippet_len", data=np.array([snippet_len[0], snippet_len[1]]).astype(np.int32))
42
- f.create_dataset("max_num_snippets_per_segment", data=np.array([max_num_snippets_per_segment]).astype(np.int32))
43
- f.create_dataset("channel_neighborhood_size", data=np.array([channel_neighborhood_size]).astype(np.int32))
59
+ f.create_dataset(
60
+ "num_frames_per_segment",
61
+ data=np.array([num_frames_per_segment]).astype(np.int32),
62
+ )
63
+ f.create_dataset(
64
+ "snippet_len",
65
+ data=np.array([snippet_len[0], snippet_len[1]]).astype(np.int32),
66
+ )
67
+ f.create_dataset(
68
+ "max_num_snippets_per_segment",
69
+ data=np.array([max_num_snippets_per_segment]).astype(np.int32),
70
+ )
71
+ f.create_dataset(
72
+ "channel_neighborhood_size",
73
+ data=np.array([channel_neighborhood_size]).astype(np.int32),
74
+ )
44
75
 
45
76
  # first get peak channels and channel neighborhoods
46
77
  unit_peak_channel_ids = {}
@@ -58,19 +89,30 @@ def prepare_spikesortingview_data(
58
89
  end_frame = min(start_frame + num_frames_per_segment, num_frames)
59
90
  start_frame_with_padding = max(start_frame - snippet_len[0], 0)
60
91
  end_frame_with_padding = min(end_frame + snippet_len[1], num_frames)
61
- traces_with_padding = recording.get_traces(start_frame=start_frame_with_padding, end_frame=end_frame_with_padding)
92
+ traces_with_padding = recording.get_traces(
93
+ start_frame=start_frame_with_padding,
94
+ end_frame=end_frame_with_padding,
95
+ return_scaled=scalable,
96
+ )
62
97
  assert isinstance(traces_with_padding, np.ndarray)
63
98
  for unit_id in unit_ids:
64
99
  if str(unit_id) not in unit_peak_channel_ids:
65
- spike_train = sorting.get_unit_spike_train(unit_id=unit_id, start_frame=start_frame, end_frame=end_frame)
100
+ spike_train = sorting.get_unit_spike_train(
101
+ unit_id=unit_id,
102
+ start_frame=start_frame,
103
+ end_frame=end_frame,
104
+ )
66
105
  assert isinstance(spike_train, np.ndarray)
67
106
  if len(spike_train) > 0:
68
- values = traces_with_padding[spike_train.astype(np.int32) - start_frame_with_padding, :]
107
+ values = traces_with_padding[spike_train - start_frame_with_padding, :].astype(np.int32)
69
108
  avg_value = np.mean(values, axis=0)
70
109
  peak_channel_ind = np.argmax(np.abs(avg_value))
71
110
  peak_channel_id = channel_ids[peak_channel_ind]
72
111
  channel_neighborhood = get_channel_neighborhood(
73
- channel_ids=channel_ids, channel_locations=channel_locations, peak_channel_id=peak_channel_id, channel_neighborhood_size=channel_neighborhood_size
112
+ channel_ids=channel_ids,
113
+ channel_locations=channel_locations,
114
+ peak_channel_id=peak_channel_id,
115
+ channel_neighborhood_size=channel_neighborhood_size,
74
116
  )
75
117
  if len(spike_train) >= 10:
76
118
  unit_peak_channel_ids[str(unit_id)] = peak_channel_id
@@ -84,8 +126,14 @@ def prepare_spikesortingview_data(
84
126
  if peak_channel_id is None:
85
127
  raise Exception(f"Peak channel not found for unit {unit_id}. This is probably because no spikes were found in any segment for this unit.")
86
128
  channel_neighborhood = unit_channel_neighborhoods[str(unit_id)]
87
- f.create_dataset(f"unit/{unit_id}/peak_channel_id", data=np.array([peak_channel_id]).astype(np.int32))
88
- f.create_dataset(f"unit/{unit_id}/channel_neighborhood", data=np.array(channel_neighborhood).astype(np.int32))
129
+ f.create_dataset(
130
+ f"unit/{unit_id}/peak_channel_id",
131
+ data=np.array([peak_channel_id]).astype(np.int32),
132
+ )
133
+ f.create_dataset(
134
+ f"unit/{unit_id}/channel_neighborhood",
135
+ data=np.array(channel_neighborhood).astype(np.int32),
136
+ )
89
137
 
90
138
  for iseg in range(num_segments):
91
139
  print(f"Segment {iseg} of {num_segments}")
@@ -93,8 +141,15 @@ def prepare_spikesortingview_data(
93
141
  end_frame = min(start_frame + num_frames_per_segment, num_frames)
94
142
  start_frame_with_padding = max(start_frame - snippet_len[0], 0)
95
143
  end_frame_with_padding = min(end_frame + snippet_len[1], num_frames)
96
- traces_with_padding = recording.get_traces(start_frame=start_frame_with_padding, end_frame=end_frame_with_padding)
97
- traces_sample = traces_with_padding[start_frame - start_frame_with_padding : start_frame - start_frame_with_padding + int(sampling_frequency * 1), :]
144
+ traces_with_padding = recording.get_traces(
145
+ start_frame=start_frame_with_padding,
146
+ end_frame=end_frame_with_padding,
147
+ return_scaled=scalable,
148
+ )
149
+ traces_sample = traces_with_padding[
150
+ start_frame - start_frame_with_padding : start_frame - start_frame_with_padding + int(sampling_frequency * 1),
151
+ :,
152
+ ]
98
153
  f.create_dataset(f"segment/{iseg}/traces_sample", data=traces_sample)
99
154
  all_subsampled_spike_trains = []
100
155
  for unit_id in unit_ids:
@@ -103,24 +158,34 @@ def prepare_spikesortingview_data(
103
158
  peak_channel_id = fallback_unit_peak_channel_ids.get(str(unit_id), None)
104
159
  if peak_channel_id is None:
105
160
  raise Exception(f"Peak channel not found for unit {unit_id}. This is probably because no spikes were found in any segment for this unit.")
106
- spike_train = sorting.get_unit_spike_train(unit_id=unit_id, start_frame=start_frame, end_frame=end_frame).astype(np.int32)
161
+ spike_train = sorting.get_unit_spike_train(unit_id=unit_id, start_frame=start_frame, end_frame=end_frame).astype(int_type)
107
162
  f.create_dataset(f"segment/{iseg}/unit/{unit_id}/spike_train", data=spike_train)
108
163
  channel_neighborhood = unit_channel_neighborhoods[str(unit_id)]
109
164
  peak_channel_ind = channel_ids.tolist().index(peak_channel_id)
110
165
  if len(spike_train) > 0:
111
166
  spike_amplitudes = traces_with_padding[spike_train - start_frame_with_padding, peak_channel_ind]
112
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/spike_amplitudes", data=spike_amplitudes)
167
+ f.create_dataset(
168
+ f"segment/{iseg}/unit/{unit_id}/spike_amplitudes",
169
+ data=spike_amplitudes,
170
+ )
113
171
  else:
114
172
  spike_amplitudes = np.array([], dtype=np.int32)
115
173
  if max_num_snippets_per_segment is not None and len(spike_train) > max_num_snippets_per_segment:
116
174
  subsampled_spike_train = subsample(spike_train, max_num_snippets_per_segment)
117
175
  else:
118
176
  subsampled_spike_train = spike_train
119
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/subsampled_spike_train", data=subsampled_spike_train)
177
+ f.create_dataset(
178
+ f"segment/{iseg}/unit/{unit_id}/subsampled_spike_train",
179
+ data=subsampled_spike_train,
180
+ )
120
181
  all_subsampled_spike_trains.append(subsampled_spike_train)
121
182
  subsampled_spike_trains_concat = np.concatenate(all_subsampled_spike_trains)
122
183
  # print('Extracting spike snippets')
123
- spike_snippets_concat = extract_spike_snippets(traces=traces_with_padding, times=subsampled_spike_trains_concat - start_frame_with_padding, snippet_len=snippet_len)
184
+ spike_snippets_concat = extract_spike_snippets(
185
+ traces=traces_with_padding,
186
+ times=subsampled_spike_trains_concat - start_frame_with_padding,
187
+ snippet_len=snippet_len,
188
+ )
124
189
  # print('Collecting spike snippets')
125
190
  index = 0
126
191
  for ii, unit_id in enumerate(unit_ids):
@@ -129,12 +194,21 @@ def prepare_spikesortingview_data(
129
194
  num = len(all_subsampled_spike_trains[ii])
130
195
  spike_snippets = spike_snippets_concat[index : index + num, :, channel_neighborhood_indices]
131
196
  index = index + num
132
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/subsampled_spike_snippets", data=spike_snippets)
197
+ f.create_dataset(
198
+ f"segment/{iseg}/unit/{unit_id}/subsampled_spike_snippets",
199
+ data=spike_snippets,
200
+ )
133
201
  uri = kcl.store_file_local(output_file_name)
134
202
  return uri
135
203
 
136
204
 
137
- def get_channel_neighborhood(*, channel_ids: np.ndarray, channel_locations: np.ndarray, peak_channel_id: int, channel_neighborhood_size: int):
205
+ def get_channel_neighborhood(
206
+ *,
207
+ channel_ids: np.ndarray,
208
+ channel_locations: np.ndarray,
209
+ peak_channel_id: int,
210
+ channel_neighborhood_size: int,
211
+ ):
138
212
  channel_locations_by_id = {}
139
213
  for ii, channel_id in enumerate(channel_ids):
140
214
  channel_locations_by_id[channel_id] = channel_locations[ii]
@@ -1,2 +1,2 @@
1
1
  # This file was automatically generated by jinjaroot. Do not edit directly.
2
- __version__ = '0.13.0'
2
+ __version__ = '0.13.5'
@@ -0,0 +1,20 @@
1
+ from typing import List
2
+ from .View import View
3
+
4
+
5
+ class PlotlyFigure(View):
6
+ """
7
+ Image
8
+ """
9
+
10
+ def __init__(self, *, fig, **kwargs) -> None:
11
+ super().__init__("PlotlyFigure", **kwargs)
12
+ self._fig = fig
13
+
14
+ def to_dict(self) -> dict:
15
+ x = self._fig.to_dict()
16
+ ret = {"type": self.type, "fig": x}
17
+ return ret
18
+
19
+ def child_views(self) -> List[View]:
20
+ return []
@@ -1,4 +1,4 @@
1
- from typing import List
1
+ from typing import List, Literal
2
2
  from .View import View
3
3
 
4
4
 
@@ -13,9 +13,10 @@ class TabLayout(View):
13
13
  Tab layout
14
14
  """
15
15
 
16
- def __init__(self, items: List[TabLayoutItem], **kwargs) -> None:
16
+ def __init__(self, items: List[TabLayoutItem], tab_bar_layout: Literal["horizontal", "vertical"] = "horizontal", **kwargs) -> None:
17
17
  super().__init__("TabLayout", is_layout=True, **kwargs)
18
18
  self._items = items
19
+ self._tab_bar_layout = tab_bar_layout
19
20
 
20
21
  def to_dict(self) -> dict:
21
22
  ret = {
@@ -23,6 +24,8 @@ class TabLayout(View):
23
24
  "items": [item.view.to_dict() if item.view.is_layout else {"type": "View", "viewId": item.view.id} for item in self._items],
24
25
  "itemProperties": [{"label": item.label} for item in self._items],
25
26
  }
27
+ if self._tab_bar_layout != "horizontal":
28
+ ret["tabBarLayout"] = self._tab_bar_layout
26
29
  return ret
27
30
 
28
31
  def child_views(self) -> List[View]:
@@ -66,7 +66,7 @@ class View:
66
66
  ret.append(v)
67
67
  return ret
68
68
 
69
- def url_dict(self, *, label: str, state: Union[dict, None] = None):
69
+ def url_dict(self, *, label: str, state: Union[dict, None] = None, allow_float64: bool = False):
70
70
  from .Box import Box
71
71
  from .LayoutItem import LayoutItem
72
72
 
@@ -78,10 +78,14 @@ class View:
78
78
  data = {
79
79
  "type": "MainLayout",
80
80
  "layout": self.to_dict(),
81
- "views": [{"type": view.type, "viewId": view.id, "dataUri": _upload_data_and_return_uri(view.to_dict())} for view in all_views if not view.is_layout],
81
+ "views": [
82
+ {"type": view.type, "viewId": view.id, "dataUri": _upload_data_and_return_uri(view.to_dict(), allow_float64=allow_float64)}
83
+ for view in all_views
84
+ if not view.is_layout
85
+ ],
82
86
  }
83
87
  view_url = sortingview_view_url
84
- F = fig.Figure(view_url=view_url, data=data)
88
+ F = fig.Figure(view_url=view_url, data=data, allow_float64=allow_float64)
85
89
  # if time_range is not None:
86
90
  # if state is None:
87
91
  # state = {}
@@ -91,10 +95,10 @@ class View:
91
95
  # Need to wrap it in a layout
92
96
  V = Box(direction="horizontal", items=[LayoutItem(self)])
93
97
  assert V.is_layout # avoid infinite recursion
94
- return V.url_dict(label=label, state=state)
98
+ return V.url_dict(label=label, state=state, allow_float64=allow_float64)
95
99
 
96
- def url(self, *, label: str, state: Union[dict, None] = None):
97
- return fig.url_from_url_dict(self.url_dict(label=label, state=state))
100
+ def url(self, *, label: str, state: Union[dict, None] = None, allow_float64: bool = False):
101
+ return fig.url_from_url_dict(self.url_dict(label=label, state=state, allow_float64=allow_float64))
98
102
 
99
103
  def jupyter(self, *, height: Union[int, None] = None):
100
104
  raise Exception("Jupyter mode no longer supported")
@@ -145,8 +149,8 @@ class View:
145
149
  self._sorting_curation = message.get("sortingCuration", {})
146
150
 
147
151
 
148
- def _upload_data_and_return_uri(data, *, local: bool = False):
149
- return kcl.store_json(fig.serialize_data(data), local=local)
152
+ def _upload_data_and_return_uri(data, *, local: bool = False, allow_float64: bool = False):
153
+ return kcl.store_json(fig.serialize_data(data, allow_float64=allow_float64), local=local)
150
154
 
151
155
 
152
156
  def _random_id():
@@ -26,5 +26,6 @@ from .ConfusionMatrix import ConfusionMatrix, UnitEventCount, MatchingUnitEventC
26
26
  from .TimeseriesGraph import TimeseriesGraph, TGDataset, TGSeries
27
27
  from .Image import Image
28
28
  from .UnitImages import UnitImages, UnitImagesItem
29
+ from .PlotlyFigure import PlotlyFigure
29
30
 
30
31
  from .EphysTraces import EphysTraces
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sortingview
3
- Version: 0.13.0
3
+ Version: 0.13.5
4
4
  Summary: Web app for viewing results of ephys spike sorting
5
5
  Home-page: https://github.com/magland/sortingview
6
6
  Author: Jeremy Magland and Jeff Soules
@@ -10,3 +10,11 @@ Classifier: Programming Language :: Python :: 3
10
10
  Classifier: License :: OSI Approved :: Apache Software License
11
11
  Classifier: Operating System :: OS Independent
12
12
  License-File: LICENSE
13
+ Requires-Dist: spikeinterface>=0.97.0
14
+ Requires-Dist: kachery-cloud>=0.4.0
15
+ Requires-Dist: figurl>=0.2.22
16
+ Requires-Dist: matplotlib
17
+ Requires-Dist: click
18
+ Requires-Dist: pynwb
19
+ Requires-Dist: pyyaml
20
+ Requires-Dist: h5py
@@ -51,6 +51,7 @@ sortingview/views/Image.py
51
51
  sortingview/views/LayoutItem.py
52
52
  sortingview/views/Markdown.py
53
53
  sortingview/views/MountainLayout.py
54
+ sortingview/views/PlotlyFigure.py
54
55
  sortingview/views/PositionPlot.py
55
56
  sortingview/views/RasterPlot.py
56
57
  sortingview/views/SortingCuration.py
@@ -1,6 +1,6 @@
1
1
  spikeinterface>=0.97.0
2
2
  kachery-cloud>=0.4.0
3
- figurl>=0.2.18
3
+ figurl>=0.2.22
4
4
  matplotlib
5
5
  click
6
6
  pynwb
@@ -49,7 +49,13 @@ def extract_snippets(*, traces: np.ndarray, times: np.ndarray, snippet_len: Tupl
49
49
 
50
50
 
51
51
  def compute_average_waveform(*, recording: si.BaseRecording, sorting: si.BaseSorting, unit_id: int):
52
- traces = recording.get_traces()
52
+ if hasattr(recording, 'has_scaleable_traces') and callable(getattr(recording, 'has_scaleable_traces')):
53
+ scalable = recording.has_scaleable_traces()
54
+ elif hasattr(recording, 'has_scaled') and callable(getattr(recording, 'has_scaled')):
55
+ scalable = recording.has_scaled()
56
+ else:
57
+ scalable = False
58
+ traces = recording.get_traces(return_scaled=scalable)
53
59
  times = sorting.get_unit_spike_train(unit_id=unit_id)
54
60
  snippets = extract_snippets(traces=traces, times=times, snippet_len=(20, 20))
55
61
  waveform = np.mean(snippets, axis=0)
File without changes
File without changes