Skip to content

Commit cc532e3

Browse files
effigieseffigies
committed
TEST: Update get_zooms tests
1 parent c604a16 commit cc532e3

File tree

3 files changed

+50
-35
lines changed

3 files changed

+50
-35
lines changed

‎nibabel/freesurfer/tests/test_mghformat.py

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -389,49 +389,58 @@ def check_dtypes(self, expected, actual):
389389
# MGH requires the actual to be a big endian version of expected
390390
assert expected.newbyteorder('>') == actual
391391

392-
def test_norm_zooms_edge_cases(self):
392+
def test_zooms_edge_cases(self):
393393
img_klass = self.image_class
394394
aff = np.eye(4)
395395
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
396396
img = img_klass(arr, aff)
397397

398-
assert_array_almost_equal(img.header.get_zooms(),
398+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
399399
(1, 1, 1, 0))
400-
assert_array_almost_equal(img.header.get_norm_zooms(),
400+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
401401
(1, 1, 1, 0))
402402

403403
img.header.set_zooms((1, 1, 1, 2000))
404-
assert_array_almost_equal(img.header.get_zooms(),
404+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
405405
(1, 1, 1, 2000))
406-
assert_array_almost_equal(img.header.get_norm_zooms(),
406+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
407407
(1, 1, 1, 2))
408+
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1, 2))
408409

409410
img.header.set_norm_zooms((2, 2, 2, 3))
410-
assert_array_almost_equal(img.header.get_zooms(),
411+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
411412
(2, 2, 2, 3000))
412-
assert_array_almost_equal(img.header.get_norm_zooms(),
413+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
413414
(2, 2, 2, 3))
415+
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 3))
414416

415417
# It's legal to set zooms for spatial dimensions only
416418
img.header.set_norm_zooms((3, 3, 3))
417-
assert_array_almost_equal(img.header.get_zooms(),
419+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
418420
(3, 3, 3, 3000))
419-
assert_array_almost_equal(img.header.get_norm_zooms(),
421+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
420422
(3, 3, 3, 3))
423+
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3, 3))
421424

422425
arr = np.arange(24, dtype=np.int16).reshape((2, 3, 4))
423426
img = img_klass(arr, aff)
424427

425-
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1))
426-
assert_array_almost_equal(img.header.get_norm_zooms(), (1, 1, 1))
428+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
429+
(1, 1, 1))
430+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
431+
(1, 1, 1))
427432

428433
img.header.set_zooms((2, 2, 2))
429-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2))
430-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2))
434+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
435+
(2, 2, 2))
436+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
437+
(2, 2, 2))
431438

432439
img.header.set_norm_zooms((3, 3, 3))
433-
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3))
434-
assert_array_almost_equal(img.header.get_norm_zooms(), (3, 3, 3))
440+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
441+
(3, 3, 3))
442+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
443+
(3, 3, 3))
435444

436445
# Cannot set TR as zoom for 3D image
437446
assert_raises(HeaderDataError, img.header.set_zooms, (4, 4, 4, 5))

‎nibabel/tests/test_nifti1.py

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ def test_write_scaling(self):
10991099
with np.errstate(invalid='ignore'):
11001100
self._check_write_scaling(slope, inter, e_slope, e_inter)
11011101

1102-
def test_norm_zooms_edge_cases(self):
1102+
def test_zooms_edge_cases(self):
11031103
img_klass = self.image_class
11041104
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
11051105
aff = np.eye(4)
@@ -1109,47 +1109,53 @@ def test_norm_zooms_edge_cases(self):
11091109
# Unknown units = 2 warnings
11101110
with warnings.catch_warnings(record=True) as warns:
11111111
warnings.simplefilter('always')
1112-
assert_array_almost_equal(img.header.get_norm_zooms(),
1112+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11131113
(1, 1, 1, 1))
11141114
assert_equal(len(warns), 2)
1115-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1115+
assert_raises(ValueError, img.header.get_zooms,
1116+
units='canonical', raise_unknown=True)
11161117

11171118
img.header.set_xyzt_units(xyz='meter')
11181119
with warnings.catch_warnings(record=True) as warns:
11191120
warnings.simplefilter('always')
1120-
assert_array_almost_equal(img.header.get_norm_zooms(),
1121+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11211122
(1000, 1000, 1000, 1))
11221123
assert_equal(len(warns), 1)
1123-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1124+
assert_raises(ValueError, img.header.get_zooms,
1125+
units='canonical', raise_unknown=True)
11241126

11251127
img.header.set_xyzt_units(xyz='mm', t='sec')
1126-
assert_array_almost_equal(img.header.get_norm_zooms(),
1128+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11271129
(1, 1, 1, 1))
11281130
img.header.set_xyzt_units(xyz='micron', t='sec')
1129-
assert_array_almost_equal(img.header.get_norm_zooms(),
1131+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11301132
(0.001, 0.001, 0.001, 1))
11311133

11321134
img.header.set_xyzt_units(t='sec')
11331135
with warnings.catch_warnings(record=True) as warns:
11341136
warnings.simplefilter('always')
1135-
assert_array_equal(img.header.get_norm_zooms(), (1, 1, 1, 1))
1137+
assert_array_equal(img.header.get_zooms(units='canonical'),
1138+
(1, 1, 1, 1))
11361139
assert_equal(len(warns), 1)
1137-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1140+
assert_raises(ValueError, img.header.get_zooms,
1141+
units='canonical', raise_unknown=True)
11381142

11391143
img.header.set_xyzt_units(xyz='mm', t='msec')
1140-
assert_array_almost_equal(img.header.get_norm_zooms(),
1144+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11411145
(1, 1, 1, 0.001))
11421146

11431147
img.header.set_xyzt_units(xyz='mm', t='usec')
1144-
assert_array_almost_equal(img.header.get_norm_zooms(),
1148+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11451149
(1, 1, 1, 0.000001))
11461150

11471151
# Verify `set_norm_zooms` resets units
11481152
img.header.set_xyzt_units(xyz='meter', t='usec')
11491153
assert_equal(img.header.get_xyzt_units(), ('meter', 'usec'))
11501154
img.header.set_norm_zooms((2, 2, 2, 2.5))
1151-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
1152-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
1155+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
1156+
(2, 2, 2, 2.5))
1157+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
1158+
(2, 2, 2, 2.5))
11531159
assert_equal(img.header.get_xyzt_units(), ('mm', 'sec'))
11541160

11551161

‎nibabel/tests/test_spatialimages.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -539,27 +539,27 @@ def test_slicer(self):
539539
assert (sliced_data == img.get_data()[sliceobj]).all()
540540
assert (sliced_data == img.get_fdata()[sliceobj]).all()
541541

542-
def test_norm_zooms(self):
542+
def test_zooms(self):
543543
''' Should be true for all images '''
544544
img_klass = self.image_class
545545
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
546546
aff = np.eye(4)
547547
img = img_klass(arr, aff)
548548
img.header.set_norm_zooms((2, 2, 2, 2.5))
549-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
549+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
550550

551-
def test_norm_zooms_edge_cases(self):
551+
def test_zooms_edge_cases(self):
552552
''' Override for classes where *_norm_zooms != *_zooms '''
553553
img_klass = self.image_class
554554
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
555555
aff = np.eye(4)
556556
img = img_klass(arr, aff)
557557
img.header.set_zooms((2, 2, 2, 2.5))
558-
assert_array_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
559-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
558+
assert_array_equal(img.header.get_zooms(units='raw'), (2, 2, 2, 2.5))
559+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
560560
img.header.set_norm_zooms((2, 2, 2, 2.5))
561-
assert_array_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
562-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
561+
assert_array_equal(img.header.get_zooms(units='raw'), (2, 2, 2, 2.5))
562+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
563563

564564
def test_api_deprecations(self):
565565

0 commit comments

Comments
 (0)