Changeset 1188 for trunk/src/series

Timestamp:

Dec 11, 2025, 8:45:31 AM (2 months ago)

Author:

sommeria

Message:

file relabeling implemented for civ_series

Location:

trunk/src/series

Files:

• civ_input.m (modified) (5 diffs)
• civ_series.m (modified) (6 diffs)

trunk/src/series/civ_input.m

@@ -163 +163 @@
         MaxIndex_i=find(SeriesData.i1_series{iview_image}(1,2,:),1,'last' )-1;%max ref index i detected in the series (corresponding to the last non-zero value of i1_series)
     else
-        ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
-        ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
-        MinIndex_i=min(find(ref_i))-1;
-        MaxIndex_i=max(find(ref_i))-1;
-        MaxIndex_j=max(find(ref_j))-1;
-        MinIndex_j=min(find(ref_j))-1;
+        
+        if ndims(SeriesData.j1_series{iview_image})==3% usuual file series input
+            ref_i=squeeze(max(SeriesData.i1_series{iview_image}(1,:,:),[],2));% select ref_j index for each ref_i
+            ref_j=squeeze(max(SeriesData.j1_series{iview_image}(1,:,:),[],3));% select ref_i index for each ref_j
+            MinIndex_i=min(find(ref_i))-1;
+            MaxIndex_i=max(find(ref_i))-1;
+            MaxIndex_j=max(find(ref_j))-1;
+            MinIndex_j=min(find(ref_j))-1;
+        else %case with relabeling
+            MinIndex_i=1;
+            MaxIndex_i=numel(SeriesData.i1_series{iview_image});% case relabel
+            MinIndex_j=1;
+            MaxIndex_j=max(1,numel(SeriesData.j1_series{iview_image}));% =1 if j1_series empty
+        end
     end
 end
@@ -176 +184 @@
 time=[];
 TimeUnit='frame'; %default
-CoordUnit='';%default
-pxcm_search=1;
+% CoordUnit='';%default
+% pxcm_search=1;
 if isfield(SeriesData,'Time') &&numel(SeriesData.Time')>=1 && ~isempty(SeriesData.Time{1})
     time=SeriesData.Time{1};
@@ -184 +192 @@
     TimeUnit=Param.IndexRange.TimeUnit;
 end 
-if isfield(SeriesData,'GeometryCalib')
-    tsai=SeriesData.GeometryCalib;
-    if isfield(tsai,'fx_fy')
-        pxcm_search=max(tsai.fx_fy(1),tsai.fx_fy(2));%pixels:cm estimated for the search range
-    end
-    if isfield(tsai,'CoordUnit')
-        CoordUnit=tsai.CoordUnit;
-    end
-end
+% if isfield(SeriesData,'GeometryCalib')
+%     tsai=SeriesData.GeometryCalib;
+%     if isfield(tsai,'fx_fy')
+%         pxcm_search=max(tsai.fx_fy(1),tsai.fx_fy(2));%pixels:cm estimated for the search range
+%     end
+%     if isfield(tsai,'CoordUnit')
+%         CoordUnit=tsai.CoordUnit;
+%     end
+% end
 
 %% timing display
@@ -824 +832 @@
 %reproduce by default the chosen pair in the checkciv2 menu
 set(handles.ListPairCiv2,'Value',get(handles.ListPairCiv1,'Value'))%civ2 selection the same as civ1 by default
-%ListPairCiv2_Callback(hObject, eventdata, handles)
 
 % %------------------------------------------------------------------------
@@ -978 +985 @@
         end
         if index_pair ~=0
-        [tild,indsort]=sort(dt);
+        [~,indsort]=sort(dt);
         displ_pair=displ_pair(indsort);
         displ_pair_dt=displ_pair_dt(indsort);

trunk/src/series/civ_series.m

@@ -256 +256 @@
 
 %% File relabeling documented by the xml file (e.g. PCO)
-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)
-%         currentdir=pwd;
-%     cd(Param.FieldTransform.TransformPath)
-%     transform_fct=str2func(Param.FieldTransform.TransformName);
-%     cd (currentdir)
-% end
+CheckRelabel=isfield(Param.IndexRange,'Relabel' )&& Param.IndexRange.Relabel;%=true for index relabeling (PCO)
 
 %%%%% MAIN LOOP %%%%%%
@@ -291 +282 @@
     OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
     if CheckRelabel
-         RootFileOut=index2filename(Param.FileSeries,1,1,MaxIndex_j);
+         RootFileOut=index2filename(XmlData.FileSeries,1,1,MaxIndex_j);
     else
         RootFileOut=RootFile_A;
@@ -343 +334 @@
                 FrameIndex_A=1;
             elseif CheckRelabel
-            [RootFile,FrameIndex_A]=index2filename(Param.FileSeries,i1_series_Civ1(ifield),j1_series_Civ1(ifield),MaxIndex_j);
-            ImageName_A=fullfile(RootPath_A,SubDir_A,RootFile);
+                [RootFile,FrameIndex_A]=index2filename(XmlData.FileSeries,i1_series_Civ1(ifield),j1_series_Civ1(ifield),MaxIndex_j);
+                ImageName_A=fullfile(RootPath_A,SubDir_A,RootFile);
             else
                 ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(ifield),[],j1_series_Civ1(ifield));
@@ -382 +373 @@
             end
             if CheckRelabel
-                [RootFile,FrameIndex_B]=index2filename(Param.FileSeries,i2_series_Civ1(ifield),j2_series_Civ1(ifield),MaxIndex_j);
+                [RootFile,FrameIndex_B]=index2filename(XmlData.FileSeries,i2_series_Civ1(ifield),j2_series_Civ1(ifield),MaxIndex_j);
                 ImageName_B=fullfile(RootPath_B,SubDir_B,RootFile);
             else
@@ -632 +623 @@
             ImageName_A_Civ2=Param.ActionInput.RefFile;
         elseif CheckRelabel
-            [RootFile,FrameIndex_A_2]=index2filename(Param.FileSeries,i1_series_Civ2(ifield),j1_series_Civ2(ifield),MaxIndex_j);
+            [RootFile,FrameIndex_A_2]=index2filename(XmlData.FileSeries,i1_series_Civ2(ifield),j1_series_Civ2(ifield),MaxIndex_j);
             ImageName_A_Civ2=fullfile(RootPath_A,SubDir_A,RootFile);
         else
@@ -644 +635 @@
         end
         if CheckRelabel
-            [RootFile,FrameIndex_B_2]=index2filename(Param.FileSeries,i2_civ2,j2_civ2,MaxIndex_j);
+            [RootFile,FrameIndex_B_2]=index2filename(XmlData.FileSeries,i2_civ2,j2_civ2,MaxIndex_j);
             ImageName_B_Civ2=fullfile(RootPath_B,SubDir_B,RootFile);
         else