From 8c90a20c6f95c91b04f9a706fd5e5defeefd4644 Mon Sep 17 00:00:00 2001 From: Igor Solovey Date: Wed, 7 Nov 2018 13:54:48 -0500 Subject: [PATCH] Siemens CSA Reader: Increase maximum number of items --- nibabel/nicom/csareader.py | 2 +- .../nicom/tests/data/csa_str_1001n_items.bin | Bin 0 -> 16116 bytes nibabel/nicom/tests/data/csa_str_200n_items.bin | Bin 3300 -> 0 bytes nibabel/nicom/tests/test_csareader.py | 10 +++++----- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 nibabel/nicom/tests/data/csa_str_1001n_items.bin delete mode 100644 nibabel/nicom/tests/data/csa_str_200n_items.bin diff --git a/nibabel/nicom/csareader.py b/nibabel/nicom/csareader.py index cba9e39e34..9847b72d28 100644 --- a/nibabel/nicom/csareader.py +++ b/nibabel/nicom/csareader.py @@ -18,7 +18,7 @@ 'IS': int, # integer string } -MAX_CSA_ITEMS = 199 +MAX_CSA_ITEMS = 1000 class CSAError(Exception): diff --git a/nibabel/nicom/tests/data/csa_str_1001n_items.bin b/nibabel/nicom/tests/data/csa_str_1001n_items.bin new file mode 100644 index 0000000000000000000000000000000000000000..ce572e9d722535be6afdec5a2aed970bb8d7ffc6 GIT binary patch literal 16116 zcmeIuJqp4=5C+hVvGN9X;sHc^u}~}m3W8uCR4|Za#n^dbZ{ZqCukZ%urx?EC9Z!q- zFdt-D2w|Ukd%ne8)m{&=tDaSC!{jxZr0U1=P(I3L9b-M47G2TS>2VXAd+e^4>8k(v z<`l;e#%aIvUuHTL0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF j5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U_!Ia5s-YI8 literal 0 HcmV?d00001 diff --git a/nibabel/nicom/tests/data/csa_str_200n_items.bin b/nibabel/nicom/tests/data/csa_str_200n_items.bin deleted file mode 100644 index 780f196ffa492117bb4e49bc04e951b607eabc3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3300 zcmWFzGc;gfW@2PyU|{eCV%Ox1e4os`)PVfr%#zIfJO+hoE(IU}6E*>fMTxmi`T03| zN}k1@c{xCZ&iT0o`NgRzN_Jp1Aagu}85ksi^a-e$Kx!0>hQMeDjE2By2#kinXb6mk Sz-S1JhQMeDjD`SRLI3~&vlf8> diff --git a/nibabel/nicom/tests/test_csareader.py b/nibabel/nicom/tests/test_csareader.py index 63610a8e8f..d0ecfddc6f 100644 --- a/nibabel/nicom/tests/test_csareader.py +++ b/nibabel/nicom/tests/test_csareader.py @@ -21,7 +21,7 @@ CSA2_B1000 = open(pjoin(IO_DATA_PATH, 'csa2_b1000.bin'), 'rb').read() CSA2_0len = gzip.open(pjoin(IO_DATA_PATH, 'csa2_zero_len.bin.gz'), 'rb').read() CSA_STR_valid = open(pjoin(IO_DATA_PATH, 'csa_str_valid.bin'), 'rb').read() -CSA_STR_200n_items = open(pjoin(IO_DATA_PATH, 'csa_str_200n_items.bin'), 'rb').read() +CSA_STR_1001n_items = open(pjoin(IO_DATA_PATH, 'csa_str_1001n_items.bin'), 'rb').read() @dicom_test @@ -70,15 +70,15 @@ def test_csa_len0(): def test_csa_nitem(): # testing csa.read's ability to raise an error when n_items >= 200 - assert_raises(csa.CSAReadError, csa.read, CSA_STR_200n_items) - # OK when < 200 + assert_raises(csa.CSAReadError, csa.read, CSA_STR_1001n_items) + # OK when < 1000 csa_info = csa.read(CSA_STR_valid) assert_equal(len(csa_info['tags']), 1) # OK after changing module global n_items_thresh = csa.MAX_CSA_ITEMS try: - csa.MAX_CSA_ITEMS = 1000 - csa_info = csa.read(CSA_STR_200n_items) + csa.MAX_CSA_ITEMS = 2000 + csa_info = csa.read(CSA_STR_1001n_items) assert_equal(len(csa_info['tags']), 1) finally: csa.MAX_CSA_ITEMS = n_items_thresh