diff --git a/JET/loadJETdata.m b/JET/loadJETdata.m index 7e8fa359425249a4c31e0b411469ac1d933fb658..34640c3af5ff34cec624e08c0290277be8e2f102 100644 --- a/JET/loadJETdata.m +++ b/JET/loadJETdata.m @@ -143,8 +143,10 @@ if size(data_type_eff,1)==1 end if ~isempty(strmatch(data_type_eff_noext,[{'n1'} {'N1'}],'exact')) data_type_eff_noext='n1'; + end if ~isempty(strmatch(data_type_eff_noext,[{'n2'} {'N2'}],'exact')) data_type_eff_noext='n2'; + end if ~isempty(strmatch(data_type_eff_noext,[{'Rmag'}],'exact')) data_type_eff_noext='rmag'; end @@ -228,8 +230,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.in1)={'jpf'; 'da/c1-g101'}; +JETsiglocation(:,JETsig.in2)={'jpf'; 'da/c1-g102'}; JETsiglocation(:,JETsig.ineint)={'ppf'; 'kg1v/lid3'}; % initialize order of substructures and allows just a "return" if data empty