Skip to content
Snippets Groups Projects
Commit 2ce367ea authored by Nicola Vigano's avatar Nicola Vigano
Browse files

6D-Reconstruction: added l1-norm weighting for the detector distance

parent b70e8671
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector ...@@ -28,7 +28,7 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
end end
properties (Constant) properties (Constant)
possible_detector_norms = {'l2', 'kl'}; possible_detector_norms = {'l2', 'kl', 'l1'};
possible_tv_norms = {'l12', 'l1', 'ln'}; possible_tv_norms = {'l12', 'l1', 'ln'};
possible_tv_strategies = {'groups', 'volume'}; possible_tv_strategies = {'groups', 'volume'};
end end
...@@ -517,6 +517,11 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector ...@@ -517,6 +517,11 @@ classdef Gt6DBlobReconstructor < Gt6DVolumeToBlobProjector
p{n} = p{n} .* sigma_1{n}; p{n} = p{n} .* sigma_1{n};
end end
end end
case 'l1'
for n = 1:numel(p)
p{n} = p{n} + sigma{n} .* (proj_bls{n} - self.blobs{n});
p{n} = p{n} ./ max(1, abs(p{n}));
end
end end
self.statistics.add_timestamp(toc(c), 'cp_dual_update_detector', 'cp_dual_detector_prox'); self.statistics.add_timestamp(toc(c), 'cp_dual_update_detector', 'cp_dual_detector_prox');
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment