Skip to content

Commit aca9bc7

Browse files
committed
Run ruff.
1 parent d9a5f8d commit aca9bc7

3 files changed

Lines changed: 5 additions & 15 deletions

File tree

src/modelarrayio/cli/h5_to_cifti.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ def _cifti_output_ext(cifti_img):
3131
One of ``'.dscalar.nii'``, ``'.pscalar.nii'``, or ``'.pconn.nii'``.
3232
"""
3333
axes = [cifti_img.header.get_axis(i) for i in range(cifti_img.ndim)]
34-
n_parcel_axes = sum(
35-
isinstance(ax, nb.cifti2.cifti2_axes.ParcelsAxis) for ax in axes
36-
)
34+
n_parcel_axes = sum(isinstance(ax, nb.cifti2.cifti2_axes.ParcelsAxis) for ax in axes)
3735
if n_parcel_axes == 2:
3836
return '.pconn.nii'
3937
elif n_parcel_axes == 1:

src/modelarrayio/utils/cifti.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ def extract_cifti_scalar_data(cifti_file, reference_brain_names=None):
114114
)
115115
if reference_brain_names is not None:
116116
if not np.array_equal(brain_names, reference_brain_names):
117-
raise ValueError(
118-
f'Inconsistent greyordinate names in CIFTI file {cifti_file!r}.'
119-
)
117+
raise ValueError(f'Inconsistent greyordinate names in CIFTI file {cifti_file!r}.')
120118
return cifti_data, brain_names
121119

122120
elif len(scalar_axes) == 1 and len(parcel_axes) == 1:
@@ -133,9 +131,7 @@ def extract_cifti_scalar_data(cifti_file, reference_brain_names=None):
133131
)
134132
if reference_brain_names is not None:
135133
if not np.array_equal(parcel_names, reference_brain_names):
136-
raise ValueError(
137-
f'Inconsistent parcel names in CIFTI file {cifti_file!r}.'
138-
)
134+
raise ValueError(f'Inconsistent parcel names in CIFTI file {cifti_file!r}.')
139135
return cifti_data, parcel_names
140136

141137
elif len(parcel_axes) == 2:
@@ -153,9 +149,7 @@ def extract_cifti_scalar_data(cifti_file, reference_brain_names=None):
153149
cifti_data_flat = cifti_data.flatten()
154150
if reference_brain_names is not None:
155151
if not np.array_equal(element_names, reference_brain_names):
156-
raise ValueError(
157-
f'Inconsistent parcel names in CIFTI file {cifti_file!r}.'
158-
)
152+
raise ValueError(f'Inconsistent parcel names in CIFTI file {cifti_file!r}.')
159153
return cifti_data_flat, element_names
160154

161155
else:

test/test_cifti_utils.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ def _make_parcels_axis(parcel_names: list[str]) -> ParcelsAxis:
2424
nvertices = {'CIFTI_STRUCTURE_CORTEX_LEFT': n}
2525
vox_dtype = np.dtype([('ijk', '<i4', (3,))])
2626
voxels = [np.array([], dtype=vox_dtype) for _ in range(n)]
27-
vertices = [
28-
{'CIFTI_STRUCTURE_CORTEX_LEFT': np.array([i], dtype=np.int32)} for i in range(n)
29-
]
27+
vertices = [{'CIFTI_STRUCTURE_CORTEX_LEFT': np.array([i], dtype=np.int32)} for i in range(n)]
3028
affine = np.eye(4)
3129
volume_shape = (10, 10, 10)
3230
return ParcelsAxis(parcel_names, voxels, vertices, affine, volume_shape, nvertices)

0 commit comments

Comments
 (0)