Changeset 1146 for trunk

Timestamp:

May 14, 2024, 7:54:48 PM (7 months ago)

Author:

sommeria

Message:

civ-series adjested for new false vector conventions

File:

• trunk/src/series/civ_series.m (modified) (6 diffs)

trunk/src/series/civ_series.m

@@ -817 +817 @@
                 return
             end
-        elseif isfield(Param,'Civ2_X')% use Civ2 data as input in Param (test mode)
-            Data.ListGlobalAttribute={};
-            Data.ListVarName={};
-            Data.VarDimName={};
-            Data.Civ2_X=Param.Civ2_X;
-            Data.Civ2_Y=Param.Civ2_Y;
-            Data.Civ2_U=Param.Civ2_U;
-            Data.Civ2_V=Param.Civ2_V;
-            Data.Civ2_FF=Param.Civ2_FF;
+%         elseif isfield(Param,'Civ2_X')% use Civ2 data as input in Param (test mode)
+%             Data.ListGlobalAttribute={};
+%             Data.ListVarName={};
+%             Data.VarDimName={};
+%             Data.Civ2_X=Param.Civ2_X;
+%             Data.Civ2_Y=Param.Civ2_Y;
+%             Data.Civ2_U=Param.Civ2_U;
+%             Data.Civ2_V=Param.Civ2_V;
+%             Data.Civ2_FF=Param.Civ2_FF;
         end
     end
@@ -1003 +1003 @@
 
 %% Apply mask
-% Convention for mask IDEAS TO IMPLEMENT ?
+% Convention for mask, IDEAS NOT IMPLEMENTED 
 % mask >200 : velocity calculated
 %  200 >=mask>150;velocity not calculated, interpolation allowed (bad spots)
@@ -1020 +1020 @@
     end
     check_undefined=(par_civ.Mask<200 & par_civ.Mask>=20 );
-    %     par_civ.ImageA(check_undefined)=0;% put image A to zero (i.e. the min image value) in the undefined  area
-    %     par_civ.ImageB(check_undefined)=0;% put image B to zero (i.e. the min image value) in the undefined  area
 end
 
@@ -1058 +1056 @@
             sizemask=sum(sum(mask1_crop))/(numel(subrange1_y)*numel(subrange1_x));%size of the masked part relative to the correlation sub-image
             if sizemask > 1/2% eliminate point if more than half of the correlation box is masked
-                F(ivec)=3; %
+                F(ivec)=1; %
                 utable(ivec)=NaN;
                 vtable(ivec)=NaN;
@@ -1072 +1070 @@
         end
         %threshold on image minimum
-        if F(ivec)~=3
+        if F(ivec)~=1
             if check_MinIma && (image1_mean < par_civ.MinIma || image2_mean < par_civ.MinIma)
-                F(ivec)=3;
+                F(ivec)=1;
                 %threshold on image maximum
             elseif check_MaxIma && (image1_mean > par_civ.MaxIma || image2_mean > par_civ.MaxIma)
-                F(ivec)=3;
-            end
-            if F(ivec)==3
+                F(ivec)=1;
+            end
+            if F(ivec)==1
                 utable(ivec)=NaN;
                 vtable(ivec)=NaN;
@@ -1134 +1132 @@
                             utable(ivec)=0;
                             vtable(ivec)=0;
-                            F(ivec)=3;
+                            F(ivec)=1;
                         end
                         ctable(ivec)=corrmax/sum_square;% correlation value
                     catch ME
-                        F(ivec)=3;
+                        F(ivec)=1;
                         disp(ME.message)
                     end
                 else
-                    F(ivec)=3;
+                    F(ivec)=1;
                 end
             end