[nixraw] add signal annotations and basic test

Author: sprenger

neo/rawio/nixrawio.py

@@ -211,21 +211,6 @@ def _parse_header(self):
                 props = group.metadata.inherited_properties()
                 seg_ann.update(self._filter_properties(props, "segment"))
 
-                # TODO handle annotation at stream level
-                '''
-                 sig_idx = 0
-                 groupdas = NixIO._group_signals(grp.data_arrays)
-                 for nix_name, signals in groupdas.items():
-                    da = signals[0]
-                     if da.type == 'neo.analogsignal' and seg_ann['signals']:
-                         # collect and group DataArrays
-                         sig_ann = seg_ann['signals'][sig_idx]
-                         sig_chan_ann = self.raw_annotations['signal_channels'][sig_idx]
-                         props = da.metadata.inherited_properties()
-                         sig_ann.update(self._filter_properties(props, 'analogsignal'))
-                         sig_chan_ann.update(self._filter_properties(props, 'analogsignal'))
-                         sig_idx += 1
-                '''
                 sp_idx = 0
                 ev_idx = 0
                 for mt in group.multi_tags:
@@ -251,18 +236,21 @@ def _parse_header(self):
                     if da.type != "neo.analogsignal":
                         continue
                     anasig_id = da.name.split('.')[-2]
+                    # skip already annotated signals
                     if anasig_id in annotated_anasigs:
                         continue
                     annotated_anasigs.append(anasig_id)
 
-                    array_anno_props = []
-                    for prop in da.metadata.props:
-                        if prop.type == 'ARRAYANNOTATION':
-                            array_anno_props.append(prop)
-
-                    props_dict = self._filter_properties(array_anno_props,
-                                                         "analogsignal")
+                    # collect annotation properties
+                    props = [p for p in da.metadata.props
+                             if p.type != 'ARRAYANNOTATION']
+                    props_dict = self._filter_properties(props, "analogsignal")
+                    sig_ann[stream_id].update(props_dict)
 
+                    # collect array annotation properties
+                    props = [p for p in da.metadata.props
+                             if p.type == 'ARRAYANNOTATION']
+                    props_dict = self._filter_properties(props, "analogsignal")
                     sig_ann[stream_id]['__array_annotations__'].update(
                         props_dict)
 

neo/test/iotest/test_nixio_fr.py

@@ -106,8 +106,9 @@ def test_annotations(self):
             annotations = {'something': 'hello hello000'}
             seg = Segment(**annotations)
             an =AnalogSignal([[1, 2, 3], [4, 5, 6]], units='V',
-                                        sampling_rate=1*pq.Hz)
-            an.annotations['ansigrandom'] = 'hello chars'
+                             sampling_rate=1*pq.Hz)
+            an.annotate(ansigrandom='hello chars')
+            an.array_annotate(custom_id=[1, 2, 3])
             sp = SpikeTrain([3, 4, 5]* s, t_stop=10.0)
             sp.annotations['railway'] = 'hello train'
             ev = Event(np.arange(0, 30, 10)*pq.Hz,
@@ -123,14 +124,16 @@ def test_annotations(self):
             bl.segments.append(seg)
             io.write_block(bl)
             io.close()
+
         with NixIOfr(filename=self.testfilename) as frio:
             frbl = frio.read_block()
             assert 'my_custom_annotation' in frbl.annotations
             assert 'something' in frbl.segments[0].annotations
-            # assert 'ansigrandom' in frbl.segments[0].analogsignals[0].annotations
+            assert 'ansigrandom' in frbl.segments[0].analogsignals[0].annotations
             assert 'railway' in frbl.segments[0].spiketrains[0].annotations
             assert 'venue' in frbl.segments[0].events[0].annotations
             assert 'evven' in frbl.segments[0].events[1].annotations
+            assert 'custom_id' in frbl.segments[0].analogsignals[0].array_annotations
         os.remove(self.testfilename)