Merge branch 'master' into update-ci

Author: zm711

doc/source/authors.rst

@@ -97,6 +97,7 @@ and may not be the current affiliation of a contributor.
 * Luiz Tauffer [24]
 * Akshaj Verma [46]
 * Letizia Signorelli [47]
+* Daniel Parthier [48]
 
 1. Centre de Recherche en Neuroscience de Lyon, CNRS UMR5292 - INSERM U1028 - Université Claude Bernard Lyon 1
 2. Unité de Neuroscience, Information et Complexité, CNRS UPR 3293, Gif-sur-Yvette, France
@@ -145,6 +146,7 @@ and may not be the current affiliation of a contributor.
 45. Maxwell Biosystems AG
 46. Brain Center, University Medical Center Utrecht, Utrecht University, The Netherlands
 47. Centre for Molecular Medicine Norway (NCMM), University of Oslo, Norway
+48. Charité - Universitätmedizin Berlin, Freie Universität Berlin and Humboldt Universität zu Berlin
 
 
 

neo/rawio/axonarawio.py

@@ -560,19 +560,19 @@ def get_active_tetrode(self):
                     tetrode_id = int(key.strip("collectMask_"))
                     active_tetrodes.append(tetrode_id)
         return active_tetrodes
-    
+
     def _get_active_channels(self):
         """
         Returns the ID numbers of the active channels as a list.
         E.g.: [20,21,22,23] for tetrode 6 active.
         """
         active_tetrodes = self.get_active_tetrode()
         active_channels = []
-        
+
         for tetrode in active_tetrodes:
             chans = self._get_channel_from_tetrode(tetrode)
             active_channels.append(chans)
-        
+
         return np.concatenate(active_channels)
 
     def _get_channel_from_tetrode(self, tetrode):
@@ -645,7 +645,7 @@ def _get_signal_chan_header(self):
         gain_list = self._get_channel_gain()
         offset = 0  # What is the offset?
 
-        first_channel = (active_tetrode_set[0] - 1)*elec_per_tetrode
+        first_channel = (active_tetrode_set[0] - 1) * elec_per_tetrode
         sig_channels = []
         for itetr in range(num_active_tetrode):
 

neo/rawio/winwcprawio.py

@@ -9,6 +9,7 @@
 """
 
 import struct
+import datetime
 
 import numpy as np
 
@@ -61,6 +62,7 @@ def _parse_header(self):
                     continue
                 key, val = line.split("=")
                 if key in [
+                    "VER",
                     "NC",
                     "NR",
                     "NBH",
@@ -80,6 +82,12 @@ def _parse_header(self):
                 header[key] = val
 
             nb_segment = header["NR"]
+
+            # get rec_datetime when WCP data file version is later than 8
+            if header["VER"] > 8:
+                rec_datetime = datetime.datetime.strptime(header["RTIME"], "%d/%m/%Y %H:%M:%S")
+            else:
+                rec_datetime = None
             all_sampling_interval = []
             # loop for record number
             for seg_index in range(header["NR"]):
@@ -167,6 +175,8 @@ def _parse_header(self):
 
         # insert some annotation at some place
         self._generate_minimal_annotations()
+        bl_annotations = self.raw_annotations["blocks"][0]
+        bl_annotations["rec_datetime"] = rec_datetime
 
     def _segment_t_start(self, block_index, seg_index):
         return 0.0

neo/test/iotest/test_winwcpio.py

@@ -14,7 +14,10 @@ class TestRawBinarySignalIO(
 ):
     ioclass = WinWcpIO
     entities_to_download = ["winwcp"]
-    entities_to_test = ["winwcp/File_winwcp_1.wcp"]
+    entities_to_test = [
+        "winwcp/File_winwcp_1.wcp",
+        "winwcp/file_with_recording_time/File_winwcp_2.wcp",
+    ]
 
 
 if __name__ == "__main__":

neo/test/rawiotest/test_winwcprawio.py

@@ -10,7 +10,10 @@ class TestWinWcpRawIO(
 ):
     rawioclass = WinWcpRawIO
     entities_to_download = ["winwcp"]
-    entities_to_test = ["winwcp/File_winwcp_1.wcp"]
+    entities_to_test = [
+        "winwcp/File_winwcp_1.wcp",
+        "winwcp/file_with_recording_time/File_winwcp_2.wcp",
+    ]
 
 
 if __name__ == "__main__":