Skip to content

Commit 1f5e5ff

Browse files
authored
Merge pull request #1791 from NeuralEnsemble/black-formatting
Black formatting
2 parents 550dc8d + 5cb8060 commit 1f5e5ff

File tree

3 files changed

+26
-29
lines changed

3 files changed

+26
-29
lines changed

neo/rawio/blackrockrawio.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
from neo.core import NeoReadWriteError
8181

8282

83-
8483
class BlackrockRawIO(BaseRawIO):
8584
"""
8685
Class for reading data in from a file set recorded by the Blackrock (Cerebus) recording system.
@@ -1205,14 +1204,14 @@ def _read_nsx_data_spec_v30_ptp(self, nsx_nb):
12051204
def _read_nev_header(self, spec, filename):
12061205
"""
12071206
Extract nev header information for any specification version.
1208-
1207+
12091208
Parameters
12101209
----------
12111210
spec : str
12121211
The specification version (e.g., "2.1", "2.2", "2.3", "3.0")
12131212
filename : str
12141213
The NEV filename to read from
1215-
1214+
12161215
Returns
12171216
-------
12181217
nev_basic_header : np.ndarray
@@ -1222,7 +1221,7 @@ def _read_nev_header(self, spec, filename):
12221221
"""
12231222
# Note: This function only uses the passed parameters, not self attributes
12241223
# This makes it easy to convert to @staticmethod later
1225-
1224+
12261225
# basic header (same for all versions)
12271226
dt0 = [
12281227
# Set to "NEURALEV"
@@ -1263,10 +1262,9 @@ def _read_nev_header(self, spec, filename):
12631262

12641263
raw_ext_header = np.memmap(filename, offset=offset_dt0, dtype=dt1, shape=shape, mode="r")
12651264

1266-
12671265
# Get extended header types for this spec
12681266
header_types = NEV_EXT_HEADER_TYPES_BY_SPEC[spec]
1269-
1267+
12701268
# Parse extended headers by packet type
12711269
# Strategy: view() entire array first, then mask for efficiency
12721270
# Since all NEV extended header packets are fixed-width (32 bytes), temporarily
@@ -1283,7 +1281,7 @@ def _read_nev_header(self, spec, filename):
12831281
def _read_nev_data(self, spec, filename):
12841282
"""
12851283
Extract nev data for any specification version.
1286-
1284+
12871285
Parameters
12881286
----------
12891287
spec : str
@@ -1333,8 +1331,8 @@ def _read_nev_data(self, spec, filename):
13331331
masks[data_type] = (min_val <= raw_data["packet_id"]) & (raw_data["packet_id"] <= max_val)
13341332
else:
13351333
# Equality check
1336-
masks[data_type] = (raw_data["packet_id"] == packet_id_spec)
1337-
1334+
masks[data_type] = raw_data["packet_id"] == packet_id_spec
1335+
13381336
types[data_type] = data_types[data_type](packet_size_bytes)
13391337

13401338
event_segment_ids = self._get_event_segment_ids(raw_data, masks, spec)
@@ -1351,14 +1349,13 @@ def _read_nev_data(self, spec, filename):
13511349

13521350
return data
13531351

1354-
13551352
def _get_reset_event_mask(self, raw_event_data, masks, spec):
13561353
"""
13571354
Extract mask for reset comment events in 2.3 .nev file
13581355
"""
13591356
if "Comments" not in masks:
13601357
return np.zeros(len(raw_event_data), dtype=bool)
1361-
1358+
13621359
restart_mask = np.logical_and(
13631360
masks["Comments"],
13641361
raw_event_data["value"] == b"\x00\x00\x00\x00\x00\x00critical load restart",
@@ -1520,8 +1517,6 @@ def _match_nsx_and_nev_segment_ids(self, nsx_nb):
15201517
if len(ev_ids):
15211518
ev_ids[:] = np.vectorize(new_nev_segment_id_mapping.__getitem__)(ev_ids)
15221519

1523-
1524-
15251520
def _nev_params(self, param_name):
15261521
"""
15271522
Returns wanted nev parameter.

neo/rawio/neuralynxrawio/neuralynxrawio.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
from neo.rawio.neuralynxrawio.nlxheader import NlxHeader
6565

6666
# Named tuple for stream identification keys
67-
StreamKey = namedtuple('StreamKey', ['sampling_rate', 'input_range', 'filter_params'])
67+
StreamKey = namedtuple("StreamKey", ["sampling_rate", "input_range", "filter_params"])
6868

6969

7070
class NeuralynxRawIO(BaseRawIO):
@@ -456,7 +456,9 @@ def _parse_header(self):
456456
# Format stream name using namedtuple fields
457457
dsp_filter_id = seen_filters[stream_key.filter_params]
458458
voltage_mv = int(stream_key.input_range / 1000) if stream_key.input_range is not None else 0
459-
stream_name = f"stream{stream_id}_{int(stream_key.sampling_rate)}Hz_{voltage_mv}mVRange_DSPFilter{dsp_filter_id}"
459+
stream_name = (
460+
f"stream{stream_id}_{int(stream_key.sampling_rate)}Hz_{voltage_mv}mVRange_DSPFilter{dsp_filter_id}"
461+
)
460462

461463
stream_names.append(stream_name)
462464
stream_ids.append(str(stream_id))

neo/rawio/neuralynxrawio/nlxheader.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -367,31 +367,31 @@ def _normalize_types(self):
367367

368368
# Convert boolean strings to actual booleans
369369
bool_keys = [
370-
'DSPLowCutFilterEnabled',
371-
'DSPHighCutFilterEnabled',
372-
'DspDelayCompensation',
370+
"DSPLowCutFilterEnabled",
371+
"DSPHighCutFilterEnabled",
372+
"DspDelayCompensation",
373373
]
374374

375375
for key in bool_keys:
376376
if key in self and isinstance(self[key], str):
377-
if self[key] in ('True', 'Enabled'):
377+
if self[key] in ("True", "Enabled"):
378378
self[key] = True
379-
elif self[key] in ('False', 'Disabled'):
379+
elif self[key] in ("False", "Disabled"):
380380
self[key] = False
381381

382382
# Convert numeric strings to numbers
383383
numeric_keys = [
384-
'DspLowCutFrequency',
385-
'DspHighCutFrequency',
386-
'DspLowCutNumTaps',
387-
'DspHighCutNumTaps',
384+
"DspLowCutFrequency",
385+
"DspHighCutFrequency",
386+
"DspLowCutNumTaps",
387+
"DspHighCutNumTaps",
388388
]
389389

390390
for key in numeric_keys:
391391
if key in self and isinstance(self[key], str):
392392
try:
393393
# Try int first
394-
if '.' not in self[key]:
394+
if "." not in self[key]:
395395
self[key] = int(self[key])
396396
else:
397397
self[key] = float(self[key])
@@ -400,7 +400,7 @@ def _normalize_types(self):
400400
pass
401401

402402
# Handle DspFilterDelay_µs (could be string or already converted)
403-
delay_key = 'DspFilterDelay_µs'
403+
delay_key = "DspFilterDelay_µs"
404404
if delay_key in self and isinstance(self[delay_key], str):
405405
try:
406406
self[delay_key] = int(self[delay_key])
@@ -410,10 +410,10 @@ def _normalize_types(self):
410410
# Extract single-channel InputRange from list
411411
# For multi-channel files, keep as list
412412
# For single-channel files, extract the single value
413-
if 'InputRange' in self and isinstance(self['InputRange'], list):
414-
if len(self['InputRange']) == 1:
413+
if "InputRange" in self and isinstance(self["InputRange"], list):
414+
if len(self["InputRange"]) == 1:
415415
# Single channel file: extract the value
416-
self['InputRange'] = self['InputRange'][0]
416+
self["InputRange"] = self["InputRange"][0]
417417
# else: multi-channel, keep as list
418418

419419
def type_of_recording(self):

0 commit comments

Comments
 (0)