Skip to content

Commit 1357a3b

Browse files
effigieseffigies
committed
TEST: Update get_zooms tests
1 parent 6ba8b66 commit 1357a3b

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
@@ -351,49 +351,58 @@ def check_dtypes(self, expected, actual):
351351
# MGH requires the actual to be a big endian version of expected
352352
assert expected.newbyteorder('>') == actual
353353

354-
def test_norm_zooms_edge_cases(self):
354+
def test_zooms_edge_cases(self):
355355
img_klass = self.image_class
356356
aff = np.eye(4)
357357
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
358358
img = img_klass(arr, aff)
359359

360-
assert_array_almost_equal(img.header.get_zooms(),
360+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
361361
(1, 1, 1, 0))
362-
assert_array_almost_equal(img.header.get_norm_zooms(),
362+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
363363
(1, 1, 1, 0))
364364

365365
img.header.set_zooms((1, 1, 1, 2000))
366-
assert_array_almost_equal(img.header.get_zooms(),
366+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
367367
(1, 1, 1, 2000))
368-
assert_array_almost_equal(img.header.get_norm_zooms(),
368+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
369369
(1, 1, 1, 2))
370+
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1, 2))
370371

371372
img.header.set_norm_zooms((2, 2, 2, 3))
372-
assert_array_almost_equal(img.header.get_zooms(),
373+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
373374
(2, 2, 2, 3000))
374-
assert_array_almost_equal(img.header.get_norm_zooms(),
375+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
375376
(2, 2, 2, 3))
377+
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 3))
376378

377379
# It's legal to set zooms for spatial dimensions only
378380
img.header.set_norm_zooms((3, 3, 3))
379-
assert_array_almost_equal(img.header.get_zooms(),
381+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
380382
(3, 3, 3, 3000))
381-
assert_array_almost_equal(img.header.get_norm_zooms(),
383+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
382384
(3, 3, 3, 3))
385+
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3, 3))
383386

384387
arr = np.arange(24, dtype=np.int16).reshape((2, 3, 4))
385388
img = img_klass(arr, aff)
386389

387-
assert_array_almost_equal(img.header.get_zooms(), (1, 1, 1))
388-
assert_array_almost_equal(img.header.get_norm_zooms(), (1, 1, 1))
390+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
391+
(1, 1, 1))
392+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
393+
(1, 1, 1))
389394

390395
img.header.set_zooms((2, 2, 2))
391-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2))
392-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2))
396+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
397+
(2, 2, 2))
398+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
399+
(2, 2, 2))
393400

394401
img.header.set_norm_zooms((3, 3, 3))
395-
assert_array_almost_equal(img.header.get_zooms(), (3, 3, 3))
396-
assert_array_almost_equal(img.header.get_norm_zooms(), (3, 3, 3))
402+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
403+
(3, 3, 3))
404+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
405+
(3, 3, 3))
397406

398407
# Cannot set TR as zoom for 3D image
399408
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
@@ -1176,7 +1176,7 @@ def test_static_dtype_aliases(self):
11761176
img_rt = bytesio_round_trip(img)
11771177
assert img_rt.get_data_dtype() == effective_dt
11781178

1179-
def test_norm_zooms_edge_cases(self):
1179+
def test_zooms_edge_cases(self):
11801180
img_klass = self.image_class
11811181
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
11821182
aff = np.eye(4)
@@ -1186,47 +1186,53 @@ def test_norm_zooms_edge_cases(self):
11861186
# Unknown units = 2 warnings
11871187
with warnings.catch_warnings(record=True) as warns:
11881188
warnings.simplefilter('always')
1189-
assert_array_almost_equal(img.header.get_norm_zooms(),
1189+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11901190
(1, 1, 1, 1))
11911191
assert_equal(len(warns), 2)
1192-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1192+
assert_raises(ValueError, img.header.get_zooms,
1193+
units='canonical', raise_unknown=True)
11931194

11941195
img.header.set_xyzt_units(xyz='meter')
11951196
with warnings.catch_warnings(record=True) as warns:
11961197
warnings.simplefilter('always')
1197-
assert_array_almost_equal(img.header.get_norm_zooms(),
1198+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
11981199
(1000, 1000, 1000, 1))
11991200
assert_equal(len(warns), 1)
1200-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1201+
assert_raises(ValueError, img.header.get_zooms,
1202+
units='canonical', raise_unknown=True)
12011203

12021204
img.header.set_xyzt_units(xyz='mm', t='sec')
1203-
assert_array_almost_equal(img.header.get_norm_zooms(),
1205+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
12041206
(1, 1, 1, 1))
12051207
img.header.set_xyzt_units(xyz='micron', t='sec')
1206-
assert_array_almost_equal(img.header.get_norm_zooms(),
1208+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
12071209
(0.001, 0.001, 0.001, 1))
12081210

12091211
img.header.set_xyzt_units(t='sec')
12101212
with warnings.catch_warnings(record=True) as warns:
12111213
warnings.simplefilter('always')
1212-
assert_array_equal(img.header.get_norm_zooms(), (1, 1, 1, 1))
1214+
assert_array_equal(img.header.get_zooms(units='canonical'),
1215+
(1, 1, 1, 1))
12131216
assert_equal(len(warns), 1)
1214-
assert_raises(ValueError, img.header.get_norm_zooms, True)
1217+
assert_raises(ValueError, img.header.get_zooms,
1218+
units='canonical', raise_unknown=True)
12151219

12161220
img.header.set_xyzt_units(xyz='mm', t='msec')
1217-
assert_array_almost_equal(img.header.get_norm_zooms(),
1221+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
12181222
(1, 1, 1, 0.001))
12191223

12201224
img.header.set_xyzt_units(xyz='mm', t='usec')
1221-
assert_array_almost_equal(img.header.get_norm_zooms(),
1225+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
12221226
(1, 1, 1, 0.000001))
12231227

12241228
# Verify `set_norm_zooms` resets units
12251229
img.header.set_xyzt_units(xyz='meter', t='usec')
12261230
assert_equal(img.header.get_xyzt_units(), ('meter', 'usec'))
12271231
img.header.set_norm_zooms((2, 2, 2, 2.5))
1228-
assert_array_almost_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
1229-
assert_array_almost_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
1232+
assert_array_almost_equal(img.header.get_zooms(units='canonical'),
1233+
(2, 2, 2, 2.5))
1234+
assert_array_almost_equal(img.header.get_zooms(units='raw'),
1235+
(2, 2, 2, 2.5))
12301236
assert_equal(img.header.get_xyzt_units(), ('mm', 'sec'))
12311237

12321238

‎nibabel/tests/test_spatialimages.py‎

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

531-
def test_norm_zooms(self):
531+
def test_zooms(self):
532532
''' Should be true for all images '''
533533
img_klass = self.image_class
534534
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
535535
aff = np.eye(4)
536536
img = img_klass(arr, aff)
537537
img.header.set_norm_zooms((2, 2, 2, 2.5))
538-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
538+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
539539

540-
def test_norm_zooms_edge_cases(self):
540+
def test_zooms_edge_cases(self):
541541
''' Override for classes where *_norm_zooms != *_zooms '''
542542
img_klass = self.image_class
543543
arr = np.arange(120, dtype=np.int16).reshape((2, 3, 4, 5))
544544
aff = np.eye(4)
545545
img = img_klass(arr, aff)
546546
img.header.set_zooms((2, 2, 2, 2.5))
547-
assert_array_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
548-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
547+
assert_array_equal(img.header.get_zooms(units='raw'), (2, 2, 2, 2.5))
548+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
549549
img.header.set_norm_zooms((2, 2, 2, 2.5))
550-
assert_array_equal(img.header.get_zooms(), (2, 2, 2, 2.5))
551-
assert_array_equal(img.header.get_norm_zooms(), (2, 2, 2, 2.5))
550+
assert_array_equal(img.header.get_zooms(units='raw'), (2, 2, 2, 2.5))
551+
assert_array_equal(img.header.get_zooms(units='canonical'), (2, 2, 2, 2.5))
552552

553553

554554
class MmapImageMixin:

0 commit comments

Comments
 (0)