Support empty array annotations

Author: Kleinjohann

neo/io/nixio.py

@@ -854,7 +854,7 @@ def _write_analogsignal(self, anasig, nixblock, nixgroup):
         if anasig.array_annotations:
             for k, v in anasig.array_annotations.items():
                 p = self._write_property(metadata, k, v)
-                p.definition = ARRAYANNOTATION
+                p.type = ARRAYANNOTATION
 
         self._signal_map[nix_name] = nixdas
 
@@ -992,7 +992,7 @@ def _write_irregularlysampledsignal(self, irsig, nixblock, nixgroup):
         if irsig.array_annotations:
             for k, v in irsig.array_annotations.items():
                 p = self._write_property(metadata, k, v)
-                p.definition = ARRAYANNOTATION
+                p.type = ARRAYANNOTATION
 
         self._signal_map[nix_name] = nixdas
 
@@ -1047,7 +1047,7 @@ def _write_event(self, event, nixblock, nixgroup):
         if event.array_annotations:
             for k, v in event.array_annotations.items():
                 p = self._write_property(metadata, k, v)
-                p.definition = ARRAYANNOTATION
+                p.type = ARRAYANNOTATION
 
         nixgroup.multi_tags.append(nixmt)
 
@@ -1115,7 +1115,7 @@ def _write_epoch(self, epoch, nixblock, nixgroup):
         if epoch.array_annotations:
             for k, v in epoch.array_annotations.items():
                 p = self._write_property(metadata, k, v)
-                p.definition = ARRAYANNOTATION
+                p.type = ARRAYANNOTATION
 
         nixgroup.multi_tags.append(nixmt)
 
@@ -1177,7 +1177,7 @@ def _write_spiketrain(self, spiketrain, nixblock, nixgroup):
         if spiketrain.array_annotations:
             for k, v in spiketrain.array_annotations.items():
                 p = self._write_property(metadata, k, v)
-                p.definition = ARRAYANNOTATION
+                p.type = ARRAYANNOTATION
 
         if nixgroup:
             nixgroup.multi_tags.append(nixmt)
@@ -1390,7 +1390,7 @@ def _nix_attr_to_neo(nix_obj):
                 if prop.definition in (DATEANNOTATION, TIMEANNOTATION,
                                        DATETIMEANNOTATION):
                     values = dt_from_nix(values, prop.definition)
-                if prop.definition == ARRAYANNOTATION:
+                if prop.type == ARRAYANNOTATION:
                     if 'array_annotations' in neo_attrs:
                         neo_attrs['array_annotations'][prop.name] = values
                     else:

neo/test/iotest/test_nixio.py

@@ -418,7 +418,7 @@ def create_full_nix_file(cls, filename):
             asig_md.create_property(arr_ann_name,
                                     arr_ann_val.magnitude.flatten())
             asig_md.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            asig_md.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            asig_md.props[arr_ann_name].type = 'ARRAYANNOTATION'
 
             for idx in range(10):
                 da_asig = blk.create_data_array(
@@ -452,7 +452,7 @@ def create_full_nix_file(cls, filename):
             imgseq_md.create_property(arr_ann_name,
                                       arr_ann_val.magnitude.flatten())
             imgseq_md.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            imgseq_md.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            imgseq_md.props[arr_ann_name].type = 'ARRAYANNOTATION'
 
             for idx in range(10):
                 da_imgseq = blk.create_data_array(
@@ -485,7 +485,7 @@ def create_full_nix_file(cls, filename):
             isig_md.create_property(arr_ann_name,
                                     arr_ann_val.magnitude.flatten())
             isig_md.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            isig_md.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            isig_md.props[arr_ann_name].type = 'ARRAYANNOTATION'
             for idx in range(7):
                 da_isig = blk.create_data_array(
                     "{}.{}".format(isig_name, idx),
@@ -527,7 +527,7 @@ def create_full_nix_file(cls, filename):
             mtag_st_md.create_property(arr_ann_name,
                                        arr_ann_val.magnitude.flatten())
             mtag_st_md.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            mtag_st_md.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            mtag_st_md.props[arr_ann_name].type = 'ARRAYANNOTATION'
 
             waveforms = cls.rquant((10, 8, 5), 1)
             wfname = "{}.waveforms".format(mtag_st.name)
@@ -579,7 +579,7 @@ def create_full_nix_file(cls, filename):
             mtag_ep.metadata.create_property(arr_ann_name,
                                              arr_ann_val.magnitude.flatten())
             mtag_ep.metadata.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            mtag_ep.metadata.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            mtag_ep.metadata.props[arr_ann_name].type = 'ARRAYANNOTATION'
 
             label_dim = mtag_ep.positions.append_set_dimension()
             label_dim.labels = cls.rsentence(5).split(" ")
@@ -612,7 +612,7 @@ def create_full_nix_file(cls, filename):
             mtag_ev.metadata.create_property(arr_ann_name,
                                              arr_ann_val.magnitude.flatten())
             mtag_ev.metadata.props[arr_ann_name].unit = str(arr_ann_val.dimensionality)
-            mtag_ev.metadata.props[arr_ann_name].definition = 'ARRAYANNOTATION'
+            mtag_ev.metadata.props[arr_ann_name].type = 'ARRAYANNOTATION'
 
             label_dim = mtag_ev.positions.append_set_dimension()
             label_dim.labels = cls.rsentence(5).split(" ")