Skip to content
Snippets Groups Projects
Commit 64d4abec authored by Olivier Sauter's avatar Olivier Sauter
Browse files

debug if vol is 'no data' and change prints

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@2638 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 4a379ddb
Branches
Tags
No related merge requests found
...@@ -361,7 +361,7 @@ if strcmp(data_type_eff(1:1),'\') ...@@ -361,7 +361,7 @@ if strcmp(data_type_eff(1:1),'\')
error('in loadTCVdata') error('in loadTCVdata')
end end
else else
index=strmatch(data_type_eff_noext,TCVkeywrdall,'exact') index=strmatch(data_type_eff_noext,TCVkeywrdall,'exact');
if isempty(index) if isempty(index)
disp(' ') disp(' ')
disp('********************') disp('********************')
...@@ -391,6 +391,8 @@ end ...@@ -391,6 +391,8 @@ end
status=ones(1,100); status=ones(1,100);
zmag=cell(0,0); zmag=cell(0,0);
nargineff=nargin; nargineff=nargin;
disp('TCVsiglocation{index} in loadTCVdata')
TCVsiglocation{index}
switch TCVkeywrdcase{index} switch TCVkeywrdcase{index}
...@@ -416,14 +418,14 @@ switch TCVkeywrdcase{index} ...@@ -416,14 +418,14 @@ switch TCVkeywrdcase{index}
end end
if strcmp(TCVsiglocation{index}(1:9),'\psitbx::') if strcmp(TCVsiglocation{index}(1:9),'\psitbx::')
begstr = 'tcv_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') elseif length(TCVsiglocation{index})>16 && strcmp(TCVsiglocation{index}(1:16),'\results::psitbx')
begstr = 'tcv_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::') elseif strcmp(TCVsiglocation{index}(1:10),'\results::')
nodenameeff=[begstr TCVsiglocation{index}(11:end) endstr] nodenameeff=[begstr TCVsiglocation{index}(11:end) endstr];
else else
nodenameeff=TCVsiglocation{index} nodenameeff=TCVsiglocation{index};
disp(['should not have gone through here, mention this example to O. Sauter']); disp(['should not have gone through here, mention this example to O. Sauter']);
end end
tracetdi=tdi(nodenameeff); tracetdi=tdi(nodenameeff);
...@@ -850,7 +852,7 @@ switch TCVkeywrdcase{index} ...@@ -850,7 +852,7 @@ switch TCVkeywrdcase{index}
end end
end end
trace.data=tracetdi.data; trace.data=tracetdi.data;
if isempty(tracetdi.data) if isempty(tracetdi.data) || ischar(tracetdi.data)
trace.x=tracetdi.dim; trace.x=tracetdi.dim;
trace.t=tracetdi.dim; trace.t=tracetdi.dim;
trace.dim=tracetdi.dim; trace.dim=tracetdi.dim;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment