From c89b3e4ccbb23cd0fabbf7f635cdb10e67362dae Mon Sep 17 00:00:00 2001
From: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>
Date: Thu, 6 Oct 2016 08:55:55 +0200
Subject: [PATCH] small fix in initialization of zero-array (does not accept
logicals) add possibility to look for SEG, ODF6D, VOL#D fields in
gtFindFailedGrains Signed-off-by: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>
---
4_grains/GtThreshold.m | 4 ++--
5_reconstruction/gtFindFailedGrains.m | 14 +++++++++++++-
.../gt6DCreateProjDataFromExtendedGrain.m | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/4_grains/GtThreshold.m b/4_grains/GtThreshold.m
index eff7f574..c8a78179 100644
--- a/4_grains/GtThreshold.m
+++ b/4_grains/GtThreshold.m
@@ -217,13 +217,13 @@ classdef GtThreshold < handle
case 0
cl_seg = obj.thresholdAutoSingleGrain(cl_rec);
case 1
- cl_seg = obj.thresholdAutoSingleGrainSimpleSearch(cl_rec, 0.04);
+ cl_seg = obj.thresholdAutoSingleGrainSimpleSearch(cl_rec, 0.1); %0.04
for ii_g = 2:numel(cl_sub_recs)
tmp_seg = obj.thresholdAutoSingleGrainSimpleSearch(cl_sub_recs(ii_g), 0.02);
tmp_seg.seg = gtPlaceSubVolume( ...
- zeros(cl_seg(1).segbb(4:6), 'like', cl_seg(1).seg), ...
+ zeros(cl_seg(1).segbb(4:6), 'like', uint8(cl_seg(1).seg)), ...
tmp_seg.seg, ...
tmp_seg.segbb(1:3) - cl_seg(1).segbb(1:3) );
tmp_seg.segbb = cl_seg(1).segbb;
diff --git a/5_reconstruction/gtFindFailedGrains.m b/5_reconstruction/gtFindFailedGrains.m
index 379c2d5d..74489c20 100644
--- a/5_reconstruction/gtFindFailedGrains.m
+++ b/5_reconstruction/gtFindFailedGrains.m
@@ -1,9 +1,21 @@
-function list = gtFindFailedGrains(phase_ID)
+function list = gtFindFailedGrains(phase_ID, varargin)
+% function list = gtFindFailedGrains(phase_ID, fieldname)
+% INPUTS: phaseid <int>
+% varargin {'ODF6D'} / 'VOL3D' / 'SEG'
+if (~isempty(varargin))
+ fieldname = varargin{1};
+else
+ fieldname = 'ODF6D';
+end
load(sprintf('4_grains/phase_%02d/index.mat', phase_ID));
grain_file_name = sprintf('4_grains/phase_%02d/grain_details_', phase_ID);
+if ~exist(fieldname, 'var')
+ fieldname = 'ODF6D'
+end
+
num_grains = numel(grain);
list = [];
diff --git a/zUtil_Deformation/gt6DCreateProjDataFromExtendedGrain.m b/zUtil_Deformation/gt6DCreateProjDataFromExtendedGrain.m
index 4fa856f4..6eb4bdd2 100644
--- a/zUtil_Deformation/gt6DCreateProjDataFromExtendedGrain.m
+++ b/zUtil_Deformation/gt6DCreateProjDataFromExtendedGrain.m
@@ -279,6 +279,7 @@ function [refor, estim_space_bbox_pix, estim_orient_bbox] = gt6DCreateProjDataFr
blobs(ii_b).bbuim = zeros(1, 2);
blobs(ii_b).bbvim = zeros(1, 2);
blobs(ii_b).bbwim = zeros(1, 2);
+ blobs(ii_b).intm = zeros(stackUSize, stackVSize);
end
end
--
GitLab