Changeset 769 for trunk/src/read_field.m

Timestamp:

May 3, 2014, 10:40:25 AM (9 years ago)

Author:

sommeria

Message:

corrections to be able to process image correlation in series

File:

• trunk/src/read_field.m (modified) (2 diffs)

trunk/src/read_field.m

@@ -63 +63 @@
         [Field,ParamOut.VelType,errormsg]=read_civdata(FileName,InputField,ParamIn.VelType);
         if ~isempty(errormsg),errormsg=['read_civdata / ' errormsg];return,end
+        if ~isempty(strcmp('C',ParamIn.FieldName))% if C image correlation is requested as field (not color visu)
+            ScalarIndex=strcmp('C',Field.ListVarName);
+            Field.VarAttribute{ScalarIndex}.Role='scalar';%put role as 'scalar' instead of ancillary
+        end      
         ParamOut.CivStage=Field.CivStage;
     case 'civx'% old (obsolete) format for civ results
@@ -175 +179 @@
             ind_var_U=find(strcmp(UName,ListVar));%check previous listing of variable r.UName
             ind_var_V=find(strcmp(VName,ListVar));%check previous listing of variable r.VName
-             if ~checkU && ~checkV
-                    Field.ListVarName([ind_var_U+2 ind_var_V+2])=[];
-                    Field.VarDimName([ind_var_U+2 ind_var_V+2])=[];
-                    Field.VarAttribute([ind_var_U+2 ind_var_V+2])=[];
-                elseif ~checkU
-                    Field.ListVarName(ind_var_U+2)=[];
-                    Field.VarDimName(ind_var_U+2)=[];
-                    Field.VarAttribute(ind_var_U+2 )=[];
-                elseif ~checkV
-                    Field.ListVarName(ind_var_V+2)=[];
-                    Field.VarDimName(ind_var_V+2)=[];
-                    Field.VarAttribute(ind_var_V+2 )=[];
-             end
+            if ~checkU && ~checkV
+                Field.ListVarName([ind_var_U+2 ind_var_V+2])=[];
+                Field.VarDimName([ind_var_U+2 ind_var_V+2])=[];
+                Field.VarAttribute([ind_var_U+2 ind_var_V+2])=[];
+            elseif ~checkU
+                Field.ListVarName(ind_var_U+2)=[];
+                Field.VarDimName(ind_var_U+2)=[];
+                Field.VarAttribute(ind_var_U+2 )=[];
+            elseif ~checkV
+                Field.ListVarName(ind_var_V+2)=[];
+                Field.VarDimName(ind_var_V+2)=[];
+                Field.VarAttribute(ind_var_V+2 )=[];
+            end
         end
     case 'video'