Skip to content

Commit 631f9ac

Browse files
author
CindeeM
committed
added test for poorly formed mlist order
1 parent 0d94d88 commit 631f9ac

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

nibabel/tests/test_ecat.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,25 @@ def test_mlist(self):
100100
dt = dt.newbyteorder('>')
101101
mats = np.recarray(shape=(32,4), dtype=dt, buf=dat)
102102
fid.close()
103-
badordermlist = mlist
104-
badordermlist._mlist = np.array([[ 1.68427540e+07, 3.00000000e+00, 1.20350000e+04, 1.00000000e+00],
105-
[ 1.68427530e+07, 1.20360000e+04, 2.40680000e+04, 1.00000000e+00],
106-
[ 1.68427550e+07, 2.40690000e+04, 3.61010000e+04, 1.00000000e+00],
107-
[ 1.68427560e+07, 3.61020000e+04, 4.81340000e+04, 1.00000000e+00],
108-
[ 1.68427570e+07, 4.81350000e+04, 6.01670000e+04, 1.00000000e+00],
109-
[ 1.68427580e+07, 6.01680000e+04, 7.22000000e+04,1.00000000e+00]])
110-
111-
assert_true(badordermlist.get_frame_order()[0][0] == 1)
103+
#tests
112104
assert_true(mats['matlist'][0,0] + mats['matlist'][0,3] == 31)
113105
assert_true(mlist.get_frame_order()[0][0] == 0)
114106
assert_true(mlist.get_frame_order()[0][1] == 16842758.0)
115-
107+
# test badly ordered mlist
108+
badordermlist = mlist
109+
badordermlist._mlist = np.array([[ 1.68427540e+07, 3.00000000e+00,
110+
1.20350000e+04, 1.00000000e+00],
111+
[ 1.68427530e+07, 1.20360000e+04,
112+
2.40680000e+04, 1.00000000e+00],
113+
[ 1.68427550e+07, 2.40690000e+04,
114+
3.61010000e+04, 1.00000000e+00],
115+
[ 1.68427560e+07, 3.61020000e+04,
116+
4.81340000e+04, 1.00000000e+00],
117+
[ 1.68427570e+07, 4.81350000e+04,
118+
6.01670000e+04, 1.00000000e+00],
119+
[ 1.68427580e+07, 6.01680000e+04,
120+
7.22000000e+04, 1.00000000e+00]])
121+
assert_true(badordermlist.get_frame_order()[0][0] == 1)
116122

117123
class TestEcatSubHeader(TestCase):
118124
header_class = EcatHeader

0 commit comments

Comments
 (0)