diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m index 2b48d445e45faa0d386ebd6389572690bcf670db..48cd88d671189db67b09ea5bf61d4700313f7606 100644 --- a/JET/loadJETdata.m +++ b/JET/loadJETdata.m @@ -580,25 +580,36 @@ switch JETkeywrdcase{index} ppftype='ppf'; tracename=['kk3/te' num2str(i,'%2.2d') name_ext]; disp(tracename) - [a,x,t,d,e]=rda_eff(shot,ppftype,tracename); - if isempty(a) & size(trace.data,2)>1 - trace.data(i,:)=NaN; + a=which('ppfdat'); + if ~isempty(a) + [a,x,t,d,e]=rda_eff(shot,ppftype,tracename); + 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; else - trace.data(i,:)=a; - trace.t=t; + [nx, nt, data, x, t, ierr, matlabErr, szErr ] = ... + ppfdat(shot, 'kk3', ['te' num2str(i,'%2.2d')]) end - if ~isempty(x); trace.x(i,:)=x'; end; - error=e; + ppftypeR='ppf'; tracenameR=['kk3/rc' num2str(i,'%2.2d') name_ext]; - [a,x,t,d,e]=rda_eff(shot,ppftypeR,tracenameR); - if isempty(a) & size(trace.data,2)>1 - radius.data(i,:)=NaN; - else - radius.data(i,:)=a; - radius.t=t; - radius.x=x; - end + a=which('ppfdat'); + if ~isempty(a) + [a,x,t,d,e]=rda_eff(shot,ppftypeR,tracenameR); + if isempty(a) & size(trace.data,2)>1 + radius.data(i,:)=NaN; + else + radius.data(i,:)=a; + radius.t=t; + radius.x=x; + end + else + end end end trace.dim=[{[starti:endi]'} ; {trace.t}];