Merge branch 'openephys_binary' of github.com:samuelgarcia/python-neo into openephys_binary

Author: samuelgarcia

neo/io/proxyobjects.py

@@ -33,14 +33,19 @@ def __init__(self, array_annotations=None, **annotations):
             # used to be str so raw bytes
             annotations['file_origin'] = str(self._rawio.source_name())
 
-        # clean annotations that are not 1D
-        # TODO change array_annotations handling to avoid that
-        array_annotations = {k: v for k, v in array_annotations.items() if v.ndim==1}
+        if array_annotations is None:
+            array_annotations = {}
+        for k, v in array_annotations.items():
+            array_annotations[k] = np.asarray(v)
 
-        # this mock the array annotaions to avoid inherits DataObject
+        # clean array annotations that are not 1D
+        # TODO remove this once multi-dimensional array_annotations are possible
+        array_annotations = {k: v for k, v in array_annotations.items()
+                             if v.ndim == 1}
+
+        # this mock the array annotations to avoid inherits DataObject
         self.array_annotations = ArrayDict(self.shape[-1])
-        if array_annotations is not None:
-            self.array_annotations.update(array_annotations)
+        self.array_annotations.update(array_annotations)
 
         BaseNeo.__init__(self, **annotations)
 

neo/rawio/openephysbinaryrawio.py

@@ -214,7 +214,12 @@ def _parse_header(self):
                         if k in ('timestamps', ):
                             continue
                         if k in d:
-                            ev_ann['__array_annotations__'][k] = d[k]
+                            # split custom dtypes into separate annotations
+                            if d[k].dtype.names:
+                                for name in d[k].dtype.names:
+                                    ev_ann['__array_annotations__'][name] = d[k][name].flatten()
+                            else:
+                                ev_ann['__array_annotations__'][k] = d[k]
 
     def _segment_t_start(self, block_index, seg_index):
         return self._t_start_segments[block_index][seg_index]