summaryrefslogtreecommitdiffstats
path: root/src/Python/ccpi
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2019-04-10 22:39:11 +0100
committerDaniil Kazantsev <dkazanc@hotmail.com>2019-04-10 22:39:11 +0100
commit2d436f37be6029d57d7f876d4c7c378ee712a11e (patch)
tree6bec355d839c5a1598af877e91c250a25ca83196 /src/Python/ccpi
parentd6ee5585e696f855d1c687d34efa04328729e94c (diff)
downloadregularization-2d436f37be6029d57d7f876d4c7c378ee712a11e.tar.gz
regularization-2d436f37be6029d57d7f876d4c7c378ee712a11e.tar.bz2
regularization-2d436f37be6029d57d7f876d4c7c378ee712a11e.tar.xz
regularization-2d436f37be6029d57d7f876d4c7c378ee712a11e.zip
progress with bresenham
Diffstat (limited to 'src/Python/ccpi')
-rw-r--r--src/Python/ccpi/filters/regularisers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Python/ccpi/filters/regularisers.py b/src/Python/ccpi/filters/regularisers.py
index 1e427bf..00afcc2 100644
--- a/src/Python/ccpi/filters/regularisers.py
+++ b/src/Python/ccpi/filters/regularisers.py
@@ -127,10 +127,11 @@ def NDF(inputData, regularisation_parameter, edge_parameter, iterations,
raise ValueError ('GPU is not available')
raise ValueError('Unknown device {0}. Expecting gpu or cpu'\
.format(device))
-def NDF_MASK(inputData, diffuswindow, regularisation_parameter, edge_parameter, iterations,
+def NDF_MASK(inputData, maskdata, diffuswindow, regularisation_parameter, edge_parameter, iterations,
time_marching_parameter, penalty_type, tolerance_param, device='cpu'):
if device == 'cpu':
return NDF_MASK_CPU(inputData,
+ maskdata,
diffuswindow,
regularisation_parameter,
edge_parameter,
@@ -140,6 +141,7 @@ def NDF_MASK(inputData, diffuswindow, regularisation_parameter, edge_parameter,
tolerance_param)
elif device == 'gpu' and gpu_enabled:
return NDF_MASK_CPU(inputData,
+ maskdata,
diffuswindow,
regularisation_parameter,
edge_parameter,