Skip to content

Dprice80 empty mask patch #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiborauer merged 5 commits into from
Sep 12, 2017
Merged

Dprice80 empty mask patch #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a140a1
Throw error if mask contains 0 voxels
dprice80 Sep 4, 2017
ea19c7b
Add max value to error message
dprice80 Sep 4, 2017
4bb77ca
Use numel instead of find (more readable)
dprice80 Sep 4, 2017
ede1a23
Correct wording
dprice80 Sep 4, 2017
8146047
Check for empty mask after thresholding
dprice80 Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion aa_modules/aamod_mask_fromsegment.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,13 @@
thr = aas_getsetting(aap,'threshold');
if numel(thr) == 1, thr(1:3) = thr; end
for a = 1:size(segimg,1)
maxY = max(Y{a}(:));
Y{a} = Y{a} > thr(a);


if numel(Y{a} > 0) == 0 % check for bad thesholding
aas_log(aap, true, sprintf('ERROR: No voxels above the threshold mask (%f) [max: %f]', thr(a), maxY))
end

V{a}.fname = spm_file(segimg(a,:),'prefix','S_r');
outstream = strvcat(outstream, V{a}.fname); % Save to stream...
spm_write_vol(V{a}, Y{a});
Expand Down
7 changes: 6 additions & 1 deletion aa_modules/aamod_mask_fromstruct.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@
for a = 1:size(SEGimg,1)
[pth, fn, ext] = fileparts(SEGimg(a,:));

maxY = max(Y{a}(:));
if numel(Y{a} > 0) == 0 % check for bad thesholding
aas_log(aap, true, sprintf('ERROR: No voxels above the threshold mask (%f) [max: %f]', thr(a), maxY))
end

if ~isempty(strfind(fn(1), 'w'))
eY = WeY == a;
else
Expand All @@ -167,4 +172,4 @@
aap = aas_desc_outputs(aap,subj,'segmasksStrict',Soutstream);
aap = aas_desc_outputs(aap,subj,'segmasksExclusive',Eoutstream);

end
end