Changeset 871 for trunk/src/get_file_series.m

Timestamp:

Feb 16, 2015, 12:15:23 AM (9 years ago)

Author:

sommeria

Message:

histo improved

File:

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

trunk/src/get_file_series.m

@@ -60 +60 @@
             Param.IndexRange.PairString={Param.IndexRange.PairString};
         end
-        if ~isempty(Param.IndexRange.PairString{iview,1})
-        r=regexp(Param.IndexRange.PairString{iview,1},'(?<mode>(Di=)|(Dj=)) -*(?<num1>\d+)\|(?<num2>\d+)','names');%look for mode=Dj or Di
-        if isempty(r)
-            r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');%look for burst pairs
-        end
+        if size(Param.IndexRange.PairString,1)>=iview && ~isempty(Param.IndexRange.PairString{iview,1})
+            r=regexp(Param.IndexRange.PairString{iview,1},'(?<mode>(Di=)|(Dj=)) -*(?<num1>\d+)\|(?<num2>\d+)','names');%look for mode=Dj or Di
+            if isempty(r)
+                r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');%look for burst pairs
+            end
         end
         % TODO case of free pairs:
@@ -72 +72 @@
         r(1).num1='';
         r(1).num2='';
-        if isfield (Param.IndexRange,'PairString') && strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
+        if isfield (Param.IndexRange,'PairString') && size(Param.IndexRange.PairString,1)>=iview &&...
+                                                           strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
             r(1).mode='*-*';
         else