Skip to content

Commit 1d0f051

Browse files
author
sprenger
committed
[neuralynx] add filename karg to high-level IO
1 parent 36ed1e8 commit 1d0f051

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

neo/io/neuralynxio.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class NeuralynxIO(NeuralynxRawIO, BaseFromRaw):
2626
_prefered_signal_group_mode = 'group-by-same-units'
2727
mode = 'dir'
2828

29-
def __init__(self, dirname, use_cache=False, cache_path='same_as_resource',
29+
def __init__(self, dirname='', filename='', use_cache=False, cache_path='same_as_resource',
3030
keep_original_times=False):
3131
"""
3232
Initialise IO instance
@@ -46,6 +46,9 @@ def __init__(self, dirname, use_cache=False, cache_path='same_as_resource',
4646
shifted to begin at t_start = 0*pq.second.
4747
Default: False
4848
"""
49-
NeuralynxRawIO.__init__(self, dirname=dirname, use_cache=use_cache,
49+
NeuralynxRawIO.__init__(self, dirname=dirname, filename=filename, use_cache=use_cache,
5050
cache_path=cache_path, keep_original_times=keep_original_times)
51-
BaseFromRaw.__init__(self, dirname)
51+
if self.rawmode == 'one-file':
52+
BaseFromRaw.__init__(self, filename)
53+
elif self.rawmode == 'one-dir':
54+
BaseFromRaw.__init__(self, dirname)

neo/test/iotest/test_neuralynxio.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,17 @@ def test_read_block(self):
178178
block = nio.read_block(signal_group_mode='group-by-same-units')
179179
self.assertEqual(len(block.groups), 1)
180180

181+
def test_read_single_file(self):
182+
filename = self.get_local_path(
183+
'neuralynx/Cheetah_v5.7.4/original_data/CSC1.ncs'
184+
)
185+
nio = NeuralynxIO(filename=filename, use_cache=False)
186+
block = nio.read_block()
187+
self.assertTrue(len(block.segments[0].analogsignals) > 0)
188+
self.assertTrue((len(block.segments[0].spiketrains)) == 0)
189+
self.assertTrue((len(block.segments[0].events)) == 0)
190+
self.assertTrue((len(block.segments[0].epochs)) == 0)
191+
181192

182193
class TestPegasus_v211(CommonNeuralynxIOTest, unittest.TestCase):
183194
pegasus_version = '2.1.1'

0 commit comments

Comments
 (0)