diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m index 8ed5fdc034db58469d6f94118f3edbd6686ecaa4..1a2510778386586ef3c87fc911bf8e3d209b0ff7 100644 --- a/crpptbx/AUG/gdat_aug.m +++ b/crpptbx/AUG/gdat_aug.m @@ -1951,6 +1951,44 @@ elseif strcmp(mapping_for_aug.method,'switchcase') gdat_data.x = gdat_data.dim{1}; end + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + case {'transp'} + % most of the times the exp for the shotfile should be provided + shotfile_exp_eff = gdat_params.exp_name; + diagname='TRA'; + TRANSP_signals; + for i=1:size(transp_sig,1) + if strcmp(lower(transp_sig{i,2}),'signal') || strcmp(lower(transp_sig{i,2}),'signal-group') + try + eval(['[gdat_data.' transp_sig{i,1} ',e]=rdaAUG_eff(shot,diagname,''' transp_sig{i,1} ''',shotfile_exp_eff);']); + catch + eval(['gdat_data.' transp_sig{i,1} '=[];']); + end + elseif strcmp(lower(transp_sig{i,2}),'area-base') + clear adata_area + try + [adata_area]=sf2ab(diagname,shot,transp_sig{i,1},'-exp',shotfile_exp_eff); + catch + adata_area.value = cell(0); + end + eval(['gdat_data.' transp_sig{i,1} '=adata_area;']); + elseif strcmp(lower(transp_sig{i,2}),'time-base') + clear adata_time + try + [adata_time]=sf2tb(diagname,shot,transp_sig{i,1},'-exp',shotfile_exp_eff); + catch + adata_time.value = cell(0); + end + eval(['gdat_data.' transp_sig{i,1} '=adata_time;']); + end + end + % copy TIME to .t + if isfield(gdat_data,'TIME') && isfield(gdat_data.TIME,'value') + gdat_data.t = gdat_data.TIME.value; + gdat_data.dim{1} = gdat_data.t, + gdat_data.dimunits{1} = gdat_data.TIME.unit; + end + otherwise if (gdat_params.nverbose>=1); warning(['switchcase= ' data_request_eff ' not known in gdat_aug']); end error_status=901; diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m index 0d557599bf837b6fd9ba90a0a5b8d82bb77d5dd1..94704f20f2fb47df8eb5a749409674c6e51f939d 100644 --- a/crpptbx/AUG/loadAUGdata.m +++ b/crpptbx/AUG/loadAUGdata.m @@ -1526,6 +1526,9 @@ switch AUGkeywrdcase{index} case {'transp'} % for TRANSP % LOAD TRA data into substructures shotfile_exp_eff = AUGexplocation{index} + if nargin>=3 & ~isempty(varargin{1}) + shotfile_exp_eff = varargin{1}; + end trace.t=[]; trace.x=[]; ppftype='TRA';