Changeset 768 for trunk/src/series

Timestamp:

May 2, 2014, 10:49:00 PM (11 years ago)

Author:

sommeria

Message:

bug corrected for civ2 with dt2 non equal to Dt1
cleaning of time_series

Location:

trunk/src/series

Files:

• civ_series.m (modified) (5 diffs)
• time_series.m (modified) (3 diffs)

trunk/src/series/civ_series.m

@@ -507 +507 @@
             par_civ2.ImageA=par_civ1.ImageA;
         else
-            [par_civ2.ImageA,VideoObject_A] = read_image(ImageName_A,FileType_A,VideoObject_A,FrameIndex_A_Civ2(ifield));
+            [par_civ2.ImageA,VideoObject_A] = read_image(ImageName_A_Civ2,FileType_A,VideoObject_A,FrameIndex_A_Civ2(ifield));
         end
         ImageName_B_Civ2=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ2(ifield),[],j2_series_Civ2(ifield));
@@ -513 +513 @@
             par_civ2.ImageB=par_civ1.ImageB;
         else
-            [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ2(ifield));
+            [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B_Civ2,FileType_B,VideoObject_B,FrameIndex_B_Civ2(ifield));
         end     
         
@@ -572 +572 @@
         par_civ2.SearchBoxSize(1)=2*ibx2+9;% search ara +-4 pixels around the guess
         par_civ2.SearchBoxSize(2)=2*iby2+9;
-        par_civ2.SearchBoxShift=[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
+        i1=i1_series_Civ2(ifield);
+        i2=i1;
+        if ~isempty(i2_series_Civ2)
+            i2=i2_series_Civ2(ifield);
+        end
+        j1=1;
+        if ~isempty(j1_series_Civ2)
+            j1=j1_series_Civ2(ifield);
+        end
+        j2=j1;
+        if ~isempty(j2_series_Civ1)
+            j2=j2_series_Civ2(ifield);
+        end
+        Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
+        par_civ2.SearchBoxShift=(Civ2_Dt/Data.Civ1_Dt)*[Shiftx(nbval>=1)./nbval(nbval>=1) Shifty(nbval>=1)./nbval(nbval>=1)];
         par_civ2.Grid=[par_civ2.Grid(nbval>=1,1)-par_civ2.SearchBoxShift(:,1)/2 par_civ2.Grid(nbval>=1,2)-par_civ2.SearchBoxShift(:,2)/2];% grid taken at the extrapolated origin of the displacement vectors
         if par_civ2.CheckDeformation
@@ -582 +596 @@
         % caluclate velocity data (y and v in indices, reverse to y component)
         [xtable ytable utable vtable ctable F] = civ (par_civ2);
-
         list_param=(fieldnames(Param.ActionInput.Civ2))';
         Civ2_param=regexprep(list_param,'^.+','Civ2_$0');% insert 'Civ2_' before  each string in list_param
@@ -589 +602 @@
         Data.Civ2_ImageA=ImageName_A;
         Data.Civ2_ImageB=ImageName_B;
-        i1=i1_series_Civ2(ifield);
-        i2=i1;
-        if ~isempty(i2_series_Civ2)
-            i2=i2_series_Civ2(ifield);
-        end
-        j1=1;
-        if ~isempty(j1_series_Civ2)
-            j1=j1_series_Civ2(ifield);
-        end
-        j2=j1;
-        if ~isempty(j2_series_Civ1)
-            j2=j2_series_Civ2(ifield);
-        end
         Data.Civ2_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
-        Data.Civ2_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
+        Data.Civ2_Dt=Civ2_Dt;
 %         Data.Civ2_Time=1;
 %         Data.Civ2_Dt=1;

trunk/src/series/time_series.m

@@ -113 +113 @@
 ImageTypeOptions={'image','multimage','mmreader','video'};
 NcTypeOptions={'netcdf','civx','civdata'};
+FileType=cell(1,nbview);
+FileInfo=cell(1,nbview);
+MovieObject=cell(1,nbview);
+CheckImage=cell(1,nbview);
+CheckNc=cell(1,nbview);
+frame_index=cell(1,nbview);
 for iview=1:nbview
     if ~exist(filecell{iview,1}','file')
@@ -119 +125 @@
     end
     [FileType{iview},FileInfo{iview},MovieObject{iview}]=get_file_type(filecell{iview,1});
+    if strcmp(FileType{iview},'civdata')||strcmp(FileType{iview},'civx')
+        if ~isfield(Param.InputFields,'VelType')
+            FileType{iview}='netcdf';% civ data read as usual netcdf files
+        end
+    end
     CheckImage{iview}=~isempty(find(strcmp(FileType{iview},ImageTypeOptions)));% =1 for images
     CheckNc{iview}=~isempty(find(strcmp(FileType{iview},NcTypeOptions)));% =1 for netcdf files
-    if ~isempty(j1_series{iview})
+    if isempty(j1_series{iview})
+        frame_index{iview}=i1_series{iview};
+    else
         frame_index{iview}=j1_series{iview};
-    else
-        frame_index{iview}=i1_series{iview};
     end
 end
@@ -130 +141 @@
 %% calibration data and timing: read the ImaDoc files
 [XmlData,NbSlice_calib,time,errormsg]=read_multimadoc(RootPath,SubDir,RootFile,FileExt,i1_series,i2_series,j1_series,j2_series);
+if ~isempty(errormsg)
+    disp_uvmat('ERROR',['error in reading xmlfile: ' errormsg],checkrun)
+    return
+end
 if size(time,1)>1
     diff_time=max(max(diff(time)));