diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m index 48cd88d671189db67b09ea5bf61d4700313f7606..c2e4ab03001810dbc08899344e3df3fde564e7e3 100644 --- a/JET/loadJETdata.m +++ b/JET/loadJETdata.m @@ -580,8 +580,8 @@ switch JETkeywrdcase{index} ppftype='ppf'; tracename=['kk3/te' num2str(i,'%2.2d') name_ext]; disp(tracename) - a=which('ppfdat'); - if ~isempty(a) + a=which('ppfread'); + if isempty(a) | ~isempty(name_ext) [a,x,t,d,e]=rda_eff(shot,ppftype,tracename); if isempty(a) & size(trace.data,2)>1 trace.data(i,:)=NaN; @@ -592,14 +592,22 @@ switch JETkeywrdcase{index} if ~isempty(x); trace.x(i,:)=x'; end; error=e; else - [nx, nt, data, x, t, ierr, matlabErr, szErr ] = ... - ppfdat(shot, 'kk3', ['te' num2str(i,'%2.2d')]) + [a,x,t,unitd,unitx,unitt,comment,sequence,e]= ... + ppfread(shot,'KK3',['TE' num2str(i,'%2.2d')]); + if isempty(a) & size(trace.data,2)>1 + trace.data(i,:)=NaN; + else + trace.data(i,:)=a'; + trace.t=t'; + end + if ~isempty(x); trace.x(i,:)=x; end; + error=e; end ppftypeR='ppf'; tracenameR=['kk3/rc' num2str(i,'%2.2d') name_ext]; a=which('ppfdat'); - if ~isempty(a) + if isempty(a) | ~isempty(name_ext) [a,x,t,d,e]=rda_eff(shot,ppftypeR,tracenameR); if isempty(a) & size(trace.data,2)>1 radius.data(i,:)=NaN; @@ -609,6 +617,15 @@ switch JETkeywrdcase{index} radius.x=x; end else + [a,x,t,unitd,unitx,unitt,comment,sequence,e]= ... + ppfread(shot,'KK3',['RC' num2str(i,'%2.2d')]); + if isempty(a) & size(trace.data,2)>1 + radius.data(i,:)=NaN; + else + radius.data(i,:)=a'; + radius.t=t'; + radius.x=x'; + end end end end