Changeset 867 for trunk/src/uvmat.m

Timestamp:

Feb 12, 2015, 9:31:47 PM (9 years ago)

Author:

sommeria

Message:

python option added in series and bug corrections

File:

• trunk/src/uvmat.m (modified) (3 diffs)

trunk/src/uvmat.m

@@ -2818 +2818 @@
         elseif ref_j_1<0
             errormsg='minimum j index reached';
-        elseif ref_i_1+1>size(UvData.i1_series{2},3)
+        elseif ref_i_1+1>size(UvData.i1_series{2},3)&&~isempty(InputFile.NomType_1)
             errormsg='maximum i index reached for the second series (reload the input file to update the index bound)';
-        elseif ref_j_1+1>size(UvData.i1_series{2},2)
+        elseif ref_j_1+1>size(UvData.i1_series{2},2)&&~isempty(InputFile.NomType_1)
             errormsg='maximum j index reached for the second series(reload the input file to update the index bound)';
         end
@@ -2826 +2826 @@
         siz=size(UvData.i1_series{2});
         ref_indices=ref_i_1*siz(1)*siz(2)+ref_j_1*siz(1)+1:ref_i_1*siz(1)*siz(2)+(ref_j_1+1)*siz(1);
-        i1_subseries=UvData.i1_series{2}(ref_indices);
-        ref_indices=ref_indices(i1_subseries>0);
-        if isempty(ref_indices)% case of pairs (free index i)
-            ref_indices=ref_i_1*siz(1)*siz(2)+1:(ref_i_1+1)*siz(1)*siz(2);
+        if ~isempty(InputFile.NomType_1)
             i1_subseries=UvData.i1_series{2}(ref_indices);
             ref_indices=ref_indices(i1_subseries>0);
-        end
-        i1_1=UvData.i1_series{2}(ref_indices(end));
-        if ~isempty(UvData.i2_series{2})
-            i2_1=UvData.i2_series{2}(ref_indices(end));
-        end
-        if ~isempty(UvData.j1_series{2})
-            j1_1=UvData.j1_series{2}(ref_indices(end));
-        end
-        if ~isempty(UvData.j2_series{2})
-            j2_1=UvData.j2_series{1}(ref_indices(end));
+            if isempty(ref_indices)% case of pairs (free index i)
+                ref_indices=ref_i_1*siz(1)*siz(2)+1:(ref_i_1+1)*siz(1)*siz(2);
+                i1_subseries=UvData.i1_series{2}(ref_indices);
+                ref_indices=ref_indices(i1_subseries>0);
+            end
+            i1_1=UvData.i1_series{2}(ref_indices(end));
+            if ~isempty(UvData.i2_series{2})
+                i2_1=UvData.i2_series{2}(ref_indices(end));
+            end
+            if ~isempty(UvData.j1_series{2})
+                j1_1=UvData.j1_series{2}(ref_indices(end));
+            end
+            if ~isempty(UvData.j2_series{2})
+                j2_1=UvData.j2_series{1}(ref_indices(end));
+            end
         end
     else% the second series (if needed) is the same file as the first
@@ -3600 +3602 @@
 %% get bounds and dimensions of the input field
 UvData.Field=find_field_bounds(UvData.Field);
-
 testnewseries=UvData.NewSeries;
 UvData.NewSeries=0;% put to 0 the test for a new field series (set by RootPath_callback)