Fix segment_index order.

Author: samuelgarcia

neo/rawio/spikeglxrawio.py

@@ -258,29 +258,19 @@ def scan_files(dirname):
 
     # the segment index will depend on both 'gate_num' and 'trigger_num'
     # so we order by 'gate_num' then 'trigger_num'
-    order_key = list({(info['gate_num'], info['trigger_num']) for info in info_list})
+    # None is before any int
+    def make_key(info):
+        k0 = info['gate_num']
+        if k0 is None:
+            k0 = -1
+        k1 = info['trigger_num']
+        if k1 is None:
+            k1 = -1
+        return (k0, k1)
+    order_key = list({make_key(info) for info in info_list})
     order_key = sorted(order_key)
-    
-    print(order_key)
-    exit()
-    
-    total_gate = max([info['gate_num'] for info in info_list if info['gate_num'] is not None]) + 1
-    total_trigger_per_gate = []
-    for gate_num in range(total_gate):
-        max_trigger = 0
-        for info in info_list:
-            if info['gate_num'] != gate_num:
-                continue
-            max_trigger = max(max_trigger, info['trigger_num'])
-        total_trigger_per_gate.append(max_trigger + 1)
-
     for info in info_list:
-        g, t = info['gate_num'], info['trigger_num']
-        if g == 0:
-            seg_index = t
-        else:
-            seg_index = sum(total_trigger_per_gate[:g]) + t
-        info['seg_index'] = seg_index
+        info['seg_index'] = order_key.index(make_key(info))
 
     return info_list
 

neo/test/rawiotest/test_spikeglxrawio.py

@@ -16,12 +16,20 @@ class TestSpikeGLXRawIO(BaseTestRawIO, unittest.TestCase):
     entities_to_test = [
         'spikeglx/Noise4Sam_g0',
         'spikeglx/TEST_20210920_0_g0',
+
+        # this is only g0 multi index
+        'spikeglx/multi_trigger_multi_gate/SpikeGLX/5-19-2022-CI0/5-19-2022-CI0_g0'
+        # this is only g1 multi index
+        'spikeglx/multi_trigger_multi_gate/SpikeGLX/5-19-2022-CI0/5-19-2022-CI0_g1'
+        # this mix both multi gate and multi trigger (and also multi probe)
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI0',
+        
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI1',
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI2',
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI3',
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI4',
         'spikeglx/sample_data_v2/SpikeGLX/5-19-2022-CI5',
+        
     ]
 
     def test_with_location(self):