Skip to content

Commit 48f94bf

Browse files
committed
wip
1 parent 154d332 commit 48f94bf

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

neo/rawio/spikegadgetsrawio.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ def _parse_header(self):
4646

4747
f.seek(0)
4848
header_txt = f.read(header_size).decode('utf8')
49+
print(header_txt[-10:])
50+
f.seek(header_size)
51+
print(f.read(10))
4952

53+
#~ exit()
5054
# explore xml header
5155
root = ElementTree.fromstring(header_txt)
5256

@@ -64,9 +68,11 @@ def _parse_header(self):
6468
sub_dtype = (name, 'u1', (bytes, ))
6569
main_dtype.append(sub_dtype)
6670
self._main_dtype = np.dtype(main_dtype)
71+
#~ print(self._main_dtype)
72+
73+
#~ print(self._main_dtype.itemsize)
6774

6875
self._raw_memmap = np.memmap(self.filename, mode='r', offset=header_size, dtype=self._main_dtype)
69-
#~ print(self._raw_memmap[:3])
7076

7177
# wlak channels and keep only "analog" one
7278
stream_ids = []
@@ -122,6 +128,11 @@ def _parse_header(self):
122128
self.header['event_channels'] = event_channels
123129

124130
self._generate_minimal_annotations()
131+
# info from GlobalConfiguration in xml are copied to block and seg annotations
132+
bl_ann = self.raw_annotations['blocks'][0]
133+
seg_ann = self.raw_annotations['blocks'][0]['segments'][0]
134+
for ann in (bl_ann, seg_ann):
135+
ann.update(gconf.attrib)
125136

126137
def _segment_t_start(self, block_index, seg_index):
127138
return 0.
@@ -162,11 +173,12 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop, strea
162173
print(byte_mask)
163174

164175
raw_unit8_mask = raw_unit8[:, byte_mask]
165-
print('raw_unit8_mask', raw_unit8_mask.shape)
176+
print('raw_unit8_mask', raw_unit8_mask.shape, raw_unit8_mask.strides)
177+
166178
shape = raw_unit8_mask.shape
167179
shape = (shape[0], shape[1] // 2)
168-
raw_unit16 = raw_unit8_mask.flatten().view('int16').reshape(shape)
169-
print(raw_unit16.shape)
180+
raw_unit16 = raw_unit8_mask.flatten().view('uint16').reshape(shape)
181+
print(raw_unit16.shape,raw_unit16.strides)
170182

171183
return raw_unit16
172184

0 commit comments

Comments
 (0)