Changeset 1090 for trunk/src/series

Timestamp:

Jan 21, 2021, 3:59:54 PM (4 years ago)

Author:

sommeria

Message:

system of mirror output path introduced, and series/sliding_average added

Location:

trunk/src/series

Files:

• civ_series.m (modified) (5 diffs)
• merge_proj.m (modified) (2 diffs)
• sliding_average.m (added)

trunk/src/series/civ_series.m

@@ -331 +331 @@
     end
     if CheckInputFile
+        OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
         if iview_A==0 % no nc file has been entered
-            ncfile=fullfile_uvmat(Param.InputTable{1,1},Param.InputTable{1,2},Param.InputTable{1,3},Param.InputTable{1,5},...
+            ncfile=fullfile_uvmat(OutputPath,Param.InputTable{1,2},Param.InputTable{1,3},Param.InputTable{1,5},...
                 NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),j1_series_Civ1(ifield),j2_series_Civ1(ifield));
         else% an existing nc file has been entered
@@ -341 +342 @@
             end
             if strcmp(Param.ActionInput.ListCompareMode,'PIV')
-                ncfile=fullfile_uvmat(RootPath_A,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
+                ncfile=fullfile_uvmat(OutputPath,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i1_series_Civ1(ifield),i2_series_Civ1(ifield),...
                     j1_series_Civ1(ifield),j2_series_Civ1(ifield));
             else
-                ncfile=fullfile_uvmat(RootPath_A,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
+                ncfile=fullfile_uvmat(OutputPath,Civ1Dir,RootFile_A,'.nc',NomTypeNc,i2_series_Civ1(ifield),[],...
                     j1_series_Civ1(ifield),j2_series_Civ1(ifield));
             end
         end
         ncfile_out=ncfile;% by default
+        
         if isfield (Param.ActionInput,'Civ2')
             i1_civ2=i1_series_Civ2(ifield);
@@ -409 +411 @@
                         end
                     end
-                    if ~exist(ImageName_A,'file')
+                    if isempty(regexp(ImageName_A,'(^http://)|(^https://)')) && ~exist(ImageName_A,'file')
                         disp([ImageName_A ' missing'])
                         continue
@@ -425 +427 @@
                         FileType_B=FileInfo_B.FileType;
                     end
-                    if ~exist(ImageName_B,'file')
+                    if isempty(regexp(ImageName_B,'(^http://)|(^https://)')) && ~exist(ImageName_B,'file')
                         disp([ImageName_B ' missing'])
                         continue
@@ -492 +494 @@
                 par_civ1.Mask=mask; %use mask already opened
             else
-                if exist(maskname,'file')
+                if ~isempty(regexp(maskname,'(^http://)|(^https://)'))|| exist(maskname,'file')
                     try
                         par_civ1.Mask=imread(maskname);%update the mask, an store it for future use

trunk/src/series/merge_proj.m

@@ -252 +252 @@
     CheckOverwrite=Param.CheckOverwrite;
 end
+OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device);
 for index=1:NbField
         update_waitbar(WaitbarHandle,index/NbField)
@@ -276 +277 @@
         end
     end
-    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFileOut,FileExtOut,NomTypeOut,i1,i2,j1,j2);
+    OutputFile=fullfile_uvmat(OutputPath,OutputDir,RootFileOut,FileExtOut,NomTypeOut,i1,i2,j1,j2);
     if ~CheckOverwrite && exist(OutputFile,'file')
             disp(['existing output file ' OutputFile ' already exists, skip to next field'])