diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m index fb06957a26fed94df02b3f0e72393043ce011f46..d81288e13bedc001c6807ddf469a256e51ae4187 100644 --- a/crpptbx/AUG/loadAUGdata.m +++ b/crpptbx/AUG/loadAUGdata.m @@ -52,6 +52,38 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin) % [ip,error]=loadAUGdata(shot,'MAG/Ipi'); % [n2,error]=loadAUGdata(shot,'MOD/EvenNAmp'); % +% List of keywords (can be used in adition to 'DIAG/tracenam'), with comments when not obvious: +% +% Ip : +% b0 : +% zmag : +% rmag : +% rgeo : +% zgeo : +% q0 : +% q95 : +% kappa : +% delta : +% deltatop : +% deltabot : +% neint : +% neterho : +% cxrs : CXRS structure from CEZ with vrot, Ti, ... +% cxrs_rho : same as cxrs but project on rho as well (using 'equil' information) +% equil : equilibrium structure, rhopol, rhotor, rhovol, etc from EQI +% equil_fpp : as equil but from FPP +% equil_eqm : as equil but from EQM +% equil_eqr : as equil but from EQR +% sxr : from SXR/A or B (from old stuff, not sure still OK) +% sxR : from SXR/A or B adding R of chords (from old stuff, not sure still OK) +% sxb : 'SXB/J' chords +% ece : +% eced : +% Halpha : +% pgyro : for each gyrotrons, power, freq, etc (ask for more) +% powers : power traces for each sources +% + varargout={cell(1,1)}; error=1; @@ -901,12 +933,21 @@ switch AUGkeywrdcase{index} trace_all.ecrh1(i) = a; trace_all.pgyro(:,i) = reshape(a.data,nb_timepoints,1); end - tracename_eff = ['f-G' num2str(i)]; - [a,e]=rdaAUG_eff(shot,ppftype,tracename_eff,shotfile_exp_eff); - if isempty(a) || e~=0 + a = sf2par('ECS',shot,'gyr_freq',['P_sy1_g' num2str(i)]); + if isempty(a) else trace_all.freq_ecrh1(i) = a; - trace_all.freq_ech(i) = a.data(1); + trace_all.freq_ech(i) = a.value; + end + a = sf2par('ECS',shot,'GPolPos',['P_sy1_g' num2str(i)]); + if isempty(a) + else + trace_all.polpos_ecs(i) = a.value; + end + a = sf2par('ECS',shot,'GTorPos',['P_sy1_g' num2str(i)]); + if isempty(a) + else + trace_all.torpos_ecs(i) = a.value; end % "new" ECRH2 gyrotrons: gyro 5 to 8 in pgyro tracename_eff = ['PG' num2str(i) 'N']; @@ -916,12 +957,21 @@ switch AUGkeywrdcase{index} trace_all.ecrh2(i) = a; trace_all.pgyro(:,i+4) = reshape(a.data,nb_timepoints,1); end - tracename_eff = ['f-G' num2str(i) 'N']; - [a,e]=rdaAUG_eff(shot,ppftype,tracename_eff,shotfile_exp_eff); - if isempty(a) || e~=0 + a = sf2par('ECS',shot,'gyr_freq',['P_sy2_g' num2str(i)]); + if isempty(a) else trace_all.freq_ecrh2(i) = a; - trace_all.freq_ech(i+4) = a.data(1); + trace_all.freq_ech(i+4) = a.value; + end + a = sf2par('ECS',shot,'GPolPos',['P_sy2_g' num2str(i)]); + if isempty(a) + else + trace_all.polpos_ecs(i+4) = a.value; + end + a = sf2par('ECS',shot,'GTorPos',['P_sy2_g' num2str(i)]); + if isempty(a) + else + trace_all.torpos_ecs(i+4) = a.value; end end if ~isempty(trace_all)