Merge pull request #1269 from JuliaSprenger/fix/tdt_streams

[Tdt] Fix event stream identification

Author: apdavison

neo/rawio/tdtrawio.py

@@ -21,6 +21,8 @@
 
 Author: Samuel Garcia, SummitKwan, Chadwick Boulay
 
+Alternative package for loading the tdt format:
+https://pypi.org/project/tdt
 """
 from .baserawio import (BaseRawIO, _signal_channel_dtype, _signal_stream_dtype,
                 _spike_channel_dtype, _event_channel_dtype)
@@ -179,7 +181,7 @@ def _parse_header(self):
         self._sigs_t_start = {seg_index: {}
                               for seg_index in range(nb_segment)}  # key = seg_index then group_id
 
-        keep = info_channel_groups['TankEvType'] == EVTYPE_STREAM
+        keep = info_channel_groups['TankEvType'] & EVTYPE_MASK == EVTYPE_STREAM
         missing_sev_channels = []
         for stream_index, info in enumerate(info_channel_groups[keep]):
             self._sig_sample_per_chunk[stream_index] = info['NumPoints']
@@ -198,8 +200,7 @@ def _parse_header(self):
                 for seg_index, segment_name in enumerate(segment_names):
                     # get data index
                     tsq = self._tsq[seg_index]
-                    mask = ((tsq['evtype'] == EVTYPE_STREAM) | \
-                           (tsq['evtype'] == EVTYPE_STREAM_VARIANT)) & \
+                    mask = (tsq['evtype'] & EVTYPE_MASK == EVTYPE_STREAM) & \
                            (tsq['evname'] == info['StoreName']) & \
                            (tsq['channel'] == chan_id)
                     data_index = tsq[mask].copy()
@@ -570,7 +571,6 @@ def read_tbk(tbk_filename):
 EVTYPE_STROFF = int('00000102', 16)  # 258
 EVTYPE_SCALAR = int('00000201', 16)  # 513
 EVTYPE_STREAM = int('00008101', 16)  # 33025
-EVTYPE_STREAM_VARIANT = int('00008111', 16)  # 33041
 EVTYPE_SNIP = int('00008201', 16)  # 33281
 EVTYPE_MARK = int('00008801', 16)  # 34817
 EVTYPE_HASDATA = int('00008000', 16)  # 32768