diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index 1a46f4d01056f6bc828b1ff3ccd6e19536d55a6c..fda7a801c21e87218c88222b3a80b122f40a79a4 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -369,8 +369,10 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi') if liuqe_matlab==0 && strcmp(mapping_for_tcv.method,'tdiliuqe'); substr_tdi = substr_liuqe; end if iscell(mapping_for_tcv.expression) if length(mapping_for_tcv.expression)>0 + aaa_tmp = regexp(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'}); if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx >= 0 ... - && contains(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'}) + && ~isempty([aaa_tmp{:}]) + % contains(mapping_for_tcv.expression{1},{'toray','conf','ibs','proffit','astra'}) % OS: contains not available in matlab850 ij = findstr(mapping_for_tcv.expression{1},':trial'); if isempty(ij) aa = [mapping_for_tcv.expression{1} ':trial']; @@ -424,8 +426,10 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi') end eval_expr = ['tdi(''' begstr mapping_for_tcv_expression_eff substr_liuqe ''');'] else + aaa_tmp = regexp(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'}); if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx >= 0 ... - && contains(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'}) + && ~isempty([aaa_tmp{:}]) + % contains(mapping_for_tcv.expression,{'toray','conf','ibs','proffit','astra'}) % OS: not available in matlab850 ij = findstr(mapping_for_tcv.expression,':trial'); if isempty(ij) aa = [mapping_for_tcv.expression ':trial'];