From 2f2cd93324abc76405da0a804083065f7d1e60d6 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 11 Jan 2002 17:06:01 +0000
Subject: [PATCH] add some data in efit from geteqdskJET
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1856 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/geteqdskJET.m | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/JET/geteqdskJET.m b/JET/geteqdskJET.m
index 3b08e1d4..95495ae4 100644
--- a/JET/geteqdskJET.m
+++ b/JET/geteqdskJET.m
@@ -75,6 +75,7 @@ if iread==1
efitdata.tefit=efitdata.Rbnd.t;
efitdata.Zbnd=gdat(shot,['ppf/' efitlab '/ZBND' s_extra],0,'JET');
efitdata.R0=gdat(shot,['ppf/' efitlab '/RGEO' s_extra],0,'JET');
+ efitdata.a=gdat(shot,['ppf/' efitlab '/CR0' s_extra],0,'JET');
% $$$ efitdata.Z0=gdat(shot,['ppf/' efitlab '/ZO' s_extra],0,'JET');
efitdata.rmag=gdat(shot,['ppf/' efitlab '/rmag' s_extra],0,'JET');
efitdata.zmag=gdat(shot,['ppf/' efitlab '/zmag' s_extra],0,'JET');
@@ -97,9 +98,22 @@ if iread==1
efitdata.xli=gdat(shot,['ppf/' efitlab '/xli' s_extra],0,'JET');
efitdata.sspr=gdat(shot,['ppf/' efitlab '/sspr' s_extra],0,'JET');
efitdata.sspi=gdat(shot,['ppf/' efitlab '/sspi' s_extra],0,'JET');
+ % add for profiles
efitdata.ti=gdat(shot,['ppf/TION/TI' s_extra],0,'JET');
efitdata.pi=gdat(shot,['ppf/NION/DD' s_extra],0,'JET');
efitdata.zef=gdat(shot,['ppf/NION/ZEF' s_extra],0,'JET');
+ % add for calculating NTM parameters
+ ii=findstr('efit',efitlab);
+ efitdata.bpol=gdat(shot,['ppf/equi' efitlab(ii+4:end) '/bpol' s_extra],0,'JET');
+ efitdata.qmag=gdat(shot,['ppf/' efitlab '/qmag' s_extra],0,'JET');
+ efitdata.lidrpe=gdat(shot,['ppf/lidr/pe' s_extra],0,'JET');
+ efitdata.nexav=gdat(shot,['ppf/nex/av' s_extra],0,'JET');
+ efitdata.nbi=gdat(shot,['ppf/nbi/ptot' s_extra],0,'JET');
+ efitdata.icrh=gdat(shot,['ppf/icrh/ptot' s_extra],0,'JET');
+ efitdata.ptot=gdat(shot,['ppf/mg3/yto' s_extra],0,'JET');
+ efitdata.halpha=gdat(shot,['jpf/dd/s3-ad35' s_extra],0,'JET');
+ efitdata.n1=gdat(shot,['jpf/da/c1-g101' s_extra],0,'JET');
+ efitdata.n2=gdat(shot,['jpf/da/c1-g102' s_extra],0,'JET');
end
tefit=efitdata.tefit;
--
GitLab