From ff1de5d76fe799c4548378817832c7bb1ea6e0db Mon Sep 17 00:00:00 2001
From: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>
Date: Thu, 4 Feb 2016 17:04:59 +0100
Subject: [PATCH] enable the use of njobs in gtSegmentationDoubleThreshold
Signed-off-by: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>
---
2_difspot/gtSegmentationDoubleThreshold.m | 13 +++++++------
2_difspot/gtSegmentationLaunchOAR.m | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/2_difspot/gtSegmentationDoubleThreshold.m b/2_difspot/gtSegmentationDoubleThreshold.m
index 3c9b9f6d..8690c226 100644
--- a/2_difspot/gtSegmentationDoubleThreshold.m
+++ b/2_difspot/gtSegmentationDoubleThreshold.m
@@ -132,7 +132,7 @@ end
if isfield(parameters.seg, 'segmentation_stack_size')
stack.sizeZ = parameters.seg.segmentation_stack_size;
else
- stack.sizeZ = 250;
+ stack.sizeZ = 1000;
end
% you must write either blobs or edfs
@@ -163,15 +163,16 @@ else
stack.totproj = parameters.acq.nproj;
end
-% don't take more than we need
+
+stack.pad = parameters.seg.maxblobsize(3);
+stack.sizeZ = last_img - first_img + 1 + 2 * stack.pad
+
+% don't take more than allowed
parameters.seg.segmentation_stack_size = ...
- min((parameters.acq.nproj+parameters.seg.maxblobsize(3))*2,...
- parameters.seg.segmentation_stack_size)
+ min(stack.sizeZ, parameters.seg.segmentation_stack_size);
% read in the volume to work on
% check that the size makes sense
-stack.pad = parameters.seg.maxblobsize(3);
-stack.sizeZ = parameters.seg.segmentation_stack_size;
fprintf('Using %d images in memory (from parameters.seg)\n\n', stack.sizeZ)
stack.blockZ = stack.sizeZ - (2*stack.pad);
diff --git a/2_difspot/gtSegmentationLaunchOAR.m b/2_difspot/gtSegmentationLaunchOAR.m
index 97f65a3c..06f3ce71 100644
--- a/2_difspot/gtSegmentationLaunchOAR.m
+++ b/2_difspot/gtSegmentationLaunchOAR.m
@@ -24,8 +24,8 @@ check = questdlg('Launch Segmentation with OAR?','Question','Yes','No','Yes');
if strcmpi(check,'Yes')
% should be one big job
- % handles.parameters.oar.njobs = str2num(get(handles.OAR_njobs, 'string'));
- handles.parameters.oar.njobs = 1;
+ handles.parameters.oar.njobs = str2num(get(handles.OAR_njobs, 'string'));
+ %handles.parameters.oar.njobs = 1;
OARtime = str2num(get(handles.OAR_walltime, 'string'));
OARtmp = ceil(OARtime/60); % minutes
OARm = mod(OARtmp, 60); % minutes
--
GitLab