Merge pull request #790 from SimonDanner/master

Fix reading RealWave Spike2 channels and channels with unrecognized quantities

Author: samuelgarcia

neo/io/proxyobjects.py

@@ -20,6 +20,7 @@
                       Epoch, Event, SpikeTrain)
 from neo.core.dataobject import ArrayDict
 
+import logging
 
 class BaseProxy(BaseNeo):
     def __init__(self, array_annotations=None, **annotations):
@@ -522,6 +523,7 @@ def ensure_signal_units(units):
         logging.warning('Units "{}" can not be converted to a quantity. Using dimensionless '
                         'instead'.format(units))
         units = ''
+        units = pq.Quantity(1, units)
     return units
 
 

neo/rawio/spike2rawio.py

@@ -215,7 +215,7 @@ def _parse_header(self):
                 elif chan_info['kind'] == 9:  # float32
                     gain = 1.
                     offset = 0.
-                    sig_dtype = 'int32'
+                    sig_dtype = 'float32'
                 group_id = 0
                 sig_channels.append((name, chan_id, sampling_rate, sig_dtype,
                                      units, gain, offset, group_id))