Changeset 917 for trunk/src/series

Timestamp:

Jun 25, 2015, 12:33:52 PM (9 years ago)

Author:

sommeria

Message:

series modified to deal with NbSlice? in local mode, subbackground fixed, edge detection introduced

File:

• trunk/src/series/sub_background.m (modified) (5 diffs)

trunk/src/series/sub_background.m

@@ -86 +86 @@
     %% root input file(s) and type
     % check the existence of the first file in the series
-        first_j=[];
-    if isfield(Param.IndexRange,'first_j'); first_j=Param.IndexRange.first_j; end
+        first_j=[];% note that the function will propose to cover the whole range of indices
+    if isfield(Param.IndexRange,'MinIndex_j'); first_j=Param.IndexRange.MinIndex_j; end
     last_j=[];
-    if isfield(Param.IndexRange,'last_j'); last_j=Param.IndexRange.last_j; end
+    if isfield(Param.IndexRange,'MaxIndex_j'); last_j=Param.IndexRange.MaxIndex_j; end
     PairString='';
     if isfield(Param.IndexRange,'PairString'); PairString=Param.IndexRange.PairString; end
@@ -131 +131 @@
     end
     first_i=1;last_i=1;incr_i=1;%default
-    if isfield(Param.IndexRange,'first_i'); last_i=Param.IndexRange.first_i; end   
-    if isfield(Param.IndexRange,'last_i'); last_i=Param.IndexRange.last_i; end
+    if isfield(Param.IndexRange,'MinIndex_i'); first_i=Param.IndexRange.MinIndex_i; end   
+    if isfield(Param.IndexRange,'MaxIndex_i'); last_i=Param.IndexRange.MaxIndex_i; end
     if isfield(Param.IndexRange,'incr_i')&&~isempty(Param.IndexRange.incr_i)
         incr_i=Param.IndexRange.incr_i;
@@ -156 +156 @@
     def     = { 'No';num2str(nbaver_init);'0.1'};
     answer = inputdlg(prompt,dlg_title,num_lines,def);
-    
+    if isempty(answer)
+        return
+    end
     %check input consistency
     if strcmp(answer{1},'No') && ~isequal(NbSlice_i,1)
@@ -252 +254 @@
 nbfield_j=size(i1_series{1},1); %nb of fields for the j index (bursts or volume slices)
 nbfield_i=size(i1_series{1},2); %nb of fields for the i index
-nbfield=nbfield_j*nbfield_i; %total number of fields
+
 if Param.ActionInput.CheckVolume
     step=2;% we assume the burst contains only one image pair
@@ -262 +264 @@
         NbSlice_j=1;
         NbSlice=NbSlice_i;
-    nbfield_i=floor(nbfield/NbSlice_i);%total number of  indexes in a slice (adjusted to an integer number of slices)
-    nbfield=nbfield_i*NbSlice_i; %total number of fields after adjustement
-    nbfield_series=nbfield;
-end
+    %nbfield_i=floor(nbfield_i/NbSlice_i);%total number of  indexes in a slice (adjusted to an integer number of slices)
+    %nbfield=nbfield_i*NbSlice_i; %total number of fields after adjustement
+    nbfield_series=nbfield_i*nbfield_j;
+end
+nbfield=nbfield_j*nbfield_i; %total number of fields
 nbaver_ima=Param.ActionInput.SlidingSequenceLength;%number of images for the sliding background
 nbaver=ceil(nbaver_ima/step);%number of bursts for the sliding background