From 5b250c7defe45c6ca7e8868c7a65ba0e17015188 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 15 Mar 2017 17:06:42 +0000
Subject: [PATCH] add transp request in gdat_aug
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7186 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/gdat_aug.m | 38 ++++++++++++++++++++++++++++++++++++++
crpptbx/AUG/loadAUGdata.m | 3 +++
2 files changed, 41 insertions(+)
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 8ed5fdc0..1a251077 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 0d557599..94704f20 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';
--
GitLab