Changeset 384 for trunk/src/find_file_series.m

Timestamp:

Mar 11, 2012, 11:47:21 AM (13 years ago)

Author:

sommeria

Message:

pb with masks corrected
bug in fileparts_uvmat corrected
find_file_series corrected so that it finds the root name corresponding tothe existing xml file : for instance Dalsa1_0001 gives root=Dalsa1 instead of Dalsa
bug corrected in uvmat, runpm (j1 and j2 set to 1 when not visible)

File:

• trunk/src/find_file_series.m (modified) (2 diffs)

trunk/src/find_file_series.m

@@ -63 +63 @@
         RootFile='';
     end
-else   
+else 
+    %% possibly include the first index in the root name, if there exists a   corresponding xml file   
+    NomTypePref='';
+    RootFileNew=RootFile;
+    if ~isempty(regexp(NomType,['^_']))
+        NomTypePref='_';
+        RootFileNew=[RootFileNew '_'];
+    end
+    r=regexp(NomType,['^' NomTypePref '(?<num1>\d+)'],'names');%look for a number at the beginning of NomTypeSt
+    if ~isempty(r)
+        NomTypePref=[NomTypePref r.num1];
+        fileinput_end=regexprep(fileinput,['^' RootFileNew],'');
+        r=regexp(fileinput_end,'^(?<num1>\d+)','names');
+        if ~isempty(r)            
+            RootFileNew=[RootFileNew r.num1];
+        end
+        if exist(fullfile(RootPath,[RootFileNew '.xml']),'file')
+            RootFile=RootFileNew;
+            NomType=regexprep(NomType,['^' NomTypePref],'');
+            i2_input=j2_input;
+            j1_input=[];
+            j2_input=[];
+        end
+    end
     %% analyse the list of existing files when relevant
     sep1='';
@@ -205 +228 @@
     else
         [tild,tild,tild,tild,tild,tild,tild,tild,NomType]=fileparts_uvmat(dirpair(ifile_min).name);% update the representation of indices (number of 0 before the number)
+        NomType=regexprep(NomType,['^' NomTypePref],'');
     end
 end