diff --git a/TCV/loadTCVdata.m b/TCV/loadTCVdata.m index 57951a402ee38670324c93588149cb527168fc1b..ef36426759a1dacff6f7afcd4630bc75ace8bb94 100644 --- a/TCV/loadTCVdata.m +++ b/TCV/loadTCVdata.m @@ -116,10 +116,10 @@ end if ~isempty(strmatch(data_type_eff_noext,[{'triangularity'} {'triang'}],'exact')) data_type_eff_noext='delta'; end -if ~isempty(strmatch(data_type_eff_noext,[{'deltaup'} {'deltau'}{'triangtop'} {'triangu'} {'triangup'}],'exact')) +if ~isempty(strmatch(data_type_eff_noext,[{'deltaup'} {'deltau'} {'triangtop'} {'triangu'} {'triangup'}],'exact')) data_type_eff_noext='deltatop'; end -if ~isempty(strmatch(data_type_eff_noext,[{'deltalow'} {'deltal'}{'triangbot'} {'triangl'} {'trianglow'}],'exact')) +if ~isempty(strmatch(data_type_eff_noext,[{'deltalow'} {'deltal'} {'triangbot'} {'triangl'} {'trianglow'}],'exact')) data_type_eff_noext='deltabot'; end if ~isempty(strmatch(data_type_eff_noext,[{'Rmag'}],'exact')) @@ -293,9 +293,9 @@ switch TCVkeywrdcase{index} if eval(['~mdsdata(''node_exists("\' nodenameeff '")'')']) disp(['node ' nodenameeff ' does not exist for shot = ' num2str(shot)]) return - elseif eval(['mdsdata(''getnci("\' nodenameeff ':foo","length")'')==0']) - disp(['no data for node ' nodenameeff ' for shot = ' num2str(shot)]) - return +% $$$ elseif eval(['mdsdata(''getnci("\' nodenameeff ':foo","length")'')==0']) +% $$$ disp(['no data for node ' nodenameeff ' for shot = ' num2str(shot)]) +% $$$ return end tracetdi=tdi(nodenameeff); mdsclose @@ -407,7 +407,7 @@ switch TCVkeywrdcase{index} nodenameeff=['\results::q_psi' liuqe_ext]; tracetdi=tdi(nodenameeff); trace.data=tracetdi.data; - trace.x=sqrt(tracetdi.dim{1}/10); + trace.x=sqrt(tracetdi.dim{1}/(length(tracetdi.dim{1})-1)); trace.t=tracetdi.dim{2}; trace.dim=[{trace.x};{trace.t}]; trace.dimunits=[{'sqrt(psi)'} ; {'time [s]'}];