diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m index b86a199acd90f4482d22b198d499e292f02315a6..421301726668f8c71b53a6a610d7789becb821af 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 15258b79606ad2d476c1210a0944ba4bcc97a6ca..cf97d8837c71db06ffdcb7abce4e48de034ba392 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