sortingview 0.13.4__tar.gz → 0.14.0a1__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.4/sortingview.egg-info → sortingview-0.14.0a1}/PKG-INFO +2 -2
  2. {sortingview-0.13.4 → sortingview-0.14.0a1}/setup.cfg +1 -1
  3. {sortingview-0.13.4 → sortingview-0.14.0a1}/setup.py +1 -1
  4. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/MultiTimeseries.py +2 -2
  5. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/SpikeSortingView.py +2 -2
  6. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_mountain_layout.py +2 -2
  7. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/prepare_spikesortingview_data.py +85 -20
  8. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/version.py +1 -1
  9. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/TiledImage.py +5 -4
  10. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/UnitImages.py +3 -2
  11. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/View.py +2 -2
  12. {sortingview-0.13.4 → sortingview-0.14.0a1/sortingview.egg-info}/PKG-INFO +2 -2
  13. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview.egg-info/requires.txt +1 -1
  14. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_average_waveforms.py +7 -1
  15. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_confusion_matrix.py +3 -2
  16. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_large_timeseries_graph.py +2 -2
  17. {sortingview-0.13.4 → sortingview-0.14.0a1}/LICENSE +0 -0
  18. {sortingview-0.13.4 → sortingview-0.14.0a1}/README.md +0 -0
  19. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/Figure.py +0 -0
  20. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/__init__.py +0 -0
  21. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_autocorrelograms_view.py +0 -0
  22. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_average_waveforms_view.py +0 -0
  23. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_autocorrelograms.py +0 -0
  24. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_average_waveforms.py +0 -0
  25. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_electrode_geometry.py +0 -0
  26. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_live_cross_correlograms.py +0 -0
  27. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_raster_plot.py +0 -0
  28. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_spike_amplitudes.py +0 -0
  29. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_summary.py +0 -0
  30. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_create_units_table.py +0 -0
  31. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_cross_correlograms_view.py +0 -0
  32. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_electrode_geometry_view.py +0 -0
  33. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_raster_plot_view.py +0 -0
  34. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_sorting_summary_view.py +0 -0
  35. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_spike_amplitudes_view.py +0 -0
  36. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/_units_table_view.py +0 -0
  37. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_console_view.py +0 -0
  38. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_epochs.py +0 -0
  39. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_position_pdf_plot.py +0 -0
  40. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_position_plot.py +0 -0
  41. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_raw_traces_plot.py +0 -0
  42. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/create_spike_raster_plot.py +0 -0
  43. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/helpers/__init__.py +0 -0
  44. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/SpikeSortingView/helpers/compute_correlogram_data.py +0 -0
  45. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/__init__.py +0 -0
  46. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/sortingview_view_url.py +0 -0
  47. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/Autocorrelograms.py +0 -0
  48. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/AverageWaveforms.py +0 -0
  49. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/Box.py +0 -0
  50. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/ConfusionMatrix.py +0 -0
  51. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/CrossCorrelograms.py +0 -0
  52. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/ElectrodeGeometry.py +0 -0
  53. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/EphysTraces.py +0 -0
  54. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/Image.py +0 -0
  55. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/LayoutItem.py +0 -0
  56. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/Markdown.py +0 -0
  57. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/MountainLayout.py +0 -0
  58. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/PlotlyFigure.py +0 -0
  59. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/PositionPlot.py +0 -0
  60. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/RasterPlot.py +0 -0
  61. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SortingCuration.py +0 -0
  62. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SortingCuration2.py +0 -0
  63. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SortingSelection.py +0 -0
  64. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SortingSummary.py +0 -0
  65. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SpikeAmplitudes.py +0 -0
  66. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/SpikeLocations.py +0 -0
  67. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/Splitter.py +0 -0
  68. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/TabLayout.py +0 -0
  69. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/TimeseriesGraph.py +0 -0
  70. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/UnitLocations.py +0 -0
  71. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/UnitMetricsGraph.py +0 -0
  72. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/UnitSimilarityMatrix.py +0 -0
  73. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/UnitsTable.py +0 -0
  74. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/__init__.py +0 -0
  75. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/franklab/DecodedLinearPositionV1.py +0 -0
  76. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/franklab/TrackPositionAnimationV1.py +0 -0
  77. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview/views/franklab/__init__.py +0 -0
  78. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview.egg-info/SOURCES.txt +0 -0
  79. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview.egg-info/dependency_links.txt +0 -0
  80. {sortingview-0.13.4 → sortingview-0.14.0a1}/sortingview.egg-info/top_level.txt +0 -0
  81. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_autocorrelograms.py +0 -0
  82. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_cross_correlograms.py +0 -0
  83. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_layout.py +0 -0
  84. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_markdown.py +0 -0
  85. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_position_plot.py +0 -0
  86. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_raster_plot.py +0 -0
  87. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_sorting_curation_2.py +0 -0
  88. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_sorting_selection.py +0 -0
  89. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_spike_amplitudes.py +0 -0
  90. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_spike_locations.py +0 -0
  91. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_tab_layout.py +0 -0
  92. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_tiled_image.py +0 -0
  93. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_track_position_animation.py +0 -0
  94. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_unit_locations.py +0 -0
  95. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_unit_metrics_graph.py +0 -0
  96. {sortingview-0.13.4 → sortingview-0.14.0a1}/tests/test_unit_similarity_matrix.py +0 -0
  97. {sortingview-0.13.4 → sortingview-0.14.0a1}/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.4
3
+ Version: 0.14.0a1
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
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
12
12
  License-File: LICENSE
13
13
  Requires-Dist: spikeinterface>=0.97.0
14
14
  Requires-Dist: kachery-cloud>=0.4.0
15
- Requires-Dist: figurl>=0.2.22
15
+ Requires-Dist: figurl==0.3.0a1
16
16
  Requires-Dist: matplotlib
17
17
  Requires-Dist: click
18
18
  Requires-Dist: pynwb
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = sortingview
3
- version = 0.13.4
3
+ version = 0.14.0a1
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.22',
11
+ 'figurl==0.3.0a1',
12
12
  'matplotlib',
13
13
  'click',
14
14
  'pynwb',
@@ -1,6 +1,6 @@
1
1
  import os
2
2
  from typing import Union
3
- import kachery_cloud as kcl
3
+ import kachery as ka
4
4
  from .Figure import Figure
5
5
 
6
6
 
@@ -25,5 +25,5 @@ class MultiTimeseries:
25
25
 
26
26
 
27
27
  def _upload_data_and_return_uri(data):
28
- data_uri = kcl.store_json(data)
28
+ data_uri = ka.store_json(data)
29
29
  return data_uri
@@ -1,6 +1,6 @@
1
1
  from typing import Tuple, Union
2
2
  import spikeinterface as si
3
- import kachery_cloud as kcl
3
+ import kachery as ka
4
4
  import h5py
5
5
  import numpy as np
6
6
  from sortingview.SpikeSortingView.prepare_spikesortingview_data import prepare_spikesortingview_data
@@ -9,7 +9,7 @@ from sortingview.SpikeSortingView.prepare_spikesortingview_data import prepare_s
9
9
  class SpikeSortingView:
10
10
  def __init__(self, data_uri: str) -> None:
11
11
  self._data_uri = data_uri
12
- self._data_file_name = kcl.load_file(data_uri)
12
+ self._data_file_name = ka.load_file(data_uri)
13
13
  if self._data_file_name is None:
14
14
  raise Exception(f"Unable to load spikesortingview data file: {data_uri}")
15
15
  with h5py.File(self._data_file_name, "r") as f:
@@ -1,6 +1,6 @@
1
1
  import os
2
2
  from typing import List, Union
3
- import kachery_cloud as kcl
3
+ import kachery as ka
4
4
  from .Figure import Figure
5
5
 
6
6
 
@@ -22,5 +22,5 @@ def create_mountain_layout(self, *, figures: List[Figure], label: Union[str, Non
22
22
 
23
23
 
24
24
  def _upload_data_and_return_uri(data):
25
- data_uri = kcl.store_json(data)
25
+ data_uri = ka.store_json(data)
26
26
  return data_uri
@@ -1,11 +1,12 @@
1
1
  from typing import Tuple, Union
2
+ from tempfile import TemporaryDirectory
2
3
  import json
3
4
  import math
4
5
  import numpy as np
5
6
  import h5py
6
7
  import hashlib
7
8
  import spikeinterface as si
8
- import kachery_cloud as kcl
9
+ import kachery as ka
9
10
  import spikeinterface.preprocessing as spre
10
11
 
11
12
 
@@ -36,21 +37,42 @@ def prepare_spikesortingview_data(
36
37
  num_frames = recording.get_num_frames()
37
38
  num_frames_per_segment = math.ceil(segment_duration_sec * sampling_frequency)
38
39
  num_segments = math.ceil(num_frames / num_frames_per_segment)
40
+ if hasattr(recording, "has_scaleable_traces") and callable(getattr(recording, "has_scaleable_traces")):
41
+ scalable = recording.has_scaleable_traces()
42
+ elif hasattr(recording, "has_scaled") and callable(getattr(recording, "has_scaled")):
43
+ scalable = recording.has_scaled()
44
+ else:
45
+ scalable = False
39
46
 
40
- with kcl.TemporaryDirectory() as tmpdir:
47
+ with TemporaryDirectory() as tmpdir:
41
48
  output_file_name = tmpdir + "/spikesortingview.h5"
42
49
  with h5py.File(output_file_name, "w") as f:
43
50
  f.create_dataset("unit_ids", data=unit_ids)
44
- f.create_dataset("sampling_frequency", data=np.array([sampling_frequency]).astype(np.float32))
51
+ f.create_dataset(
52
+ "sampling_frequency",
53
+ data=np.array([sampling_frequency]).astype(np.float32),
54
+ )
45
55
  f.create_dataset("channel_ids", data=channel_ids)
46
56
  f.create_dataset("num_frames", data=np.array([num_frames]).astype(int_type))
47
57
  channel_locations = recording.get_channel_locations()
48
58
  f.create_dataset("channel_locations", data=np.array(channel_locations))
49
59
  f.create_dataset("num_segments", data=np.array([num_segments]).astype(np.int32))
50
- f.create_dataset("num_frames_per_segment", data=np.array([num_frames_per_segment]).astype(np.int32))
51
- f.create_dataset("snippet_len", data=np.array([snippet_len[0], snippet_len[1]]).astype(np.int32))
52
- f.create_dataset("max_num_snippets_per_segment", data=np.array([max_num_snippets_per_segment]).astype(np.int32))
53
- f.create_dataset("channel_neighborhood_size", data=np.array([channel_neighborhood_size]).astype(np.int32))
60
+ f.create_dataset(
61
+ "num_frames_per_segment",
62
+ data=np.array([num_frames_per_segment]).astype(np.int32),
63
+ )
64
+ f.create_dataset(
65
+ "snippet_len",
66
+ data=np.array([snippet_len[0], snippet_len[1]]).astype(np.int32),
67
+ )
68
+ f.create_dataset(
69
+ "max_num_snippets_per_segment",
70
+ data=np.array([max_num_snippets_per_segment]).astype(np.int32),
71
+ )
72
+ f.create_dataset(
73
+ "channel_neighborhood_size",
74
+ data=np.array([channel_neighborhood_size]).astype(np.int32),
75
+ )
54
76
 
55
77
  # first get peak channels and channel neighborhoods
56
78
  unit_peak_channel_ids = {}
@@ -68,11 +90,19 @@ def prepare_spikesortingview_data(
68
90
  end_frame = min(start_frame + num_frames_per_segment, num_frames)
69
91
  start_frame_with_padding = max(start_frame - snippet_len[0], 0)
70
92
  end_frame_with_padding = min(end_frame + snippet_len[1], num_frames)
71
- traces_with_padding = recording.get_traces(start_frame=start_frame_with_padding, end_frame=end_frame_with_padding)
93
+ traces_with_padding = recording.get_traces(
94
+ start_frame=start_frame_with_padding,
95
+ end_frame=end_frame_with_padding,
96
+ return_scaled=scalable,
97
+ )
72
98
  assert isinstance(traces_with_padding, np.ndarray)
73
99
  for unit_id in unit_ids:
74
100
  if str(unit_id) not in unit_peak_channel_ids:
75
- spike_train = sorting.get_unit_spike_train(unit_id=unit_id, start_frame=start_frame, end_frame=end_frame)
101
+ spike_train = sorting.get_unit_spike_train(
102
+ unit_id=unit_id,
103
+ start_frame=start_frame,
104
+ end_frame=end_frame,
105
+ )
76
106
  assert isinstance(spike_train, np.ndarray)
77
107
  if len(spike_train) > 0:
78
108
  values = traces_with_padding[spike_train - start_frame_with_padding, :].astype(np.int32)
@@ -80,7 +110,10 @@ def prepare_spikesortingview_data(
80
110
  peak_channel_ind = np.argmax(np.abs(avg_value))
81
111
  peak_channel_id = channel_ids[peak_channel_ind]
82
112
  channel_neighborhood = get_channel_neighborhood(
83
- channel_ids=channel_ids, channel_locations=channel_locations, peak_channel_id=peak_channel_id, channel_neighborhood_size=channel_neighborhood_size
113
+ channel_ids=channel_ids,
114
+ channel_locations=channel_locations,
115
+ peak_channel_id=peak_channel_id,
116
+ channel_neighborhood_size=channel_neighborhood_size,
84
117
  )
85
118
  if len(spike_train) >= 10:
86
119
  unit_peak_channel_ids[str(unit_id)] = peak_channel_id
@@ -94,8 +127,14 @@ def prepare_spikesortingview_data(
94
127
  if peak_channel_id is None:
95
128
  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.")
96
129
  channel_neighborhood = unit_channel_neighborhoods[str(unit_id)]
97
- f.create_dataset(f"unit/{unit_id}/peak_channel_id", data=np.array([peak_channel_id]).astype(np.int32))
98
- f.create_dataset(f"unit/{unit_id}/channel_neighborhood", data=np.array(channel_neighborhood).astype(np.int32))
130
+ f.create_dataset(
131
+ f"unit/{unit_id}/peak_channel_id",
132
+ data=np.array([peak_channel_id]).astype(np.int32),
133
+ )
134
+ f.create_dataset(
135
+ f"unit/{unit_id}/channel_neighborhood",
136
+ data=np.array(channel_neighborhood).astype(np.int32),
137
+ )
99
138
 
100
139
  for iseg in range(num_segments):
101
140
  print(f"Segment {iseg} of {num_segments}")
@@ -103,8 +142,15 @@ def prepare_spikesortingview_data(
103
142
  end_frame = min(start_frame + num_frames_per_segment, num_frames)
104
143
  start_frame_with_padding = max(start_frame - snippet_len[0], 0)
105
144
  end_frame_with_padding = min(end_frame + snippet_len[1], num_frames)
106
- traces_with_padding = recording.get_traces(start_frame=start_frame_with_padding, end_frame=end_frame_with_padding)
107
- traces_sample = traces_with_padding[start_frame - start_frame_with_padding : start_frame - start_frame_with_padding + int(sampling_frequency * 1), :]
145
+ traces_with_padding = recording.get_traces(
146
+ start_frame=start_frame_with_padding,
147
+ end_frame=end_frame_with_padding,
148
+ return_scaled=scalable,
149
+ )
150
+ traces_sample = traces_with_padding[
151
+ start_frame - start_frame_with_padding : start_frame - start_frame_with_padding + int(sampling_frequency * 1),
152
+ :,
153
+ ]
108
154
  f.create_dataset(f"segment/{iseg}/traces_sample", data=traces_sample)
109
155
  all_subsampled_spike_trains = []
110
156
  for unit_id in unit_ids:
@@ -119,18 +165,28 @@ def prepare_spikesortingview_data(
119
165
  peak_channel_ind = channel_ids.tolist().index(peak_channel_id)
120
166
  if len(spike_train) > 0:
121
167
  spike_amplitudes = traces_with_padding[spike_train - start_frame_with_padding, peak_channel_ind]
122
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/spike_amplitudes", data=spike_amplitudes)
168
+ f.create_dataset(
169
+ f"segment/{iseg}/unit/{unit_id}/spike_amplitudes",
170
+ data=spike_amplitudes,
171
+ )
123
172
  else:
124
173
  spike_amplitudes = np.array([], dtype=np.int32)
125
174
  if max_num_snippets_per_segment is not None and len(spike_train) > max_num_snippets_per_segment:
126
175
  subsampled_spike_train = subsample(spike_train, max_num_snippets_per_segment)
127
176
  else:
128
177
  subsampled_spike_train = spike_train
129
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/subsampled_spike_train", data=subsampled_spike_train)
178
+ f.create_dataset(
179
+ f"segment/{iseg}/unit/{unit_id}/subsampled_spike_train",
180
+ data=subsampled_spike_train,
181
+ )
130
182
  all_subsampled_spike_trains.append(subsampled_spike_train)
131
183
  subsampled_spike_trains_concat = np.concatenate(all_subsampled_spike_trains)
132
184
  # print('Extracting spike snippets')
133
- spike_snippets_concat = extract_spike_snippets(traces=traces_with_padding, times=subsampled_spike_trains_concat - start_frame_with_padding, snippet_len=snippet_len)
185
+ spike_snippets_concat = extract_spike_snippets(
186
+ traces=traces_with_padding,
187
+ times=subsampled_spike_trains_concat - start_frame_with_padding,
188
+ snippet_len=snippet_len,
189
+ )
134
190
  # print('Collecting spike snippets')
135
191
  index = 0
136
192
  for ii, unit_id in enumerate(unit_ids):
@@ -139,12 +195,21 @@ def prepare_spikesortingview_data(
139
195
  num = len(all_subsampled_spike_trains[ii])
140
196
  spike_snippets = spike_snippets_concat[index : index + num, :, channel_neighborhood_indices]
141
197
  index = index + num
142
- f.create_dataset(f"segment/{iseg}/unit/{unit_id}/subsampled_spike_snippets", data=spike_snippets)
143
- uri = kcl.store_file_local(output_file_name)
198
+ f.create_dataset(
199
+ f"segment/{iseg}/unit/{unit_id}/subsampled_spike_snippets",
200
+ data=spike_snippets,
201
+ )
202
+ uri = ka.store_file_local(output_file_name)
144
203
  return uri
145
204
 
146
205
 
147
- def get_channel_neighborhood(*, channel_ids: np.ndarray, channel_locations: np.ndarray, peak_channel_id: int, channel_neighborhood_size: int):
206
+ def get_channel_neighborhood(
207
+ *,
208
+ channel_ids: np.ndarray,
209
+ channel_locations: np.ndarray,
210
+ peak_channel_id: int,
211
+ channel_neighborhood_size: int,
212
+ ):
148
213
  channel_locations_by_id = {}
149
214
  for ii, channel_id in enumerate(channel_ids):
150
215
  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.4'
2
+ __version__ = '0.14.0a1'
@@ -1,8 +1,9 @@
1
1
  from concurrent.futures import ThreadPoolExecutor
2
+ from tempfile import TemporaryDirectory
2
3
  import os
3
4
  from typing import Any, List, Union
4
5
  import numpy as np
5
- import kachery_cloud as kcl
6
+ import kachery as ka
6
7
  from .View import View
7
8
 
8
9
  pyvips_installation_msg = "To use TiledImage you need to install pyvips (conda recommended)"
@@ -43,7 +44,7 @@ class TiledImage(View):
43
44
  layer_label: str = L.label
44
45
  image: pyvips.Image = L.image
45
46
  num_zoom_levels = 0
46
- with kcl.TemporaryDirectory() as tmpdir:
47
+ with TemporaryDirectory() as tmpdir:
47
48
  image.dzsave(f"{tmpdir}/output", overlap=0, tile_size=self._tile_size, layout=pyvips.enums.ForeignDzLayout.DZ) # type: ignore
48
49
  output_dirname = f"{tmpdir}/output_files"
49
50
 
@@ -98,7 +99,7 @@ class TiledImage(View):
98
99
  # uris: List[str] = []
99
100
  # for fname, label in zip(fnames, labels):
100
101
  # print(f'Storing file: {fname}')
101
- # uri = kcl.store_file(fname, label=label)
102
+ # uri = ka.store_file(fname, label=label)
102
103
  # uris.append(uri)
103
104
  # return uris
104
105
 
@@ -112,4 +113,4 @@ def _store_files_parallel(fnames: List[str], verbose: bool = True, *, labels: Li
112
113
  def _store_file(fname: str, label: str, verbose: str):
113
114
  if verbose:
114
115
  print(f"Storing file: {fname}")
115
- return kcl.store_file(fname, label=label)
116
+ return ka.store_file(fname, label=label)
@@ -1,7 +1,8 @@
1
1
  from typing import List, Union
2
+ from tempfile import TemporaryDirectory
2
3
  from .View import View
3
4
  from .Image import _form_data_url
4
- import kachery_cloud as kcl
5
+ import kachery as ka
5
6
 
6
7
 
7
8
  class UnitImagesItem:
@@ -11,7 +12,7 @@ class UnitImagesItem:
11
12
 
12
13
  def __init__(self, unit_id: Union[int, str], figure, dpi: int) -> None:
13
14
  self.unit_id = unit_id
14
- with kcl.TemporaryDirectory() as tmpdir:
15
+ with TemporaryDirectory() as tmpdir:
15
16
  fname = f"{tmpdir}/image.jpg"
16
17
  figure.savefig(fname, dpi=dpi)
17
18
  self.url = _form_data_url(fname)
@@ -1,7 +1,7 @@
1
1
  from copy import deepcopy
2
2
  from abc import abstractmethod
3
3
  from typing import List, Union
4
- import kachery_cloud as kcl
4
+ import kachery as ka
5
5
  import figurl as fig
6
6
  import uuid
7
7
  from ..sortingview_view_url import sortingview_view_url
@@ -150,7 +150,7 @@ class View:
150
150
 
151
151
 
152
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)
153
+ return ka.store_json(fig.serialize_data(data, allow_float64=allow_float64), local=local)
154
154
 
155
155
 
156
156
  def _random_id():
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sortingview
3
- Version: 0.13.4
3
+ Version: 0.14.0a1
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
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
12
12
  License-File: LICENSE
13
13
  Requires-Dist: spikeinterface>=0.97.0
14
14
  Requires-Dist: kachery-cloud>=0.4.0
15
- Requires-Dist: figurl>=0.2.22
15
+ Requires-Dist: figurl==0.3.0a1
16
16
  Requires-Dist: matplotlib
17
17
  Requires-Dist: click
18
18
  Requires-Dist: pynwb
@@ -1,6 +1,6 @@
1
1
  spikeinterface>=0.97.0
2
2
  kachery-cloud>=0.4.0
3
- figurl>=0.2.22
3
+ figurl==0.3.0a1
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)
@@ -2,17 +2,18 @@
2
2
  # https://figurl.org/f?v=gs://figurl/spikesortingview-8&d=sha1://6f924d60a45e2800b6cfe198188d46a911313864&label=test_confusion_matrix
3
3
 
4
4
  from typing import List
5
+ from tempfile import TemporaryDirectory
5
6
  import spikeinterface as si
6
7
  import spikeinterface.sorters as ss
7
8
  import spikeinterface.comparison as sc
8
9
  import spikeinterface.extractors as se
9
- import kachery_cloud as kcl
10
+ import kachery as ka
10
11
  import sortingview.views as vv
11
12
 
12
13
 
13
14
  def main():
14
15
  recording, _ = se.toy_example(num_units=12, num_channels=4, duration=200, seed=0, num_segments=1)
15
- with kcl.TemporaryDirectory() as tmpdir:
16
+ with TemporaryDirectory() as tmpdir:
16
17
  sorter_params1 = {
17
18
  "detect_sign": -1,
18
19
  "adjacency_radius": -1,
@@ -3,11 +3,11 @@
3
3
 
4
4
  import numpy as np
5
5
  import sortingview.views as vv
6
- import kachery_cloud as kcl
6
+ import kachery as ka
7
7
 
8
8
 
9
9
  def main():
10
- kcl.use_sandbox()
10
+ ka.use_sandbox()
11
11
 
12
12
  view = test_large_timeseries_graph()
13
13
 
File without changes
File without changes