Skip to content

Commit 0fe9580

Browse files
committed
fix order
1 parent 5232c04 commit 0fe9580

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

src/spikeinterface/core/basesorting.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,21 @@ def get_unit_spike_train(
162162
Spike frames (or times if return_times=True)
163163
"""
164164

165+
if return_times:
166+
start_time = (
167+
self.sample_index_to_time(start_frame, segment_index=segment_index) if start_frame is not None else None
168+
)
169+
end_time = (
170+
self.sample_index_to_time(end_frame, segment_index=segment_index) if end_frame is not None else None
171+
)
172+
173+
return self.get_unit_spike_train_in_seconds(
174+
unit_id=unit_id,
175+
segment_index=segment_index,
176+
start_time=start_time,
177+
end_time=end_time,
178+
)
179+
165180
segment_index = self._check_segment_index(segment_index)
166181
if use_cache:
167182
if segment_index not in self._cached_spike_trains:
@@ -186,22 +201,8 @@ def get_unit_spike_train(
186201
unit_id=unit_id, start_frame=start_frame, end_frame=end_frame
187202
).astype("int64")
188203

189-
if return_times:
190-
start_time = (
191-
self.sample_index_to_time(start_frame, segment_index=segment_index) if start_frame is not None else None
192-
)
193-
end_time = (
194-
self.sample_index_to_time(end_frame, segment_index=segment_index) if end_frame is not None else None
195-
)
196204

197-
return self.get_unit_spike_train_in_seconds(
198-
unit_id=unit_id,
199-
segment_index=segment_index,
200-
start_time=start_time,
201-
end_time=end_time,
202-
)
203-
else:
204-
return spike_frames
205+
return spike_frames
205206

206207
def get_unit_spike_train_in_seconds(
207208
self,

0 commit comments

Comments
 (0)