Commit 8115f73f authored by Thomas Vincent's avatar Thomas Vincent

Remove image_binning from qspace conversion pipeline

parent edb5d4ac
This diff is collapsed.
......@@ -36,7 +36,6 @@ from .QSpaceConverter import QSpaceConverter
def kmap_2_qspace(xsocsH5_f,
output_f,
qspace_dims,
image_binning=(4, 4),
roi=None,
n_proc=None,
overwrite=False):
......@@ -56,10 +55,6 @@ def kmap_2_qspace(xsocsH5_f,
named 'qspace.h5'. This file will be overwritten if it already exists.
:type output_f: *optional* str
:param image_binning: size of the averaging window to use when downsampling
the images (TODO : rephrase)
:type image_binning: *optional* `array_like`
:param roi: rectangular region which will be converted to qspace.
This must be a four elements array containing x_min, x_max, y_min,
y_max.
......@@ -75,14 +70,11 @@ def kmap_2_qspace(xsocsH5_f,
"""
converter = QSpaceConverter(xsocsH5_f,
qspace_dims,
img_binning=image_binning,
output_f=output_f)
if roi is not None:
converter.roi = roi
converter.image_binning = image_binning
converter.n_proc = n_proc
converter.convert(overwrite=overwrite)
......
......@@ -77,13 +77,11 @@ class TestQSpace(ParametricTestCase):
master_f = manager.get_file('merged/test.h5')
keys = ['output_f', 'img_binning', 'medfilt_dims', 'mask']
keys = ['output_f', 'medfilt_dims', 'mask']
parameters = [
('qspace_1.h5', None, None, None),
('qspace_2.h5', [4, 4], None, None),
('qspace_3.h5', None, [3, 3], None),
('qspace_4.h5', [4, 4], [3, 3], None),
('qspace_5.h5', None, None, 'mask.npy')
('qspace_1.h5', None, None),
('qspace_3.h5', [3, 3], None),
('qspace_5.h5', None, 'mask.npy')
]
param_dicts = [dict(zip(keys, params)) for params in parameters]
......@@ -93,7 +91,6 @@ class TestQSpace(ParametricTestCase):
converter = QSpaceConverter(master_f,
qspace_dims=[28, 154, 60],
img_binning=params['img_binning'],
medfilt_dims=params['medfilt_dims'],
output_f=output_f)
self.assertEqual(converter.status, converter.READY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment