diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m index 9ef11490be99b0fc1f5345a2143ab734de973eb8..4c32dec1b07ea65b3cbf557d7889e85784a0c10b 100644 --- a/crpptbx/AUG/loadAUGdata.m +++ b/crpptbx/AUG/loadAUGdata.m @@ -8,6 +8,8 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin) % 'sxR' = soft x-ray emission with varargout{1} option (requires varargin{5}!) % 'SXB' = soft x-ray emission from (by default camera J) SXB/J_xx camera (sxb, sxB, etc all work) % 'SXF' = soft x-ray emission from (by default camera J) SXF/I_xx camera (sxf, sxF, etc all work) +% 'SSX_H' = from SSX, H channel, same for G, I, etc +% 'SSX' : gets the SSX_G by default at this stage % % gdat(15133,'MAG/Ipa',1,'AUG') % uses experiment=AUGD shotfiles per default % gdat(15133,'MAG/Ipa',1) (sufficient at AUG since 'AUG' per defaut, same with gdat(15133,'ip',1) @@ -165,6 +167,21 @@ if size(data_type_eff,1)==1 if ~isempty(strmatch(data_type_eff_noext,[{'SXF'} {'sxf'} {'Sxf'} {'sXf'} {'sxf'} {'SXf'}],'exact')) data_type_eff_noext='sxf'; end + if ~isempty(strmatch(lower(data_type_eff_noext),[{'ssx_g'} {'ssx'}],'exact')) + data_type_eff_noext='ssx_g'; + end + if ~isempty(strmatch(lower(data_type_eff_noext),[{'ssx_h'} {'ssx'}],'exact')) + data_type_eff_noext='ssx_h'; + end + if ~isempty(strmatch(lower(data_type_eff_noext),[{'ssx_i'} {'ssx'}],'exact')) + data_type_eff_noext='ssx_i'; + end + if ~isempty(strmatch(lower(data_type_eff_noext),[{'ssx_j'} {'ssx'}],'exact')) + data_type_eff_noext='ssx_j'; + end + if ~isempty(strmatch(lower(data_type_eff_noext),[{'ssx'}],'exact')) + data_type_eff_noext='ssx'; + end if ~isempty(strmatch(data_type_eff_noext,[{'ECE'}],'exact')) data_type_eff_noext='ece'; end @@ -244,7 +261,7 @@ end AUGkeywrdall=[{'Ip'} {'b0'} {'zmag'} {'rmag'} {'rgeo'} {'zgeo'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'qrho_fpp'} {'q0'} {'q95'} {'kappa'} ... {'delta'} {'deltatop'} {'deltabot'} {'neint'} {'ne'} {'te'} ... {'nerho'} {'neterho'} {'terho'} {'cxrs'} {'cxrs_rho'} {'equil'} {'equil_fpp'} {'equil_eqm'} ... - {'equil_eqr'} {'sxr'} {'sxR'} {'sxb'} {'sxf'} {'ece'} {'eced'} {'eced_rmd'} {'Halpha'} {'pgyro'} {'powers'}]; + {'equil_eqr'} {'sxr'} {'sxR'} {'sxb'} {'sxf'} {'ssx_g'} {'ssx_h'} {'ssx_i'} {'ssx_j'} {'ssx'} {'ece'} {'eced'} {'eced_rmd'} {'Halpha'} {'pgyro'} {'powers'}]; AUGsig.iip=strmatch('Ip',AUGkeywrdall,'exact'); AUGsig.ib0=strmatch('b0',AUGkeywrdall,'exact'); AUGsig.izmag=strmatch('zmag',AUGkeywrdall,'exact'); @@ -278,6 +295,11 @@ AUGsig.isxr=strmatch('sxr',AUGkeywrdall,'exact'); AUGsig.isxR=strmatch('sxR',AUGkeywrdall,'exact'); AUGsig.isxb=strmatch('sxb',AUGkeywrdall,'exact'); AUGsig.isxf=strmatch('sxf',AUGkeywrdall,'exact'); +AUGsig.issx_g=strmatch('ssx_g',AUGkeywrdall,'exact'); +AUGsig.issx_h=strmatch('ssx_h',AUGkeywrdall,'exact'); +AUGsig.issx_i=strmatch('ssx_i',AUGkeywrdall,'exact'); +AUGsig.issx_j=strmatch('ssx_j',AUGkeywrdall,'exact'); +AUGsig.issx=strmatch('ssx',AUGkeywrdall,'exact'); AUGsig.iece=strmatch('ece',AUGkeywrdall,'exact'); AUGsig.ieced=strmatch('eced',AUGkeywrdall,'exact'); AUGsig.ieced_rmd=strmatch('eced_rmd',AUGkeywrdall,'exact'); @@ -305,6 +327,11 @@ AUGkeywrdcase(AUGsig.isxr)=AUGkeywrdall(AUGsig.isxr); AUGkeywrdcase(AUGsig.isxR)=AUGkeywrdall(AUGsig.isxR); AUGkeywrdcase(AUGsig.isxb)=AUGkeywrdall(AUGsig.isxb); AUGkeywrdcase(AUGsig.isxf)=AUGkeywrdall(AUGsig.isxf); +AUGkeywrdcase(AUGsig.issx_g)=AUGkeywrdall(AUGsig.issx_g); +AUGkeywrdcase(AUGsig.issx_h)=AUGkeywrdall(AUGsig.issx_h); +AUGkeywrdcase(AUGsig.issx_i)=AUGkeywrdall(AUGsig.issx_i); +AUGkeywrdcase(AUGsig.issx_j)=AUGkeywrdall(AUGsig.issx_j); +AUGkeywrdcase(AUGsig.issx)=AUGkeywrdall(AUGsig.issx); %AUGkeywrdcase(AUGsig.iece)=AUGkeywrdall(AUGsig.iece); AUGkeywrdcase(AUGsig.icxrs)=AUGkeywrdall(AUGsig.icxrs); AUGkeywrdcase(AUGsig.icxrs_rho)=AUGkeywrdall(AUGsig.icxrs_rho); @@ -530,7 +557,7 @@ switch AUGkeywrdcase{index} end %&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& - case {'sxb', 'sxf'} + case {'sxb', 'sxf', 'ssx', 'ssx_g', 'ssx_h', 'ssx_i', 'ssx_j'} % LOAD MULTI CHANNEL DATA SXB/J_0xx (or other than J camera if specified in varargin{8}) % load AUG soft x-ray data @@ -540,6 +567,9 @@ switch AUGkeywrdcase{index} % chords to be loaded starti=varargin{1}(1); endi=varargin{1}(2); + elseif strcmp(AUGkeywrdcase{index}(1:3),'ssx') + starti=1; + endi=60; else starti=52; endi=54; @@ -567,19 +597,30 @@ switch AUGkeywrdcase{index} tracename='J'; elseif strcmp(AUGkeywrdcase{index},'sxf') tracename='I'; + elseif strcmp(AUGkeywrdcase{index},'ssx') + tracename='G'; + elseif strcmp(AUGkeywrdcase{index}(1:4),'ssx_') + tracename=upper(AUGkeywrdcase{index}(5)); else disp('should not be here, ask O. Sauter'); end end trace.t=[]; trace.x=[]; - ppftype=upper(AUGkeywrdcase{index}); + ppftype=upper(AUGkeywrdcase{index}(1:3)); iok=0; for ichord=starti:endi tracename_eff = [tracename '_' num2str(ichord,'%.3d')]; - [a,e]=rdaAUG_eff(shot,ppftype,tracename_eff,shotfile_exp_eff,timerange); + try + [a,e]=rdaAUG_eff(shot,ppftype,tracename_eff,shotfile_exp_eff,timerange); + catch + a = []; + end if isempty(a) || e~=0 - trace_all = struct([]); + if ~exist('trace_all') + trace_all = struct([]); + else + end else if iok==0 trace_all = a;