Merge pull request #1385 from PeterNSteinmetz/master

Handle Pegasus 2.1.1 Nev files and tests of same.
NeuralEnsemble · Jan 31, 2024 · c18479b · c18479b
2 parents 0b2e3ce + 2cce0d9
commit c18479b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/neo/rawio/neuralynxrawio/nlxheader.py b/neo/rawio/neuralynxrawio/nlxheader.py
@@ -311,7 +311,7 @@ def type_of_recording(self):
 
         elif 'FileType' in self:
 
-            if 'FileVersion' in self and self['FileVersion'] in ['3.3', '3.4']:
+            if 'FileVersion' in self and self['FileVersion'] in ['3.2', '3.3', '3.4']:
                 return self['AcquisitionSystem'].split()[1].upper()
 
             else:

diff --git a/neo/test/rawiotest/test_neuralynxrawio.py b/neo/test/rawiotest/test_neuralynxrawio.py
@@ -27,7 +27,8 @@ class TestNeuralynxRawIO(BaseTestRawIO, unittest.TestCase, ):
         'neuralynx/Cheetah_v5.5.1/original_data',
         'neuralynx/Cheetah_v5.6.3/original_data',
         'neuralynx/Cheetah_v5.7.4/original_data',
-        'neuralynx/Cheetah_v6.3.2/incomplete_blocks']
+        'neuralynx/Cheetah_v6.3.2/incomplete_blocks'
+    ]
 
     def test_scan_ncs_files(self):
 
@@ -187,7 +188,9 @@ class TestNcsRecordingType(TestNeuralynxRawIO, unittest.TestCase):
         ('neuralynx/Cheetah_v5.6.3/original_data/CSC1.ncs', 'DIGITALLYNXSX'),
         ('neuralynx/Cheetah_v5.6.3/original_data/TT1.ntt', 'DIGITALLYNXSX'),
         ('neuralynx/Cheetah_v5.7.4/original_data/CSC1.ncs', 'DIGITALLYNXSX'),
-        ('neuralynx/Cheetah_v6.3.2/incomplete_blocks/CSC1_reduced.ncs', 'DIGITALLYNXSX')]
+        ('neuralynx/Cheetah_v6.3.2/incomplete_blocks/CSC1_reduced.ncs', 'DIGITALLYNXSX'),
+        ('neuralynx/Pegasus_v2.1.1/Events_0008.nev','ATLAS') ]
+
 
     def test_recording_types(self):