Changeset 859 for trunk/src

Timestamp:

Jan 27, 2015, 9:21:37 AM (10 years ago)

Author:

sommeria

Message:

bug_repair

Location:

trunk/src

Files:

• mouse_motion.m (modified) (4 diffs)
• series/civ_input.fig (modified) (previous)
• series/civ_input.m (modified) (6 diffs)
• series/civ_series.m (modified) (37 diffs)

trunk/src/mouse_motion.m

@@ -73 +73 @@
     test_piv=1;
 end
-
 %find the current axe 'CurrentAxes' and display the current mouse position or uicontrol tag
 text_displ_1='';
@@ -126 +125 @@
         end
     end
-    FigData=get(hCurrentFig,'UserData');
-    tagaxes=get(CurrentAxes,'tag');
+    FigData=get(hCurrentFig,'UserData'); % user data of the current figure
+    tagaxes=get(CurrentAxes,'tag'); % tag name of the current axes, for instance PlotAxes
     if isfield(FigData,tagaxes)
-        Field=FigData.(tagaxes);
+        Field=FigData.(tagaxes); % the current field is sought as substructure of FigData with key tagaxes
         if isfield(Field,'ListVarName')
             [CellInfo,NbDimArray]=find_field_cells(Field);%analyse the physical fields contained in Field
@@ -227 +226 @@
                     pos=cos_om*pos+sin_om*cross(OmAxis,pos)+(1-cos_om)*(OmAxis*pos')*OmAxis;
                 end
-               % pos=pos+[Field.ProjObjectCoord 0];
                pos=pos+Field.ProjObjectCoord;
                 text_displ_3=[text_displ_3 'x,y,z=' num2str(pos,4)];
             end
-            %                     if ~isempty(z)
-            %                         text_displ_1=[text_displ_1 ' z=' num2str(z,4)];
-            %                     end
             % case of PIV correlation display
             if test_piv
@@ -260 +255 @@
                 yround=Field.Y(ind_pt);
                 
-                % mark the correlation box with a rectangle
+                % mark the correlation box with a rectangle in view_field
                 ibx2=floor((par_civ.CorrBoxSize(1)-1)/2);
                 iby2=floor((par_civ.CorrBoxSize(2)-1)/2);

trunk/src/series/civ_input.m

@@ -1149 +1149 @@
 %------------------------------------------------------------------------
 
+% --- Executes on button press in CheckDeformation.
+function CheckDeformation_Callback(hObject, eventdata, handles)
+set(handles.configSource,'String','NEW')
+set(handles.OK,'BackgroundColor',[1 0 1])
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Callbacks in the uipanel Fix1
@@ -1886 +1891 @@
      Param.Action.RUN=1;
      Param.ActionInput=read_GUI(handles.civ_input);
+     if isfield(Param,'OutputSubDir')
      Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series
-     Param.ActionInput.Civ2.SmoothParam=0;% launch Civ2 with no data point (to get the image names for A and B)
+     end
+     Param.ActionInput.Civ2.CorrSmooth=0;% launch Civ2 with no data point (to get the image names for A and B)
      set(handles.Civ1,'BackgroundColor',[1 1 0])
+     set(handles.Fix1,'BackgroundColor',[1 1 0])
+     set(handles.Patch1,'BackgroundColor',[1 1 0])
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
      
@@ -1916 +1925 @@
     hhview_field=guihandles(hview_field);%
     set(hview_field,'CurrentAxes',hhview_field.PlotAxes)
-    %ViewData=get(hview_field,'UserData'); 
+    ViewData=get(hview_field,'UserData'); % get the currently plotted field (the image A)
     % store info in the UserData of view-field
     ViewData.CivHandle=handles.civ_input;% indicate the handle of the civ GUI in view_field
@@ -1922 +1931 @@
     ViewData.PlotAxes.X=Data.Civ2_X';
     ViewData.PlotAxes.Y=Data.Civ2_Y';
-    ViewData.PlotAxes.ShiftX=Data.Civ2_U';
+    ViewData.PlotAxes.ShiftX=Data.Civ2_U';% shift at each point (from patch1) estimated by running civ2 
     ViewData.PlotAxes.ShiftY=Data.Civ2_V';
     ViewData.PlotAxes.Civ1_SubRange=Data.Civ1_SubRange;
@@ -1932 +1941 @@
     ViewData.PlotAxes.Civ2_Dt=Data.Civ2_Dt;
     set(hview_field,'UserData',ViewData)% store the info in the UserData of image view_field
+    bckcolor=get(handles.civ_input,'Color');
+    set(handles.Civ1,'BackgroundColor',bckcolor)% indicate civ1 calmculation is finished
+    set(handles.Fix1,'BackgroundColor',bckcolor)
+    set(handles.Patch1,'BackgroundColor',bckcolor)
+    drawnow
     
     %% look for a current figure for image correlation display
@@ -2245 +2259 @@
 % --- Executes on button press in TestPatch2.
 function TestPatch2_Callback(hObject, eventdata, handles)
+
+
+

trunk/src/series/civ_series.m

@@ -20 +20 @@
 %     Param.OutputSubDir: sets the folder name of output file(s,
 %           if absent no file is produced, result in the output structure Data (test mode)
-%     Param.ActionInput: substructure with the parameters provided by the GUI civ_input 
+%     Param.ActionInput: substructure with the parameters provided by the GUI civ_input
 %                      .Civ1: parameters for civ1
 %                      .Fix1: parameters for fix1
-%                      .Patch1: 
+%                      .Patch1:
 %                      .Civ2: for civ2
-%                      .Fix2: 
+%                      .Fix2:
 %                      .Patch2:
 
@@ -32 +32 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 %     This is part of the toolbox UVMAT.
-% 
+%
 %     UVMAT is free software; you can redistribute it and/or modify
 %     it under the terms of the GNU General Public License as published by
 %     the Free Software Foundation; either version 2 of the License, or
 %     (at your option) any later version.
-% 
+%
 %     UVMAT is distributed in the hope that it will be useful,
 %     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -48 +48 @@
 
 %% set the input elements needed on the GUI series when the action is selected in the menu ActionName or InputTable refreshed
-if isstruct(Param) && isequal(Param.Action.RUN,0)% function activated from the GUI series but not RUN 
+if isstruct(Param) && isequal(Param.Action.RUN,0)% function activated from the GUI series but not RUN
     path_series=fileparts(which('series'));
     addpath(fullfile(path_series,'series'))
@@ -82 +82 @@
 %% test input
 if ~isfield(Param,'ActionInput')
-     disp_uvmat('ERROR','no parameter set for PIV',checkrun)
-        return
+    disp_uvmat('ERROR','no parameter set for PIV',checkrun)
+    return
 end
 iview_A=0;%default values
@@ -105 +105 @@
     if isfield(Param,'InputTable')
         [tild,i1_series,i2_series,j1_series,j2_series]=get_file_series(Param);
-        % iview_nc=0;% series index (iview) for an input nc file (for civ2 or patch2)
         iview_A=0;% series index (iview) for the first image series
         iview_B=0;% series index (iview) for the second image series (only non zero for option 'shift' comparing two image series )
@@ -158 +157 @@
                     end
                 end
-                %             i1_series_Civ1=i1_series_Civ1(~check_bounds);
-                %             i2_series_Civ1=i2_series_Civ1(~check_bounds);
-                %             j1_series_Civ1=j1_series_Civ1(~check_bounds);
-                %             j2_series_Civ1=j2_series_Civ1(~check_bounds);
             case 'displacement'
                 i1_series_Civ1=Param.ActionInput.OriginIndex*ones(size(i1_series{1}));
@@ -271 +266 @@
     OutputDir='';
     if CheckOutputFile
-    OutputDir=[Param.OutputSubDir Param.OutputDirExt];
+        OutputDir=[Param.OutputSubDir Param.OutputDirExt];
     end
 end
@@ -280 +275 @@
 Data.Program='civ_series';
 Data.CivStage=0;%default
-maskname='';%default
 check_civx=0;%default
 
@@ -440 +434 @@
                 [xtable, ytable, utable, vtable, ctable, F, result_conv, errormsg] = civ (par_civ1);
                 if ~isempty(errormsg)
-                     disp_uvmat('ERROR',errormsg,checkrun)
+                    disp_uvmat('ERROR',errormsg,checkrun)
                     return
                 end
@@ -468 +462 @@
         if exist('ncfile','var')
             CivFile=ncfile;
-            %         elseif isfield(Param.Patch1,'CivFile')
-            %             CivFile=Param.Patch1.CivFile;
-            %         end
             [Data,tild,tild,errormsg]=nc2struct(CivFile,'ListGlobalAttribute','absolut_time_T0'); %look for the constant 'absolut_time_T0' to detect old civx data format
             if ~isempty(errormsg)
@@ -476 +467 @@
                 return
             end
-            if ~isempty(Data.absolut_time_T0')%read civx file
-                check_civx=1;% test for old civx data format
-                [Data,vardetect,ichoice]=nc2struct(CivFile);%read the variables in the netcdf file
-            else
-                [Data,tild,tild,errormsg]=nc2struct(CivFile);%read civ1 and fix1 data in the existing netcdf file
-            end
+            [Data,tild,tild,errormsg]=nc2struct(CivFile);%read civ1 and fix1 data in the existing netcdf file
         elseif isfield(Param,'Civ1_X')
             Data.ListGlobalAttribute={};
@@ -490 +476 @@
             Data.Civ1_U=Param.Civ1_U;
             Data.Civ1_V=Param.Civ1_V;
-            Data.Civ1_FF=Param.Civ1_FF;          
+            Data.Civ1_FF=Param.Civ1_FF;
         end
     end
@@ -502 +488 @@
                 Data=rmfield(Data,Data.ListGlobalAttribute{Fix1_attr(ilist)});
             end
-        end 
+        end
         list_param=fieldnames(Param.ActionInput.Fix1)';
         Fix1_param=regexprep(list_param,'^.+','Fix1_$0');% insert 'Fix1_' before  each string in ListFixParam
-        %indicate the values of all the global attributes in the output data 
+        %indicate the values of all the global attributes in the output data
         for ilist=1:length(list_param)
             Data.(Fix1_param{ilist})=Param.ActionInput.Fix1.(list_param{ilist});
         end
         Data.ListGlobalAttribute=[Data.ListGlobalAttribute Fix1_param];
-%         
-%         for ilist=1:length(ListFixParam)
-%             ParamName=ListFixParam{ilist};
-%             ListName=['Fix1_' ParamName];
-%             eval(['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];'])
-%             eval(['Data.' ListName '=Param.ActionInput.Fix1.' ParamName ';'])
-%         end
-        if check_civx
-            if ~isfield(Data,'fix')
-                Data.ListGlobalAttribute=[Data.ListGlobalAttribute 'fix'];
-                Data.fix=1;
-                Data.ListVarName=[Data.ListVarName {'vec_FixFlag'}];
-                Data.VarDimName=[Data.VarDimName {'nb_vectors'}];
-            end
-            Data.vec_FixFlag=fix(Param.ActionInput.Fix1,Data.vec_F,Data.vec_C,Data.vec_U,Data.vec_V,Data.vec_X,Data.vec_Y);
-        else
-            Data.ListVarName=[Data.ListVarName {'Civ1_FF'}];
-            Data.VarDimName=[Data.VarDimName {'nb_vec_1'}];
-            nbvar=length(Data.ListVarName);
-            Data.VarAttribute{nbvar}.Role='errorflag';
-            Data.Civ1_FF=fix(Param.ActionInput.Fix1,Data.Civ1_F,Data.Civ1_C,Data.Civ1_U,Data.Civ1_V);
-            Data.CivStage=2;
-        end
+        Data.ListVarName=[Data.ListVarName {'Civ1_FF'}];
+        Data.VarDimName=[Data.VarDimName {'nb_vec_1'}];
+        nbvar=length(Data.ListVarName);
+        Data.VarAttribute{nbvar}.Role='errorflag';
+        Data.Civ1_FF=fix(Param.ActionInput.Fix1,Data.Civ1_F,Data.Civ1_C,Data.Civ1_U,Data.Civ1_V);
+        Data.CivStage=2;
     end
     %% Patch1
@@ -570 +539 @@
         end
         
-       % perform Patch calculation using the UVMAT fct 'filter_tps'
+        % perform Patch calculation using the UVMAT fct 'filter_tps'
         [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...
             filter_tps([Data.Civ1_X(ind_good) Data.Civ1_Y(ind_good)],Data.Civ1_U(ind_good),Data.Civ1_V(ind_good),[],Data.Patch1_SubDomainSize,Data.Patch1_FieldSmooth,Data.Patch1_MaxDiff);
@@ -647 +616 @@
                 U_tps=Data.Civ2_U_tps;
                 V_tps=Data.Civ2_V_tps;
-                CivStage=Data.CivStage;
+                CivStage=Data.CivStage;%store the current CivStage
                 Civ1_Dt=Data.Civ2_Dt;
                 Data=[];%reinitialise the result structure Data
@@ -653 +622 @@
                 Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
                 Data.Program='civ_series';
-                Data.CivStage=CivStage;
+                Data.CivStage=CivStage+1;%update the current civStage after reinitialisation of Data
                 Data.ListVarName={};
                 Data.VarDimName={};
@@ -663 +632 @@
                 V_tps=Data.Civ1_V_tps;
                 Civ1_Dt=Data.Civ1_Dt;
+                Data.CivStage=4;
             end
         else
@@ -672 +642 @@
             Civ1_Dt=par_civ2.Civ1_Dt;
             Civ2_Dt=par_civ2.Civ1_Dt;
-                         Data.ListVarName={};
-                Data.VarDimName={};
+            Data.ListVarName={};
+            Data.VarDimName={};
         end
         Shiftx=zeros(size(par_civ2.Grid,1),1);% shift expected from civ1 data
@@ -683 +653 @@
             ind_sel=find(par_civ2.Grid(:,1)>=SubRange(1,1,isub) & par_civ2.Grid(:,1)<=SubRange(1,2,isub) &...
                 par_civ2.Grid(:,2)>=SubRange(2,1,isub) & par_civ2.Grid(:,2)<=SubRange(2,2,isub));
-            epoints = par_civ2.Grid(ind_sel,:);% coordinates of interpolation sites
-            ctrs=Coord_tps(1:nbvec_sub,:,isub) ;%(=initial points) ctrs
-            nbval(ind_sel)=nbval(ind_sel)+1;% records the number of values for each interpolation point (in case of subdomain overlap)
-            EM = tps_eval(epoints,ctrs);
-            Shiftx(ind_sel)=Shiftx(ind_sel)+EM*U_tps(1:nbvec_sub+3,isub);
-            Shifty(ind_sel)=Shifty(ind_sel)+EM*V_tps(1:nbvec_sub+3,isub);
-            if par_civ2.CheckDeformation
-                [EMDX,EMDY] = tps_eval_dxy(epoints,ctrs);%2D matrix of distances between extrapolation points epoints and spline centres (=site points) ctrs
-                DUDX(ind_sel)=DUDX(ind_sel)+EMDX*U_tps(1:nbvec_sub+3,isub);
-                DUDY(ind_sel)=DUDY(ind_sel)+EMDY*U_tps(1:nbvec_sub+3,isub);
-                DVDX(ind_sel)=DVDX(ind_sel)+EMDX*V_tps(1:nbvec_sub+3,isub);
-                DVDY(ind_sel)=DVDY(ind_sel)+EMDY*V_tps(1:nbvec_sub+3,isub);
+            if ~isempty(ind_sel)
+                epoints = par_civ2.Grid(ind_sel,:);% coordinates of interpolation sites
+                ctrs=Coord_tps(1:nbvec_sub,:,isub) ;%(=initial points) ctrs
+                nbval(ind_sel)=nbval(ind_sel)+1;% records the number of values for each interpolation point (in case of subdomain overlap)
+                EM = tps_eval(epoints,ctrs);
+                Shiftx(ind_sel)=Shiftx(ind_sel)+EM*U_tps(1:nbvec_sub+3,isub);
+                Shifty(ind_sel)=Shifty(ind_sel)+EM*V_tps(1:nbvec_sub+3,isub);
+                if par_civ2.CheckDeformation
+                    [EMDX,EMDY] = tps_eval_dxy(epoints,ctrs);%2D matrix of distances between extrapolation points epoints and spline centres (=site points) ctrs
+                    DUDX(ind_sel)=DUDX(ind_sel)+EMDX*U_tps(1:nbvec_sub+3,isub);
+                    DUDY(ind_sel)=DUDY(ind_sel)+EMDY*U_tps(1:nbvec_sub+3,isub);
+                    DVDX(ind_sel)=DVDX(ind_sel)+EMDX*V_tps(1:nbvec_sub+3,isub);
+                    DVDY(ind_sel)=DVDY(ind_sel)+EMDY*V_tps(1:nbvec_sub+3,isub);
+                end
             end
         end
@@ -726 +698 @@
             par_civ2.DVDY=DVDY./nbval;
         end
-        par_civ2
+        
         % calculate velocity data (y and v in indices, reverse to y component)
         [xtable, ytable, utable, vtable, ctable, F,result_conv,errormsg] = civ (par_civ2);
         
         list_param=(fieldnames(Param.ActionInput.Civ2))';
+        list_param(strcmp('TestCiv2',list_param))=[];% remove the parameter TestCiv2 from the list
         Civ2_param=regexprep(list_param,'^.+','Civ2_$0');% insert 'Civ2_' before  each string in list_param
         Civ2_param=[{'Civ2_ImageA','Civ2_ImageB','Civ2_Time','Civ2_Dt'} Civ2_param]; %insert the names of the two input images
         %indicate the values of all the global attributes in the output data
         if exist('ImageName_A','var')
-        Data.Civ2_ImageA=ImageName_A;
-        Data.Civ2_ImageB=ImageName_B;
-        Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
-        Data.Civ2_Dt=Civ2_Dt;
+            Data.Civ2_ImageA=ImageName_A;
+            Data.Civ2_ImageB=ImageName_B;
+            Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
+            Data.Civ2_Dt=Civ2_Dt;
         end
         %         Data.Civ2_Time=1;
@@ -748 +721 @@
         
         nbvar=numel(Data.ListVarName);
-        Data.ListVarName=[Data.ListVarName {'Civ2_X','Civ2_Y','Civ2_U','Civ2_V','Civ2_F','Civ2_C'}];%  cell array containing the names of the fields to record
-        Data.VarDimName=[Data.VarDimName {'nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2'}];
-        Data.VarAttribute{nbvar+1}.Role='coord_x';
-        Data.VarAttribute{nbvar+2}.Role='coord_y';
-        Data.VarAttribute{nbvar+3}.Role='vector_x';
-        Data.VarAttribute{nbvar+4}.Role='vector_y';
-        Data.VarAttribute{nbvar+5}.Role='warnflag';
+        % define the Civ2 variable (if Civ2 data are not replaced from previous calculation)
+        if isempty(find(strcmp('Civ2_X',Data.ListVarName),1))
+            Data.ListVarName=[Data.ListVarName {'Civ2_X','Civ2_Y','Civ2_U','Civ2_V','Civ2_F','Civ2_C'}];%  cell array containing the names of the fields to record
+            Data.VarDimName=[Data.VarDimName {'nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2','nb_vec_2'}];
+            Data.VarAttribute{nbvar+1}.Role='coord_x';
+            Data.VarAttribute{nbvar+2}.Role='coord_y';
+            Data.VarAttribute{nbvar+3}.Role='vector_x';
+            Data.VarAttribute{nbvar+4}.Role='vector_y';
+            Data.VarAttribute{nbvar+5}.Role='warnflag';
+        end
         Data.Civ2_X=reshape(xtable,[],1);
         Data.Civ2_Y=reshape(size(par_civ2.ImageA,1)-ytable+1,[],1);
@@ -761 +737 @@
         Data.Civ2_C=reshape(ctable,[],1);
         Data.Civ2_F=reshape(F,[],1);
-        Data.CivStage=Data.CivStage+1;
     end
     
@@ -768 +743 @@
         list_param=fieldnames(Param.ActionInput.Fix2)';
         Fix2_param=regexprep(list_param,'^.+','Fix2_$0');% insert 'Fix1_' before  each string in ListFixParam
-        %indicate the values of all the global attributes in the output data 
+        %indicate the values of all the global attributes in the output data
         for ilist=1:length(list_param)
             Data.(Fix2_param{ilist})=Param.ActionInput.Fix2.(list_param{ilist});
         end
-        Data.ListGlobalAttribute=[Data.ListGlobalAttribute Fix2_param];     
-%         
-%         ListFixParam=fieldnames(Param.ActionInput.Fix2);
-%         for ilist=1:length(ListFixParam)
-%             ParamName=ListFixParam{ilist};
-%             ListName=['Fix2_' ParamName];
-%             eval(['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];'])
-%             eval(['Data.' ListName '=Param.ActionInput.Fix2.' ParamName ';'])
-%         end
+        Data.ListGlobalAttribute=[Data.ListGlobalAttribute Fix2_param];
+        %
+        %         ListFixParam=fieldnames(Param.ActionInput.Fix2);
+        %         for ilist=1:length(ListFixParam)
+        %             ParamName=ListFixParam{ilist};
+        %             ListName=['Fix2_' ParamName];
+        %             eval(['Data.ListGlobalAttribute=[Data.ListGlobalAttribute ''' ParamName '''];'])
+        %             eval(['Data.' ListName '=Param.ActionInput.Fix2.' ParamName ';'])
+        %         end
         if check_civx
             if ~isfield(Data,'fix2')
@@ -802 +777 @@
     %% Patch2
     if isfield (Param.ActionInput,'Patch2')
-                list_param=fieldnames(Param.ActionInput.Patch2)';
+        list_param=fieldnames(Param.ActionInput.Patch2)';
+        list_param(strcmp('TestPatch2',list_param))=[];% remove the parameter TestCiv1 from the list
         Patch2_param=regexprep(list_param,'^.+','Patch2_$0');% insert 'Fix1_' before  each string in ListFixParam
-        %indicate the values of all the global attributes in the output data 
+        %indicate the values of all the global attributes in the output data
         for ilist=1:length(list_param)
             Data.(Patch2_param{ilist})=Param.ActionInput.Patch2.(list_param{ilist});
@@ -811 +787 @@
         
         
-%         Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch2_FieldSmooth','Patch2_MaxDiff','Patch2_SubDomainSize'}];
-%         Data.Patch2_FieldSmooth=Param.ActionInput.Patch2.FieldSmooth;
-%         Data.Patch2_MaxDiff=Param.ActionInput.Patch2.MaxDiff;
-%         Data.Patch2_SubDomainSize=Param.ActionInput.Patch2.SubDomainSize;
+        %         Data.ListGlobalAttribute=[Data.ListGlobalAttribute {'Patch2_FieldSmooth','Patch2_MaxDiff','Patch2_SubDomainSize'}];
+        %         Data.Patch2_FieldSmooth=Param.ActionInput.Patch2.FieldSmooth;
+        %         Data.Patch2_MaxDiff=Param.ActionInput.Patch2.MaxDiff;
+        %         Data.Patch2_SubDomainSize=Param.ActionInput.Patch2.SubDomainSize;
         nbvar=length(Data.ListVarName);
         Data.ListVarName=[Data.ListVarName {'Civ2_U_smooth','Civ2_V_smooth','Civ2_SubRange','Civ2_NbCentres','Civ2_Coord_tps','Civ2_U_tps','Civ2_V_tps'}];
@@ -841 +817 @@
     
     %% write result in a netcdf file if requested
-    if CheckOutputFile 
+    if CheckOutputFile
         errormsg=struct2nc(ncfile,Data);
         if isempty(errormsg)
@@ -886 +862 @@
 
 %% prepare measurement grid
-if isfield(par_civ,'Grid')% grid points set as input 
+if isfield(par_civ,'Grid')% grid points set as input
     if ischar(par_civ.Grid)%read the grid file if the input is a file name
         par_civ.Grid=dlmread(par_civ.Grid);
@@ -903 +879 @@
 nbvec=size(par_civ.Grid,1);
 
-%% prepare correlation and search boxes 
+%% prepare correlation and search boxes
 ibx2=ceil(par_civ.CorrBoxSize(1)/2);
 iby2=ceil(par_civ.CorrBoxSize(2)/2);
@@ -924 +900 @@
 result_conv=[];
 errormsg='';
-    
+
 %% prepare mask
 if isfield(par_civ,'Mask') && ~isempty(par_civ.Mask)
@@ -964 +940 @@
 
 %% Apply mask
-    % Convention for mask IDEAS TO IMPLEMENT ?
-    % mask >200 : velocity calculated
-    %  200 >=mask>150;velocity not calculated, interpolation allowed (bad spots)
-    % 150>=mask >100: velocity not calculated, nor interpolated
-    %  100>=mask> 20: velocity not calculated, impermeable (no flux through mask boundaries) 
-    %  20>=mask: velocity=0
+% Convention for mask IDEAS TO IMPLEMENT ?
+% mask >200 : velocity calculated
+%  200 >=mask>150;velocity not calculated, interpolation allowed (bad spots)
+% 150>=mask >100: velocity not calculated, nor interpolated
+%  100>=mask> 20: velocity not calculated, impermeable (no flux through mask boundaries)
+%  20>=mask: velocity=0
 checkmask=0;
 MinA=min(min(par_civ.ImageA));
 MinB=min(min(par_civ.ImageB));
 if isfield(par_civ,'Mask') && ~isempty(par_civ.Mask)
-   checkmask=1;
-   if ~isequal(size(par_civ.Mask),[npy_ima npx_ima])
+    checkmask=1;
+    if ~isequal(size(par_civ.Mask),[npy_ima npx_ima])
         errormsg='mask must be an image with the same size as the images';
         return
-   end
-  %  check_noflux=(par_civ.Mask<100) ;%TODO: to implement
+    end
+    %  check_noflux=(par_civ.Mask<100) ;%TODO: to implement
     check_undefined=(par_civ.Mask<200 & par_civ.Mask>=20 );
     par_civ.ImageA(check_undefined)=MinA;% put image A to zero (i.e. the min image value) in the undefined  area
@@ -1007 +983 @@
         check1_y=subrange1_y>=1 & subrange1_y<=par_civ.ImageHeight;
         check2_x=subrange2_x>=1 & subrange2_x<=par_civ.ImageWidth;% check which points in the subimage 2 are contained in the initial image 2
-        check2_y=subrange2_y>=1 & subrange2_y<=par_civ.ImageHeight;      
+        check2_y=subrange2_y>=1 & subrange2_y<=par_civ.ImageHeight;
         image1_crop(check1_y,check1_x)=par_civ.ImageA(subrange1_y(check1_y),subrange1_x(check1_x));%extract a subimage (correlation box) from image A
         image2_crop(check2_y,check2_x)=par_civ.ImageB(subrange2_y(check2_y),subrange2_x(check2_x));%extract a larger subimage (search box) from image B
@@ -1031 +1007 @@
                 YIant=YI-par_civ.DVDX(ivec)*XI-par_civ.DVDY(ivec)*YI+ceil(size(image1_crop,1)/2);
                 image1_crop=interp2(image1_crop,XIant,YIant);
+                image1_crop(isnan(image1_crop))=0;
                 xi=(1:mesh:size(image2_crop,2));
                 yi=(1:mesh:size(image2_crop,1))';
                 image2_crop=interp2(image2_crop,xi,yi);
+                image2_crop(isnan(image2_crop))=0;
+                %%
             end
             sum_square=sum(sum(image1_crop.*image1_crop));
@@ -1066 +1045 @@
             else
                 F(ivec)=3;
+                [y,x]
             end
         end
@@ -1133 +1113 @@
     c11=(1/4)*sum(sum(c11));
     c20=(1/6)*sum(sum(c20));
-    c02=(1/6)*sum(sum(c02)); 
+    c02=(1/6)*sum(sum(c02));
     deltax=(c11*c01-2*c10*c02)/(4*c20*c02-c11^2);
     deltay=(c11*c10-2*c01*c20)/(4*c20*c02-c11^2);
@@ -1151 +1131 @@
 %filename: name of the netcdf file (used as input and output)
 %field: structure specifying the names of the fields to fix (depending on civ1 or civ2)
-    %.vel_type='civ1' or 'civ2';
-    %.nb=name of the dimension common to the field to fix ('nb_vectors' for civ1);
-    %.fixflag=name of fix flag variable ('vec_FixFlag' for civ1)
-%flagindex: flag specifying which values of vec_f are removed: 
-        % if flagindex(1)=1: vec_f=-2 vectors are removed
-        % if flagindex(2)=1: vec_f=3 vectors are removed
-        % if flagindex(3)=1: vec_f=2 vectors are removed (if iter=1) or vec_f=4 vectors are removed (if iter=2)
+%.vel_type='civ1' or 'civ2';
+%.nb=name of the dimension common to the field to fix ('nb_vectors' for civ1);
+%.fixflag=name of fix flag variable ('vec_FixFlag' for civ1)
+%flagindex: flag specifying which values of vec_f are removed:
+% if flagindex(1)=1: vec_f=-2 vectors are removed
+% if flagindex(2)=1: vec_f=3 vectors are removed
+% if flagindex(3)=1: vec_f=2 vectors are removed (if iter=1) or vec_f=4 vectors are removed (if iter=2)
 %iter=1 for civ1 fields and iter=2 for civ2 fields
 %thresh_vecC: threshold in the image correlation vec_C
@@ -1220 +1200 @@
             if ~isempty(r)
                 NomTypeNc='_1_1-2';
-            end            
+            end
         end
     end
@@ -1226 +1206 @@
         display('wrong pair mode input option')
     else
-    ind1=stra2num(r.num1);
-    ind2=stra2num(r.num2);
+        ind1=stra2num(r.num1);
+        ind2=stra2num(r.num2);
     end
 end