Skip to content

Commit 89eaaf7

Browse files
Merge pull request #796 from apdavison/nwb2
Add NWBIO
2 parents 55e3881 + 16e9f7d commit 89eaaf7

File tree

6 files changed

+1162
-32
lines changed

6 files changed

+1162
-32
lines changed

neo/io/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
* :attr:`NeuroScopeIO`
4545
* :attr:`NeuroshareIO`
4646
* :attr:`NixIO`
47+
* :attr:`NWBIO`
4748
* :attr:`OpenEphysIO`
4849
* :attr:`OpenEphysBinaryIO`
4950
* :attr:`PhyIO`
@@ -185,6 +186,10 @@
185186
186187
.. autoattribute:: extensions
187188
189+
.. autoclass:: neo.io.NWBIO
190+
191+
.. autoattribute:: extensions
192+
188193
.. autoclass:: neo.io.OpenEphysIO
189194
190195
.. autoattribute:: extensions
@@ -297,6 +302,7 @@
297302
from neo.io.neuroscopeio import NeuroScopeIO
298303
from neo.io.nixio import NixIO
299304
from neo.io.nixio_fr import NixIO as NixIOFr
305+
from neo.io.nwbio import NWBIO
300306
from neo.io.openephysio import OpenEphysIO
301307
from neo.io.openephysbinaryio import OpenEphysBinaryIO
302308
from neo.io.phyio import PhyIO
@@ -346,6 +352,7 @@
346352
NeuroExplorerIO,
347353
NeuroScopeIO,
348354
NeuroshareIO,
355+
NWBIO,
349356
OpenEphysIO,
350357
OpenEphysBinaryIO,
351358
PhyIO,

neo/io/asciisignalio.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ def read_segment(self, lazy=False):
195195
delimiter=self.delimiter,
196196
usecols=self.usecols,
197197
skip_header=self.skiprows,
198-
dtype='f')
198+
dtype='f',
199+
invalid_raise=False)
199200
if len(sig.shape) == 1:
200201
sig = sig[:, np.newaxis]
201202
elif self.method == 'csv':

0 commit comments

Comments
 (0)