From 5acd1eb8b4404d0721a58227b02059dfbd48eb1b Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 23 Apr 2002 14:23:08 +0000
Subject: [PATCH] add lpf diag=kc1f option
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1876 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/rda_eff.m | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/JET/rda_eff.m b/JET/rda_eff.m
index a42d3e9f..07990e24 100644
--- a/JET/rda_eff.m
+++ b/JET/rda_eff.m
@@ -21,7 +21,6 @@ function [data,x,time,hsig,error]=rda_eff(shot,pftype,tracename,varargin);
global usemdsplus
if isempty(usemdsplus); usemdsplus=1; end
-
time_int=[];
if nargin>=4 & ~isempty(varargin{1})
time_int=varargin{1};
@@ -45,6 +44,7 @@ if usemdsplus
uid=[];
seq=[];
diag=[];
+ type=[];
else
maintrace=tracename(1:imaintrace-1);
rest=tracename(imaintrace+1:end);
@@ -72,6 +72,18 @@ if usemdsplus
seq=rest(iseq+4:iseq+ii(1)-2);
end
end
+ % gets type if any
+ itype=findstr('type=',rest);
+ if isempty(itype)
+ type=[];
+ else
+ ii=findstr(separator,rest(itype:end));
+ if isempty(ii)
+ type=rest(itype+5:end);
+ else
+ type=rest(itype+5:itype+ii(1)-2);
+ end
+ end
% gets diag if any
idiag=findstr('diag=',rest);
if isempty(idiag)
@@ -84,13 +96,16 @@ if usemdsplus
diag=rest(idiag+5:idiag+ii(1)-2);
end
end
-
+
end
% fetch value
if ~isempty(uid)
eval(['u=mdsvalue(''_sig=ppfuid("' uid '")'');'])
end
+ if strcmpi(type,'lpf')
+ pftype=[type '/' diag];
+ end
traceeff=[pftype '/' maintrace];
if ~isempty(seq)
traceeff=[traceeff '/' num2str(seq)];
@@ -106,7 +121,13 @@ if usemdsplus
case 1
eval(['time=mdsvalue(''dim_of(_rdaeff' user ',0)'');']);
x=[];
-
+ if isempty(time) & length(data)>1e6 & strcmpi(type,'lpf') & strcmpi(diag,'kc1f')
+ mdsdisconnect;
+ mdsconnect('mdsplus.jet.efda.org');
+ eval(['aaa=mdsvalue(''_tc91=jet("jpf/da/c1-tc91",' num2str(shot) ');1'');'])
+ taaa=mdsvalue('_ttc91=dim_of(_tc91,0);_ttc91[0]');
+ time=linspace(taaa+1e-6,taaa+4,length(data))';
+ end
case 2
eval(['x=mdsvalue(''dim_of(_rdaeff' user ',0)'');']);
eval(['time=mdsvalue(''dim_of(_rdaeff' user ',1)'');']);
--
GitLab