From 00ca901d8a035175bb051b6bcb3988343c654604 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 21 Dec 2001 13:32:55 +0000
Subject: [PATCH] add specifics for '/1 and btpd, btnd
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1852 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/loadJETdata.m | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m
index a17866fe..0b02b05e 100644
--- a/JET/loadJETdata.m
+++ b/JET/loadJETdata.m
@@ -70,6 +70,8 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin)
%
% Example:
% [zmag,error]=loadJETdata(shot,'zmag');
+% [n2,error]=loadJETdata(shot,'jpf/da/c1-g102');
+% [halpha,error]=loadJETdata(shot,'jpf/dd/s3-ad35');
%
varargout={cell(1,1)};
@@ -291,7 +293,31 @@ switch JETkeywrdcase{index}
else
tracename=[JETsiglocation{2,index} name_ext];
end
+ ij=find(tracename~='''');
+ tracename=tracename(ij);
[a,x,t,d,e]=rda_eff(shot,ppftype,tracename);
+ switch tracename
+ case 'efit/btpd?uid=jetppf+seq=0'
+ if isstr(t);
+ disp('t is a string, assumes means btpd not defined');
+ [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
+ [rgeo,x,t,d,e]=rda_eff(shot,'ppf','efit/rgeo');
+ [xip,x3,t3,d,e]=rda_eff(shot,'ppf','efit/xip');
+ a=2.122e6 .* wdia ./xip.^2 ./ rgeo;
+ end
+ case 'efit/btnd?uid=jetppf+seq=0'
+ if isstr(t);
+ disp('t is a string, assumes means btnd not defined');
+ [wdia,x1,t1,d,e]=rda_eff(shot,'ppf','efit/wdia');
+ [rgeo,x,t,d,e]=rda_eff(shot,'ppf','efit/rgeo');
+ [xip,x3,t3,d,e]=rda_eff(shot,'ppf','efit/xip');
+ [cr0,x3,t3,d,e]=rda_eff(shot,'ppf','efit/cr0');
+ [bvac,x3,t3,d,e]=rda_eff(shot,'ppf','efit/bvac');
+ [volm,x3,t3,d,e]=rda_eff(shot,'ppf','efit/volm');
+ a=56.605.*wdia.*cr0.*rgeo./xip./volm./bvac;
+ end
+ end
+
trace.data=a;
trace.x=x;
trace.t=t;
--
GitLab