Skip to content

Commit 0001e9e

Browse files
committed
bug fix on iotest
1 parent 55a65d1 commit 0001e9e

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

neo/io/neuralynxio.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def __init__(
3232
dirname="",
3333
use_cache=False,
3434
cache_path="same_as_resource",
35-
include_filename=None,
36-
exclude_filename=None,
35+
include_filenames=None,
36+
exclude_filenames=None,
3737
keep_original_times=False,
3838
):
3939
"""
@@ -49,9 +49,9 @@ def __init__(
4949
cache_path : str, optional
5050
Folder path to use for cache files.
5151
Default: 'same_as_resource'
52-
include_filename: str or list
52+
include_filenames: str or list
5353
Filename or list of filenames to be included. This can be absolute path or path relative to dirname.
54-
exclude_filename: str or list
54+
exclude_filenames: str or list
5555
Filename or list of filenames to be excluded. Expects base filenames without
5656
directory path.
5757
keep_original_times : bool
@@ -62,8 +62,8 @@ def __init__(
6262

6363
NeuralynxRawIO.__init__(
6464
self, dirname=dirname,
65-
include_filenames=include_filename,
66-
exclude_filenames=exclude_filename,
65+
include_filenames=include_filenames,
66+
exclude_filenames=exclude_filenames,
6767
keep_original_times=keep_original_times,
6868
use_cache=use_cache,
6969
cache_path=cache_path
@@ -72,5 +72,5 @@ def __init__(
7272
if self.rawmode == "one-dir":
7373
BaseFromRaw.__init__(self, dirname)
7474
elif self.rawmode == "multiple-files":
75-
BaseFromRaw.__init__(self, include_filename=include_filename)
75+
BaseFromRaw.__init__(self, include_filenames=include_filenames)
7676

neo/test/iotest/test_neuralynxio.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,20 @@ def test_read_block(self):
180180
block = nio.read_block(signal_group_mode="group-by-same-units")
181181
self.assertEqual(len(block.groups), 1)
182182

183-
def test_read_single_file(self):
183+
def test_include_filenames(self):
184184
filename = self.get_local_path("neuralynx/Cheetah_v5.7.4/original_data/CSC1.ncs")
185-
nio = NeuralynxIO(filename=filename, use_cache=False)
185+
nio = NeuralynxIO(include_filenames=filename, use_cache=False)
186186
block = nio.read_block()
187187
self.assertTrue(len(block.segments[0].analogsignals) > 0)
188188
self.assertTrue((len(block.segments[0].spiketrains)) == 0)
189189
self.assertTrue((len(block.segments[0].events)) == 0)
190190
self.assertTrue((len(block.segments[0].epochs)) == 0)
191191

192-
def test_exclude_filename(self):
192+
def test_exclude_filenames(self):
193193
dname = self.get_local_path("neuralynx/Cheetah_v5.7.4/original_data/")
194194

195195
# exclude a single file
196-
nio = NeuralynxIO(dirname=dname, exclude_filename="CSC1.ncs", use_cache=False)
196+
nio = NeuralynxIO(dirname=dname, exclude_filenames="CSC1.ncs", use_cache=False)
197197
block = nio.read_block()
198198
self.assertTrue(len(block.segments[0].analogsignals) > 0)
199199
self.assertTrue((len(block.segments[0].spiketrains)) >= 0)

neo/test/rawiotest/test_neuralynxrawio.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ def test_equality(self):
378378
# test = TestNeuralynxRawIO()
379379
# test.test_scan_ncs_files()
380380
# test.test_exclude_filenames()
381+
# test.test_include_filenames()
381382

382383
# test = TestNcsSectionsFactory()
383384
# test.test_ncsblocks_partial()

0 commit comments

Comments
 (0)