Skip to content

Commit 2a4d045

Browse files
committed
Simplify logic for timing get_traces
1 parent f383468 commit 2a4d045

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

spikeinterface_gui/controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def get_traces(self, trace_source='preprocessed', **kargs):
596596
if trace_source == 'preprocessed':
597597
rec = self.analyzer.recording
598598
elif trace_source == 'raw':
599-
raise NotImplemented
599+
raise NotImplementedError("Raw traces not implemented yet")
600600
# TODO get with parent recording the non process recording
601601
kargs['return_in_uV'] = self.return_in_uV
602602
traces = rec.get_traces(**kargs)

spikeinterface_gui/tracemapview.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ def __init__(self, controller=None, parent=None, backend="qt"):
3232

3333
self.xsize = 0.5
3434
self._block_auto_refresh_and_notify = False
35-
self._retrieve_traces_time_checked = None
3635
self.trace_context = nullcontext
3736

3837
ViewBase.__init__(self, controller=controller, parent=parent, backend=backend)

spikeinterface_gui/traceview.py

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,20 @@ class MixinViewTrace:
1919

2020
def get_data_in_chunk(self, t1, t2, segment_index):
2121
with self.trace_context():
22-
if not self._retrieve_traces_time_checked:
23-
t_traces_start = time.perf_counter()
2422
t_start = 0.0
2523
sr = self.controller.sampling_frequency
2624

2725
ind1 = max(0, int((t1 - t_start) * sr))
2826
ind2 = min(self.controller.get_num_samples(segment_index), int((t2 - t_start) * sr))
2927

28+
t_traces_start = time.perf_counter()
3029
traces_chunk = self.controller.get_traces(segment_index=segment_index, start_frame=ind1, end_frame=ind2)
30+
t_traces_end = time.perf_counter()
31+
elapsed = t_traces_end - t_traces_start
32+
if elapsed > self.MAX_RETRIEVE_TIME_FOR_BUSY_CURSOR:
33+
self.trace_context = self.busy_cursor
34+
else:
35+
self.trace_context = nullcontext
3136

3237
sl = self.controller.segment_slices[segment_index]
3338
spikes_seg = self.controller.spikes[sl]
@@ -98,14 +103,6 @@ def get_data_in_chunk(self, t1, t2, segment_index):
98103
scatter_y.extend(y)
99104
scatter_colors.extend([color] * len(x))
100105

101-
if not self._retrieve_traces_time_checked:
102-
t_traces_end = time.perf_counter()
103-
elapsed = t_traces_end - t_traces_start
104-
if elapsed > self.MAX_RETRIEVE_TIME_FOR_BUSY_CURSOR:
105-
print(f"Trace retrieval took {elapsed:.3f} seconds. Enabling busy cursor.")
106-
self.trace_context = self.busy_cursor
107-
self._retrieve_traces_time_checked = True
108-
109106
return times_chunk, data_curves, scatter_x, scatter_y, scatter_colors
110107

111108
## Qt ##
@@ -212,9 +209,6 @@ def _qt_on_combo_seg_changed(self):
212209

213210
def _qt_on_xsize_changed(self):
214211
xsize = self.spinbox_xsize.value()
215-
# Reset trace retrieval check: might require more or less time now!
216-
if xsize > self.xsize:
217-
self._retrieve_traces_time_checked = False
218212
self.xsize = xsize
219213
if not self._block_auto_refresh_and_notify:
220214
self.refresh()
@@ -313,9 +307,6 @@ def _panel_change_segment(self, seg_index):
313307
self.notify_time_info_updated()
314308

315309
def _panel_on_xsize_changed(self, event):
316-
# Reset trace retrieval check: might require more or less time now!
317-
if event.new > self.xsize:
318-
self._retrieve_traces_time_checked = False
319310
self.xsize = event.new
320311
if not self._block_auto_refresh_and_notify:
321312
self.refresh()
@@ -401,7 +392,6 @@ def __init__(self, controller=None, parent=None, backend="qt"):
401392
self.factor = 15.0
402393
self.xsize = 0.5
403394
self._block_auto_refresh_and_notify = False
404-
self._retrieve_traces_time_checked = False
405395
self.trace_context = nullcontext
406396

407397
self.channel_order, self.channel_order_reverse = None, None

0 commit comments

Comments
 (0)