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

Revert "Also part of Nicola's fix for twins in 6D framework"


It was an unneeded left-over from the other fix, sorry!

This reverts commit 4f390872.

Signed-off-by: default avatarNicola Vigano <nicola.vigano@esrf.fr>
parent 4f390872
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,6 @@ classdef Gt6DReconstructionAlgorithmFactory < handle ...@@ -42,7 +42,6 @@ classdef Gt6DReconstructionAlgorithmFactory < handle
volume_size = ceil(volume_size / self.volume_downscaling); volume_size = ceil(volume_size / self.volume_downscaling);
end end
num_interp = self.get_numinterp(sampler, num_interp);
algo_params = self.get_algorithm_params(sampler, num_interp); algo_params = self.get_algorithm_params(sampler, num_interp);
good_orients = algo_params.good_orients; good_orients = algo_params.good_orients;
...@@ -129,8 +128,7 @@ classdef Gt6DReconstructionAlgorithmFactory < handle ...@@ -129,8 +128,7 @@ classdef Gt6DReconstructionAlgorithmFactory < handle
for ii_g = 1:num_grains for ii_g = 1:num_grains
gr = sampler(ii_g).get_reference_grain(); gr = sampler(ii_g).get_reference_grain();
fprintf('%d) Grainid %d:\n', ii_g, gr.id) fprintf('%d) Grainid %d:\n', ii_g, gr.id)
num_interp_g = self.get_numinterp(sampler(ii_g), num_interp); algo_params(ii_g) = self.get_algorithm_params(sampler(ii_g), num_interp, blobs_to_not_shrink{ii_g}); %#ok<AGROW>
algo_params(ii_g) = self.get_algorithm_params(sampler(ii_g), num_interp_g, blobs_to_not_shrink{ii_g}); %#ok<AGROW>
fprintf('\n') fprintf('\n')
end end
...@@ -730,14 +728,6 @@ classdef Gt6DReconstructionAlgorithmFactory < handle ...@@ -730,14 +728,6 @@ classdef Gt6DReconstructionAlgorithmFactory < handle
end end
methods (Access = protected, Static) methods (Access = protected, Static)
function num_interp = get_numinterp(sampler, num_interp)
if (num_interp < 0)
num_interp = abs(num_interp) * sampler.minimum_num_interp();
elseif (~num_interp)
num_interp = sampler.suggest_num_interp();
end
end
function grains_props = get_selected_props(grains, blobs_on_det) function grains_props = get_selected_props(grains, blobs_on_det)
for ii = numel(grains):-1:1 for ii = numel(grains):-1:1
grains(ii) = gtGrainAllblobsFilterOrder(grains(ii), ... grains(ii) = gtGrainAllblobsFilterOrder(grains(ii), ...
......
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