Changeset 1178 for trunk/src/series/civ_series.m

Timestamp:

Mar 21, 2025, 10:17:07 AM (4 weeks ago)

Author:

sommeria

Message:

virtual frame indexing introduced

File:

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

trunk/src/series/civ_series.m

@@ -254 +254 @@
     end
 end
+CheckRelabel=isfield(Param,'FileSeries' );%=true for index relabeling (PCO)
 
 %% introduce input image transform
 transform_fct=[];%default, no transform
 if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
-       % addpath(Param.FieldTransform.TransformPath)
         currentdir=pwd;
     cd(Param.FieldTransform.TransformPath)
     transform_fct=str2func(Param.FieldTransform.TransformName);
     cd (currentdir)
-    %rmpath(Param.FieldTransform.TransformPath)
 end
 
@@ -289 +288 @@
     end
     OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
-
+    if CheckRelabel
+         RootFileOut=index2filename(Param.FileSeries,1,1,MaxIndex_j);
+    else
+        RootFileOut=RootFile_A;
+    end
     if strcmp(Param.ActionInput.ListCompareMode,'PIV')
-        ncfile=fullfile_uvmat(OutputPath,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
+        ncfile=fullfile_uvmat(OutputPath,OutputDir,RootFileOut,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
             j1_series_Civ1(ifield),j2_series_Civ1(ifield));
     else
-        ncfile=fullfile_uvmat(OutputPath,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
+        ncfile=fullfile_uvmat(OutputPath,OutputDir,RootFileOut,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
             j1_series_Civ1(ifield),j2_series_Civ1(ifield));
     end
@@ -314 +317 @@
         end
         if strcmp(Param.ActionInput.ListCompareMode,'PIV')
-            ncfile_out=fullfile_uvmat(OutputPath,OutputDir,RootFile_A,'.nc',NomTypeNc,i1_civ2,i2_civ2,j1_civ2,j2_civ2);
+            ncfile_out=fullfile_uvmat(OutputPath,OutputDir,RootFileOut,'.nc',NomTypeNc,i1_civ2,i2_civ2,j1_civ2,j2_civ2);
         else % displacement
-            ncfile_out=fullfile_uvmat(OutputPath,OutputDir,RootFile_A,'.nc',NomTypeNc,i2_civ2,[],j2_civ2);
+            ncfile_out=fullfile_uvmat(OutputPath,OutputDir,RootFileOut,'.nc',NomTypeNc,i2_civ2,[],j2_civ2);
         end
     end
@@ -336 +339 @@
             if strcmp(Param.ActionInput.ListCompareMode,'displacement')
                 ImageName_A=Param.ActionInput.RefFile;
+            elseif CheckRelabel
+            [RootFile,FileIndexString,FrameIndex_A]=index2filename(Param.FileSeries,i1_series_Civ1(ifield),j1_series_Civ1(ifield),MaxIndex_j);
+            ImageName_A=fullfile(RootPath_A,SubDir_A,[RootFile FileIndexString FileExt_A]);
             else
                 ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(ifield),[],j1_series_Civ1(ifield));
+                FrameIndex_A=FrameIndex_A_Civ1(ifield);
             end
             if strcmp(FileExt_A,'.nc')% case of input images in format netcdf
@@ -368 +375 @@
                 end
                 tsart_input=tic;
-                [par_civ1.ImageA,VideoObject_A] = read_image(ImageName_A,FileType_A,VideoObject_A,FrameIndex_A_Civ1(ifield));
+                [par_civ1.ImageA,VideoObject_A] = read_image(ImageName_A,FileType_A,VideoObject_A,FrameIndex_A);
                 time_input=toc(tsart_input);
             end
+if CheckRelabel
+            [RootFile,FileIndexString,FrameIndex_B]=index2filename(Param.FileSeries,i1_series_Civ1(ifield),j1_series_Civ1(ifield),MaxIndex_j);
+            ImageName_B=fullfile(RootPath_B,SubDir_B,[RootFile FileIndexString FileExt_B]);
+else
             ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(ifield),[],j2_series_Civ1(ifield));
+            FrameIndex_B=FrameIndex_B_Civ1(ifield);
+end
             if isempty(FileType_B)% determine the image type for the first field
                 [FileInfo_B,VideoObject_B]=get_file_info(ImageName_B);
@@ -380 +393 @@
                 continue
             end
-            [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ1(ifield));
+            [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B);
             
         catch ME % display errors in reading input images
@@ -613 +626 @@
         if strcmp(Param.ActionInput.ListCompareMode,'displacement')
             ImageName_A_Civ2=Param.ActionInput.RefFile;
-        else
+        elseif CheckRelabel
+              [RootFile,FileIndexString,FrameIndex_A_2]=index2filename(Param.FileSeries,i1_series_Civ2(ifield),j1_series_Civ2(ifield),MaxIndex_j);
+            ImageName_A_Civ2=fullfile(RootPath_A,SubDir_A,[RootFile FileIndexString FileExt_A]);
+            else
             ImageName_A_Civ2=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_civ2,[],j1_civ2);
-        end
-        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A_Civ1(ifield),FrameIndex_A_Civ2(ifield))
+            FrameIndex_A_2=FrameIndex_A_Civ2(ifield);
+        end
+        if strcmp(ImageName_A_Civ2,ImageName_A) && isequal(FrameIndex_A,FrameIndex_A_2)
             par_civ2.ImageA=par_civ1.ImageA;
         else
-            [par_civ2.ImageA,VideoObject_A] = read_image(ImageName_A_Civ2,FileType_A,VideoObject_A,FrameIndex_A_Civ2(ifield));
-        end
+            [par_civ2.ImageA,VideoObject_A] = read_image(ImageName_A_Civ2,FileType_A,VideoObject_A,FrameIndex_A_2);
+        end
+        if CheckRelabel
+              [RootFile,FileIndexString,FrameIndex_B_2]=index2filename(Param.FileSeries,i2_civ2,j2_civ2,MaxIndex_j);
+            ImageName_B_Civ2=fullfile(RootPath_B,SubDir_B,[RootFile FileIndexString FileExt_B]);
+            else
+
+
         ImageName_B_Civ2=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_civ2,[],j2_civ2);
-        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_Civ1(ifield),FrameIndex_B_Civ2)
+        FrameIndex_B_2=FrameIndex_B_Civ2(ifield);
+        end
+        if strcmp(ImageName_B_Civ2,ImageName_B) && isequal(FrameIndex_B_2,FrameIndex_B)
             par_civ2.ImageB=par_civ1.ImageB;
         else
-            [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B_Civ2,FileType_B,VideoObject_B,FrameIndex_B_Civ2(ifield));
+            [par_civ2.ImageB,VideoObject_B] = read_image(ImageName_B_Civ2,FileType_B,VideoObject_B,FrameIndex_B_2);
         end
         %  [FileInfo_A,VideoObject_A]=get_file_info(ImageName_A_Civ2);