Skip to content

Commit ba81e30

Browse files
mgxdmgxd
committed
fix: use correct CIFTI intent names
1 parent 5f6b64f commit ba81e30

File tree

2 files changed

+24
-31
lines changed

2 files changed

+24
-31
lines changed

‎nibabel/cifti2/parse_cifti2.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,27 @@ def _mangle(self, value):
5252
# The codes below appear on the CIFTI-2 standard
5353
# http://www.nitrc.org/plugins/mwiki/index.php/cifti:ConnectivityMatrixFileFormats
5454
# https://www.nitrc.org/forum/attachment.php?attachid=341&group_id=454&forum_id=1955
55-
(3000, 'dense fiber/fan samples', (), 'NIFTI_INTENT_CONNECTIVITY_UNKNOWN'),
56-
(3001, 'dense connectivity', (), 'NIFTI_INTENT_CONNECTIVITY_DENSE'),
57-
(3002, 'dense data series/fiber fans', (),
55+
(3000, 'ConnUnknown', (), 'NIFTI_INTENT_CONNECTIVITY_UNKNOWN'),
56+
(3001, 'ConnDense', (), 'NIFTI_INTENT_CONNECTIVITY_DENSE'),
57+
(3002, 'ConnDenseSeries', (),
5858
'NIFTI_INTENT_CONNECTIVITY_DENSE_SERIES'),
59-
(3003, 'parcellated connectivity', (),
59+
(3003, 'ConnParcels', (),
6060
'NIFTI_INTENT_CONNECTIVITY_PARCELLATED'),
61-
(3004, 'parcellated data series', (),
61+
(3004, 'ConnParcelSries', (),
6262
"NIFTI_INTENT_CONNECTIVITY_PARCELLATED_SERIES"),
63-
(3006, 'dense scalar', (),
63+
(3006, 'ConnDenseScalar', (),
6464
'NIFTI_INTENT_CONNECTIVITY_DENSE_SCALARS'),
65-
(3007, 'dense label', (),
65+
(3007, 'ConnDenseLabel', (),
6666
'NIFTI_INTENT_CONNECTIVITY_DENSE_LABELS'),
67-
(3008, 'parcellated scalar', (),
67+
(3008, 'ConnParcelScalr', (),
6868
'NIFTI_INTENT_CONNECTIVITY_PARCELLATED_SCALAR'),
69-
(3009, 'parcellated dense connectivity', (),
69+
(3009, 'ConnParcelDense', (),
7070
'NIFTI_INTENT_CONNECTIVITY_PARCELLATED_DENSE'),
71-
(3010, 'dense parcellated connectivity', (),
71+
(3010, 'ConnDenseParcel', (),
7272
'NIFTI_INTENT_CONNECTIVITY_DENSE_PARCELLATED'),
73-
(3011, 'parcellated connectivity series', (),
73+
(3011, 'ConnPPSr', (),
7474
'NIFTI_INTENT_CONNECTIVITY_PARCELLATED_PARCELLATED_SERIES'),
75-
(3012, 'parcellated connectivity scalar', (),
75+
(3012, 'ConnPPSc', (),
7676
'NIFTI_INTENT_CONNECTIVITY_PARCELLATED_PARCELLATED_SCALAR')))
7777

7878

‎nibabel/cifti2/tests/test_new_cifti2.py

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def test_dtseries():
219219
ci.save(img, 'test.dtseries.nii')
220220
img2 = nib.load('test.dtseries.nii')
221221
assert_equal(img2.nifti_header.get_intent()[0],
222-
'dense data series/fiber fans')
222+
'ConnDenseSeries')
223223
assert_true(isinstance(img2, ci.Cifti2Image))
224224
assert_true((img2.get_data() == data).all())
225225
check_series_map(img2.header.matrix.get_index_map(0))
@@ -241,7 +241,7 @@ def test_dscalar():
241241
with InTemporaryDirectory():
242242
ci.save(img, 'test.dscalar.nii')
243243
img2 = nib.load('test.dscalar.nii')
244-
assert_equal(img2.nifti_header.get_intent()[0], 'dense scalar')
244+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnDenseScalar')
245245
assert_true(isinstance(img2, ci.Cifti2Image))
246246
assert_true((img2.get_data() == data).all())
247247
check_scalar_map(img2.header.matrix.get_index_map(0))
@@ -263,7 +263,7 @@ def test_dlabel():
263263
with InTemporaryDirectory():
264264
ci.save(img, 'test.dlabel.nii')
265265
img2 = nib.load('test.dlabel.nii')
266-
assert_equal(img2.nifti_header.get_intent()[0], 'dense label')
266+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnDenseLabel')
267267
assert_true(isinstance(img2, ci.Cifti2Image))
268268
assert_true((img2.get_data() == data).all())
269269
check_label_map(img2.header.matrix.get_index_map(0))
@@ -283,7 +283,7 @@ def test_dconn():
283283
with InTemporaryDirectory():
284284
ci.save(img, 'test.dconn.nii')
285285
img2 = nib.load('test.dconn.nii')
286-
assert_equal(img2.nifti_header.get_intent()[0], 'dense connectivity')
286+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnDense')
287287
assert_true(isinstance(img2, ci.Cifti2Image))
288288
assert_true((img2.get_data() == data).all())
289289
assert_equal(img2.header.matrix.get_index_map(0),
@@ -306,8 +306,7 @@ def test_ptseries():
306306
with InTemporaryDirectory():
307307
ci.save(img, 'test.ptseries.nii')
308308
img2 = nib.load('test.ptseries.nii')
309-
assert_equal(img2.nifti_header.get_intent()[0],
310-
'parcellated data series')
309+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnParcelSries')
311310
assert_true(isinstance(img2, ci.Cifti2Image))
312311
assert_true((img2.get_data() == data).all())
313312
check_series_map(img2.header.matrix.get_index_map(0))
@@ -329,7 +328,7 @@ def test_pscalar():
329328
with InTemporaryDirectory():
330329
ci.save(img, 'test.pscalar.nii')
331330
img2 = nib.load('test.pscalar.nii')
332-
assert_equal(img2.nifti_header.get_intent()[0], 'parcellated scalar')
331+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnParcelScalr')
333332
assert_true(isinstance(img2, ci.Cifti2Image))
334333
assert_true((img2.get_data() == data).all())
335334
check_scalar_map(img2.header.matrix.get_index_map(0))
@@ -351,8 +350,7 @@ def test_pdconn():
351350
with InTemporaryDirectory():
352351
ci.save(img, 'test.pdconn.nii')
353352
img2 = ci.load('test.pdconn.nii')
354-
assert_equal(img2.nifti_header.get_intent()[0],
355-
'parcellated dense connectivity')
353+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnParcelDense')
356354
assert_true(isinstance(img2, ci.Cifti2Image))
357355
assert_true((img2.get_data() == data).all())
358356
check_geometry_map(img2.header.matrix.get_index_map(0))
@@ -374,8 +372,7 @@ def test_dpconn():
374372
with InTemporaryDirectory():
375373
ci.save(img, 'test.dpconn.nii')
376374
img2 = ci.load('test.dpconn.nii')
377-
assert_equal(img2.nifti_header.get_intent()[0],
378-
'dense parcellated connectivity')
375+
assert_equal(img2.nifti_header.get_intent()[0], 'ConnDenseParcel')
379376
assert_true(isinstance(img2, ci.Cifti2Image))
380377
assert_true((img2.get_data() == data).all())
381378
check_parcel_map(img2.header.matrix.get_index_map(0))
@@ -396,8 +393,7 @@ def test_plabel():
396393
with InTemporaryDirectory():
397394
ci.save(img, 'test.plabel.nii')
398395
img2 = ci.load('test.plabel.nii')
399-
assert_equal(img.nifti_header.get_intent()[0],
400-
'dense fiber/fan samples')
396+
assert_equal(img.nifti_header.get_intent()[0], 'ConnUnknown')
401397
assert_true(isinstance(img2, ci.Cifti2Image))
402398
assert_true((img2.get_data() == data).all())
403399
check_label_map(img2.header.matrix.get_index_map(0))
@@ -417,8 +413,7 @@ def test_pconn():
417413
with InTemporaryDirectory():
418414
ci.save(img, 'test.pconn.nii')
419415
img2 = ci.load('test.pconn.nii')
420-
assert_equal(img.nifti_header.get_intent()[0],
421-
'parcellated connectivity')
416+
assert_equal(img.nifti_header.get_intent()[0], 'ConnParcels')
422417
assert_true(isinstance(img2, ci.Cifti2Image))
423418
assert_true((img2.get_data() == data).all())
424419
assert_equal(img2.header.matrix.get_index_map(0),
@@ -443,8 +438,7 @@ def test_pconnseries():
443438
with InTemporaryDirectory():
444439
ci.save(img, 'test.pconnseries.nii')
445440
img2 = ci.load('test.pconnseries.nii')
446-
assert_equal(img.nifti_header.get_intent()[0],
447-
'parcellated connectivity series')
441+
assert_equal(img.nifti_header.get_intent()[0], 'ConnPPSr')
448442
assert_true(isinstance(img2, ci.Cifti2Image))
449443
assert_true((img2.get_data() == data).all())
450444
assert_equal(img2.header.matrix.get_index_map(0),
@@ -470,8 +464,7 @@ def test_pconnscalar():
470464
with InTemporaryDirectory():
471465
ci.save(img, 'test.pconnscalar.nii')
472466
img2 = ci.load('test.pconnscalar.nii')
473-
assert_equal(img.nifti_header.get_intent()[0],
474-
'parcellated connectivity scalar')
467+
assert_equal(img.nifti_header.get_intent()[0], 'ConnPPSc')
475468
assert_true(isinstance(img2, ci.Cifti2Image))
476469
assert_true((img2.get_data() == data).all())
477470
assert_equal(img2.header.matrix.get_index_map(0),

0 commit comments

Comments
 (0)