Skip to content

Commit d8a7cc9

Browse files
author
sprenger
committed
[edf] fix tests and event label dtype
1 parent 3447ea5 commit d8a7cc9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

neo/rawio/edfrawio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def _get_event_timestamps(self, block_index, seg_index, event_channel_index, t_s
239239
durations = None
240240

241241
times = timestamps[time_mask][event_mask]
242-
labels = labels[time_mask][event_mask]
242+
labels = np.asarray(labels[time_mask][event_mask], dtype='U')
243243

244244
return times, durations, labels
245245

neo/test/iotest/test_edfio.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ def test_read_segment_with_time_slice(self):
4343
io = EDFIO(self.filename)
4444
seg = io.read_segment(time_slice=None)
4545

46+
# data file does not contain spike, event or epoch timestamps
4647
self.assertEqual(len(seg.spiketrains), 0)
47-
self.assertEqual(len(seg.events), 0)
48+
self.assertEqual(len(seg.events), 1)
49+
self.assertEqual(len(seg.events[0]), 0)
50+
self.assertEqual(len(seg.epochs), 1)
51+
self.assertEqual(len(seg.epochs[0]), 0)
4852
for asig in seg.analogsignals:
4953
self.assertEqual(asig.shape[0], 256)
5054
n_channels = sum(a.shape[-1] for a in seg.analogsignals)
@@ -68,7 +72,7 @@ def test_compare_data(self):
6872
self.assertEqual(len(anasigs), 5) # all channels have different units, so expecting 5
6973
for aidx, anasig in enumerate(anasigs):
7074
# comparing raw data to original values
71-
ana_data = anasigs[0].load(magnitude_mode='raw')
75+
ana_data = anasig.load(magnitude_mode='raw')
7276
np.testing.assert_array_equal(ana_data.magnitude, plain_data[:, aidx:aidx + 1])
7377

7478
# comparing floating data to original values * gain factor
@@ -78,7 +82,7 @@ def test_compare_data(self):
7882
digital_range = ch_head['digital_max'] - ch_head['digital_min'] + 1
7983

8084
gain = physical_range / digital_range
81-
ana_data = anasigs[0].load(magnitude_mode='rescaled')
85+
ana_data = anasig.load(magnitude_mode='rescaled')
8286
rescaled_data = plain_data[:, aidx:aidx + 1] * gain
8387
np.testing.assert_array_equal(ana_data.magnitude, rescaled_data)
8488

0 commit comments

Comments
 (0)