Skip to content

Commit c18479b

Browse files
authored
Merge pull request NeuralEnsemble#1385 from PeterNSteinmetz/master
Handle Pegasus 2.1.1 Nev files and tests of same.
2 parents 0b2e3ce + 2cce0d9 commit c18479b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

neo/rawio/neuralynxrawio/nlxheader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def type_of_recording(self):
311311

312312
elif 'FileType' in self:
313313

314-
if 'FileVersion' in self and self['FileVersion'] in ['3.3', '3.4']:
314+
if 'FileVersion' in self and self['FileVersion'] in ['3.2', '3.3', '3.4']:
315315
return self['AcquisitionSystem'].split()[1].upper()
316316

317317
else:

neo/test/rawiotest/test_neuralynxrawio.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class TestNeuralynxRawIO(BaseTestRawIO, unittest.TestCase, ):
2727
'neuralynx/Cheetah_v5.5.1/original_data',
2828
'neuralynx/Cheetah_v5.6.3/original_data',
2929
'neuralynx/Cheetah_v5.7.4/original_data',
30-
'neuralynx/Cheetah_v6.3.2/incomplete_blocks']
30+
'neuralynx/Cheetah_v6.3.2/incomplete_blocks'
31+
]
3132

3233
def test_scan_ncs_files(self):
3334

@@ -187,7 +188,9 @@ class TestNcsRecordingType(TestNeuralynxRawIO, unittest.TestCase):
187188
('neuralynx/Cheetah_v5.6.3/original_data/CSC1.ncs', 'DIGITALLYNXSX'),
188189
('neuralynx/Cheetah_v5.6.3/original_data/TT1.ntt', 'DIGITALLYNXSX'),
189190
('neuralynx/Cheetah_v5.7.4/original_data/CSC1.ncs', 'DIGITALLYNXSX'),
190-
('neuralynx/Cheetah_v6.3.2/incomplete_blocks/CSC1_reduced.ncs', 'DIGITALLYNXSX')]
191+
('neuralynx/Cheetah_v6.3.2/incomplete_blocks/CSC1_reduced.ncs', 'DIGITALLYNXSX'),
192+
('neuralynx/Pegasus_v2.1.1/Events_0008.nev','ATLAS') ]
193+
191194

192195
def test_recording_types(self):
193196

0 commit comments

Comments
 (0)