diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m index 1d0f0eacdf038126f32788092c52f10b93f28e8e..7e8fa359425249a4c31e0b411469ac1d933fb658 100644 --- a/JET/loadJETdata.m +++ b/JET/loadJETdata.m @@ -13,6 +13,7 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin) % 'delta', 'triang' = edge averaged triangularity vs time % 'deltatop', 'triangtop' = edge upper (top) triangularity vs time % 'deltabot', 'triangbot' = edge lower (bottom) triangularity vs time +% 'n1' or 'n2': n=1 or n=2 MHD signal % 'neint' = line-integrated electron density [m/m^3] % 'ne'= ne raw profile on (R,t). ADD error bars in .std % 'te'= Te raw profile on (R,t). ADD error bars in .std @@ -140,6 +141,10 @@ if size(data_type_eff,1)==1 if ~isempty(strmatch(data_type_eff_noext,[{'deltalow'} {'deltal'} {'triangbot'} {'triangl'} {'trianglow'}],'exact')) data_type_eff_noext='deltabot'; end + if ~isempty(strmatch(data_type_eff_noext,[{'n1'} {'N1'}],'exact')) + data_type_eff_noext='n1'; + if ~isempty(strmatch(data_type_eff_noext,[{'n2'} {'N2'}],'exact')) + data_type_eff_noext='n2'; if ~isempty(strmatch(data_type_eff_noext,[{'Rmag'}],'exact')) data_type_eff_noext='rmag'; end @@ -165,7 +170,7 @@ end % all keywords and corresponding case to run below JETkeywrdall=[{'Ip'} {'zmag'} {'rmag'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'q95'} {'kappa'} ... - {'delta'} {'deltatop'} {'deltabot'} {'neint'} ... + {'delta'} {'deltatop'} {'deltabot'} {'n1'} {'n2'} {'neint'} ... {'ne'} {'te'} {'nerho'} {'terho'} ... {'sxr'} {'sxR'} {'ece'}]; JETsig.iip=strmatch('Ip',JETkeywrdall,'exact'); @@ -180,6 +185,8 @@ JETsig.ikappa=strmatch('kappa',JETkeywrdall,'exact'); JETsig.idelta=strmatch('delta',JETkeywrdall,'exact'); JETsig.ideltatop=strmatch('deltatop',JETkeywrdall,'exact'); JETsig.ideltabot=strmatch('deltabot',JETkeywrdall,'exact'); +JETsig.in1=strmatch('n1',JETkeywrdall,'exact'); +JETsig.in2=strmatch('n2',JETkeywrdall,'exact'); JETsig.ineint=strmatch('neint',JETkeywrdall,'exact'); JETsig.ine=strmatch('ne',JETkeywrdall,'exact'); JETsig.ite=strmatch('te',JETkeywrdall,'exact'); @@ -221,6 +228,8 @@ JETsiglocation(:,JETsig.iq95)={'ppf'; 'efit/q95'}; JETsiglocation(:,JETsig.ikappa)={'ppf'; 'efit/elon'}; JETsiglocation(:,JETsig.ideltatop)={'ppf'; 'efit/triu'}; JETsiglocation(:,JETsig.ideltabot)={'ppf'; 'efit/tril'}; +JETsiglocation(:,JETsig.in1)={'ppf'; 'jpf/da/c1-g101'}; +JETsiglocation(:,JETsig.in2)={'ppf'; 'jpf/da/c1-g102'}; JETsiglocation(:,JETsig.ineint)={'ppf'; 'kg1v/lid3'}; % initialize order of substructures and allows just a "return" if data empty