summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-10-16 23:15:46 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-10-16 23:15:46 +0200
commitcce8c565f2f56c575870ef922b6d28b5f99ca8c8 (patch)
treea5d1bfcaacd3f6f317be50454a90b3a632b8eb53
parentc0cfd8f5d9a8f53246fc4120345687b32e4a23cf (diff)
downloadastra-cce8c565f2f56c575870ef922b6d28b5f99ca8c8.tar.gz
astra-cce8c565f2f56c575870ef922b6d28b5f99ca8c8.tar.bz2
astra-cce8c565f2f56c575870ef922b6d28b5f99ca8c8.tar.xz
astra-cce8c565f2f56c575870ef922b6d28b5f99ca8c8.zip
Fix outdated function call in matlab DART algorithm. (Thanks @NathanaelSix)
-rw-r--r--matlab/algorithms/DART/StatisticsDefault.m2
-rw-r--r--matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m2
-rw-r--r--matlab/algorithms/DART/tools/ProjDiffOptimFunc.m2
3 files changed, 3 insertions, 3 deletions
diff --git a/matlab/algorithms/DART/StatisticsDefault.m b/matlab/algorithms/DART/StatisticsDefault.m
index 02e877b..84275d9 100644
--- a/matlab/algorithms/DART/StatisticsDefault.m
+++ b/matlab/algorithms/DART/StatisticsDefault.m
@@ -42,7 +42,7 @@ classdef StatisticsDefault < matlab.mixin.Copyable
% projection difference
if strcmp(this.proj_diff, 'yes')
- new_sino = DART.tomography.createForwardProjection(DART, DART.S);
+ new_sino = DART.tomography.project(DART.S);
stats.proj_diff = sum((new_sino(:) - DART.base.sinogram(:)) .^2 ) ./ (sum(DART.base.sinogram(:)) );
stats.proj_diff_hist(DART.iterationcount) = stats.proj_diff;
end
diff --git a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
index c641f87..f488cd6 100644
--- a/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
+++ b/matlab/algorithms/DART/tools/DARToptimizerBoneStudy.m
@@ -97,7 +97,7 @@ function rmse = optim_func(values, D_base, params, Optim)
% compute rmse
ROI = load('roi.mat');
[rmse, f_250, f_100, w_250, w_125] = compute_rmse(D.S, ROI);
- %projection = D.tomography.createForwardProjection(D, D.S);
+ %projection = D.tomography.project(D.S);
%proj_diff = sum((projection(:) - D.base.sinogram(:)).^2);
% save
diff --git a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
index 72b328f..64d71fd 100644
--- a/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
+++ b/matlab/algorithms/DART/tools/ProjDiffOptimFunc.m
@@ -19,7 +19,7 @@ classdef ProjDiffOptimFunc < handle
methods (Access=public)
function proj_diff = calculate(~, D, ~)
- projection = D.tomography.createForwardProjection(D, D.S);
+ projection = D.tomography.project(D.S);
proj_diff = sum((projection(:) - D.base.sinogram(:)).^2);
end