diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m index 870b175a1116a9d3b76975a4530ada7a4f43fcd5..1d0f0eacdf038126f32788092c52f10b93f28e8e 100644 --- a/JET/loadJETdata.m +++ b/JET/loadJETdata.m @@ -26,8 +26,10 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin) % Special case compatible with old gdat.m allows (JET related): % gdat(51994,'ppf','efit/xip',...) % omitting the 'JET' input as assumes JET if 3rd argument is a string % -% for simplicity also allows: -% gdat(51994,'ppf/efit/xip',1,'JET',....) +% examples: +% aa=gdat(51994,'ppf/efit/xip',1,'JET'); +% aa=gdat(55379,'jpf/di/c1f-chan8/131?type=lpf+diag=kc1f',1); % KC1F +% aa=gdat(53290,'jpf/di/c3-cats<c:001?type=lpf+diag=cats1',0,'JET') % long magnetic 8s by 001, 002, 003, 004 blocks % % INPUT: % shot: shot number diff --git a/JET/rda_eff.m b/JET/rda_eff.m index 07990e2493add26997f2065fbad863dd238376eb..f0c13b85ad467514e204e640017631b7aaf7a678 100644 --- a/JET/rda_eff.m +++ b/JET/rda_eff.m @@ -128,6 +128,14 @@ if usemdsplus taaa=mdsvalue('_ttc91=dim_of(_tc91,0);_ttc91[0]'); time=linspace(taaa+1e-6,taaa+4,length(data))'; end + if isempty(time) & length(data)>1e6 & strcmpi(type,'lpf') & strcmpi(diag,'cats1') + ichannel=findstr(':00',maintrace); + iblock=str2num(maintrace(ichannel+3)); + mdsdisconnect; + mdsconnect('mdsplus.jet.efda.org'); + taaa=40+(iblock-1)*8; + time=linspace(taaa,taaa+8-4e-6,length(data))'; + end case 2 eval(['x=mdsvalue(''dim_of(_rdaeff' user ',0)'');']); eval(['time=mdsvalue(''dim_of(_rdaeff' user ',1)'');']);