Skip to content
Snippets Groups Projects
Commit 8272d873 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

add extra args for AUG gdat call, 4th string is added as is to sf2sig call:...

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
parent 49f9ed41
No related branches found
No related tags found
No related merge requests found
...@@ -273,7 +273,14 @@ if strcmp(mapping_for_aug.method,'signal') ...@@ -273,7 +273,14 @@ if strcmp(mapping_for_aug.method,'signal')
mapping_for_aug.expression{1} = gdat_data.gdat_params.source; mapping_for_aug.expression{1} = gdat_data.gdat_params.source;
end end
gdat_data.gdat_params.exp_name = exp_location; 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 error_status~=0
if gdat_params.nverbose>=3; disp(['error after rdaAUG in signal with data_request_eff= ' data_request_eff]); end if gdat_params.nverbose>=3; disp(['error after rdaAUG in signal with data_request_eff= ' data_request_eff]); end
return return
......
...@@ -94,7 +94,7 @@ else ...@@ -94,7 +94,7 @@ else
if isempty(time_int) if isempty(time_int)
try try
if ~isempty(extra_arg_sf2sig) 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 else
[adata,adata_time, adata_area]=sf2sig(diagname,shot,sigtype,'-exp',shotfile_exp); [adata,adata_time, adata_area]=sf2sig(diagname,shot,sigtype,'-exp',shotfile_exp);
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment