Generalize neuraview2 pattern and partially openClosedInHeader.

Author: Peter N. Steinmetz

neo/rawio/neuralynxrawio/nlxheader.py

@@ -277,8 +277,8 @@ def convert_channel_ids_names(self, filename):
         # ## Date Opened: (mm/dd/yyy): 12/14/2015 At Time: 15:58:32
         # ## Date Closed: (mm/dd/yyy): 12/14/2015 At Time: 15:58:32
         "neuraview2": dict(
-            datetime1_regex=r"## Date Opened: \(mm/dd/yyy\): (?P<date>\S+)" r" At Time: (?P<time>\S+)",
-            datetime2_regex=r"## Date Closed: \(mm/dd/yyy\): (?P<date>\S+)" r" At Time: (?P<time>\S+)",
+            datetime1_regex=r"## (Time|Date) Opened: \((m/d/y|mm/dd/yyy)\): (?P<date>\S+)" r" At Time: (?P<time>\S+)",
+            datetime2_regex=r"## (Time|Date) Closed: \((m/d/y|mm/dd/yyy)\): (?P<date>\S+)" r" At Time: (?P<time>\S+)",
             datetimeformat="%m/%d/%Y %H:%M:%S",
         ),
         # pegasus version 2.1.1 and Cheetah beyond version 5.6.4 - example
@@ -300,8 +300,8 @@ def convert_channel_ids_names(self, filename):
         ),
         # version with time open and closed in ## header lines
         "openClosedInHeader": dict(
-           datetime1_regex=r"## Time Opened \(m/d/y\): (?P<date>\S+)" r"  (\(h:m:s\.ms\)|At Time:) (?P<time>\S+)",
-           datetime2_regex=r"## Time Closed \(m/d/y\): (?P<date>\S+)" r"  (\(h:m:s\.ms\)|At Time:) (?P<time>\S+)",
+           datetime1_regex=r"## (Time|Date) Opened \(m/d/y\): (?P<date>\S+)" r"  (\(h:m:s\.ms\)|At Time:) (?P<time>\S+)",
+           datetime2_regex=r"## (Time|Date) Closed \(m/d/y\): (?P<date>\S+)" r"  (\(h:m:s\.ms\)|At Time:) (?P<time>\S+)",
            datetimeformat="%m/%d/%Y %H:%M:%S.%f",
         )
     }

neo/test/rawiotest/test_neuralynxrawio.py

@@ -1,3 +1,4 @@
+import datetime
 import unittest
 
 import os
@@ -375,5 +376,12 @@ def test_no_date_time(self):
         self.assertEqual(hdr['ApplicationName'], 'Pegasus')
         self.assertEqual(hdr['FileType'], 'Event')
 
+    def test_neuraview2(self):
+        filename = self.get_local_path("neuralynx/Neuraview_v2/original_data/NeuraviewEventMarkers-sample.nev")
+        hdr = NlxHeader(filename)
+
+        self.assertEqual(datetime.datetime(2015,12,14, 15,58,32), hdr['recording_opened'])
+        self.assertEqual(datetime.datetime(2015,12,14, 15,58,32), hdr['recording_closed'])
+
 if __name__ == "__main__":
     unittest.main()