From 8272d8734e6459dbc7da7b7b05b430ddf479c67f Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 7 Dec 2017 14:03:02 +0000
Subject: [PATCH] add extra args for AUG gdat call, 4th string is added as is
to sf2sig call:
gdat(shot,{'IDG','Itor','AUGD',['''-ed'',''2'',''-raw''']},'doplot',1);
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@9079 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/gdat_aug.m | 9 ++++++++-
crpptbx/AUG/rdaAUG_eff.m | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index b86a199a..42130172 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -273,7 +273,14 @@ if strcmp(mapping_for_aug.method,'signal')
mapping_for_aug.expression{1} = gdat_data.gdat_params.source;
end
gdat_data.gdat_params.exp_name = exp_location;
- [aatmp,error_status]=rdaAUG_eff(shot,mapping_for_aug.expression{1},mapping_for_aug.expression{2},exp_location);
+ % time interval
+ time_interval = [];
+ % extra args for sf2sig
+ extra_arg_sf2sig = [];
+ if length(mapping_for_aug.expression)>=4 && ~isempty(mapping_for_aug.expression{4})
+ extra_arg_sf2sig = mapping_for_aug.expression{4};
+ end
+ [aatmp,error_status]=rdaAUG_eff(shot,mapping_for_aug.expression{1},mapping_for_aug.expression{2},exp_location,time_interval,extra_arg_sf2sig);
if error_status~=0
if gdat_params.nverbose>=3; disp(['error after rdaAUG in signal with data_request_eff= ' data_request_eff]); end
return
diff --git a/crpptbx/AUG/rdaAUG_eff.m b/crpptbx/AUG/rdaAUG_eff.m
index 15258b79..cf97d883 100644
--- a/crpptbx/AUG/rdaAUG_eff.m
+++ b/crpptbx/AUG/rdaAUG_eff.m
@@ -94,7 +94,7 @@ else
if isempty(time_int)
try
if ~isempty(extra_arg_sf2sig)
- [adata,adata_time, adata_area]=sf2sig(diagname,shot,sigtype,'-exp',shotfile_exp,extra_arg_sf2sig);
+ eval(['[adata,adata_time, adata_area]=sf2sig(diagname,shot,sigtype,''-exp'',shotfile_exp,' extra_arg_sf2sig ');']);
else
[adata,adata_time, adata_area]=sf2sig(diagname,shot,sigtype,'-exp',shotfile_exp);
end
--
GitLab