Skip to content

Commit cf126f3

Browse files
effigieseffigies
committed
TEST: Update get_zooms tests
1 parent 6dc64c9 commit cf126f3

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
@@ -390,49 +390,58 @@ def check_dtypes(self, expected, actual):
390390
# MGH requires the actual to be a big endian version of expected
391391
assert_equal(expected.newbyteorder('>'), actual)
392392

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

399-
assert_array_almost_equal(img.header.get_zooms(),
399+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
400400
(1, 1, 1, 0))
401-
assert_array_almost_equal(img.header.get_norm_zooms(),
401+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
402402
(1, 1, 1, 0))
403403

404404
img.header.set_zooms((1, 1, 1, 2000))
405-
assert_array_almost_equal(img.header.get_zooms(),
405+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
406406
(1, 1, 1, 2000))
407-
assert_array_almost_equal(img.header.get_norm_zooms(),
407+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
408408
(1, 1, 1, 2))
409+
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1, 2))
409410

410411
img.header.set_norm_zooms((2, 2, 2, 3))
411-
assert_array_almost_equal(img.header.get_zooms(),
412+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
412413
(2, 2, 2, 3000))
413-
assert_array_almost_equal(img.header.get_norm_zooms(),
414+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
414415
(2, 2, 2, 3))
416+
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 3))
415417

416418
# It's legal to set zooms for spatial dimensions only
417419
img.header.set_norm_zooms((3, 3, 3))
418-
assert_array_almost_equal(img.header.get_zooms(),
420+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
419421
(3, 3, 3, 3000))
420-
assert_array_almost_equal(img.header.get_norm_zooms(),
422+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
421423
(3, 3, 3, 3))
424+
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3, 3))
422425

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

426-
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1))
427-
assert_array_almost_equal(img.header.get_norm_zooms(), (1, 1, 1))
429+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
430+
(1, 1, 1))
431+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
432+
(1, 1, 1))
428433

429434
img.header.set_zooms((2, 2, 2))
430-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2))
431-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2))
435+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
436+
(2, 2, 2))
437+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
438+
(2, 2, 2))
432439

433440
img.header.set_norm_zooms((3, 3, 3))
434-
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3))
435-
assert_array_almost_equal(img.header.get_norm_zooms(), (3, 3, 3))
441+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
442+
(3, 3, 3))
443+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
444+
(3, 3, 3))
436445

437446
# Cannot set TR as zoom for 3D image
438447
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
@@ -1087,7 +1087,7 @@ def test_write_scaling(self):
10871087
with np.errstate(invalid='ignore'):
10881088
self._check_write_scaling(slope, inter, e_slope, e_inter)
10891089

1090-
def test_norm_zooms_edge_cases(self):
1090+
def test_zooms_edge_cases(self):
10911091
img_klass = self.image_class
10921092
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
10931093
aff = np.eye(4)
@@ -1097,47 +1097,53 @@ def test_norm_zooms_edge_cases(self):
10971097
# Unknown units = 2 warnings
10981098
with warnings.catch_warnings(record=True) as warns:
10991099
warnings.simplefilter('always')
1100-
assert_array_almost_equal(img.header.get_norm_zooms(),
1100+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11011101
(1, 1, 1, 1))
11021102
assert_equal(len(warns), 2)
1103-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1103+
assert_raises(ValueError, img.header.get_zooms,
1104+
units='canonical', raise_unknown=True)
11041105

11051106
img.header.set_xyzt_units(xyz='meter')
11061107
with warnings.catch_warnings(record=True) as warns:
11071108
warnings.simplefilter('always')
1108-
assert_array_almost_equal(img.header.get_norm_zooms(),
1109+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11091110
(1000, 1000, 1000, 1))
11101111
assert_equal(len(warns), 1)
1111-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1112+
assert_raises(ValueError, img.header.get_zooms,
1113+
units='canonical', raise_unknown=True)
11121114

11131115
img.header.set_xyzt_units(xyz='mm', t='sec')
1114-
assert_array_almost_equal(img.header.get_norm_zooms(),
1116+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11151117
(1, 1, 1, 1))
11161118
img.header.set_xyzt_units(xyz='micron', t='sec')
1117-
assert_array_almost_equal(img.header.get_norm_zooms(),
1119+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11181120
(0.001, 0.001, 0.001, 1))
11191121

11201122
img.header.set_xyzt_units(t='sec')
11211123
with warnings.catch_warnings(record=True) as warns:
11221124
warnings.simplefilter('always')
1123-
assert_array_equal(img.header.get_norm_zooms(), (1, 1, 1, 1))
1125+
assert_array_equal(img.header.get_zooms(units='canonical'),
1126+
(1, 1, 1, 1))
11241127
assert_equal(len(warns), 1)
1125-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1128+
assert_raises(ValueError, img.header.get_zooms,
1129+
units='canonical', raise_unknown=True)
11261130

11271131
img.header.set_xyzt_units(xyz='mm', t='msec')
1128-
assert_array_almost_equal(img.header.get_norm_zooms(),
1132+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11291133
(1, 1, 1, 0.001))
11301134

11311135
img.header.set_xyzt_units(xyz='mm', t='usec')
1132-
assert_array_almost_equal(img.header.get_norm_zooms(),
1136+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11331137
(1, 1, 1, 0.000001))
11341138

11351139
# Verify `set_norm_zooms` resets units
11361140
img.header.set_xyzt_units(xyz='meter', t='usec')
11371141
assert_equal(img.header.get_xyzt_units(), ('meter', 'usec'))
11381142
img.header.set_norm_zooms((2, 2, 2, 2.5))
1139-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
1140-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
1143+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
1144+
(2, 2, 2, 2.5))
1145+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
1146+
(2, 2, 2, 2.5))
11411147
assert_equal(img.header.get_xyzt_units(), ('mm', 'sec'))
11421148

11431149

‎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_array_equal(sliced_data, img.dataobj[sliceobj])
540540
assert_array_equal(sliced_data, img.get_data()[sliceobj])
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)