diff --git a/crpptbx/TCV/loadTCVdata.m b/crpptbx/TCV/loadTCVdata.m index 02f5cfa7b3b0412837962a54c205e942d7a04c4e..23e423335659ab1d30091b314c323ac75b601077 100644 --- a/crpptbx/TCV/loadTCVdata.m +++ b/crpptbx/TCV/loadTCVdata.m @@ -361,7 +361,7 @@ if strcmp(data_type_eff(1:1),'\') error('in loadTCVdata') end else - index=strmatch(data_type_eff_noext,TCVkeywrdall,'exact') + index=strmatch(data_type_eff_noext,TCVkeywrdall,'exact'); if isempty(index) disp(' ') disp('********************') @@ -391,6 +391,8 @@ end status=ones(1,100); zmag=cell(0,0); nargineff=nargin; +disp('TCVsiglocation{index} in loadTCVdata') +TCVsiglocation{index} switch TCVkeywrdcase{index} @@ -416,14 +418,14 @@ switch TCVkeywrdcase{index} end if strcmp(TCVsiglocation{index}(1:9),'\psitbx::') begstr = 'tcv_psitbx("'; - nodenameeff=[begstr TCVsiglocation{index}(10:end) endstr] + nodenameeff=[begstr TCVsiglocation{index}(10:end) endstr]; elseif length(TCVsiglocation{index})>16 && strcmp(TCVsiglocation{index}(1:16),'\results::psitbx') begstr = 'tcv_psitbx("'; - nodenameeff=[begstr TCVsiglocation{index}(18:end) endstr] + nodenameeff=[begstr TCVsiglocation{index}(18:end) endstr]; elseif strcmp(TCVsiglocation{index}(1:10),'\results::') - nodenameeff=[begstr TCVsiglocation{index}(11:end) endstr] + nodenameeff=[begstr TCVsiglocation{index}(11:end) endstr]; else - nodenameeff=TCVsiglocation{index} + nodenameeff=TCVsiglocation{index}; disp(['should not have gone through here, mention this example to O. Sauter']); end tracetdi=tdi(nodenameeff); @@ -850,7 +852,7 @@ switch TCVkeywrdcase{index} end end trace.data=tracetdi.data; - if isempty(tracetdi.data) + if isempty(tracetdi.data) || ischar(tracetdi.data) trace.x=tracetdi.dim; trace.t=tracetdi.dim; trace.dim=tracetdi.dim;