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

add extra_arg_sf2sig parameter, see help gdat_aug

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@9099 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 8272d873
Branches
Tags
No related merge requests found
...@@ -27,6 +27,7 @@ help_struct_all = struct(... ...@@ -27,6 +27,7 @@ help_struct_all = struct(...
% $$$ help_struct_all.time_interval = ['if provided sets a specific time interval [tstart tend].' ... % $$$ help_struct_all.time_interval = ['if provided sets a specific time interval [tstart tend].' ...
% $$$ char(10) 'cxrs: (time_interval can have several nbs) take data and average over time interval(s) only, plots from CXRS_get_profiles are then provided' ... % $$$ char(10) 'cxrs: (time_interval can have several nbs) take data and average over time interval(s) only, plots from CXRS_get_profiles are then provided' ...
% $$$ ' as well']; % $$$ ' as well'];
help_struct_all.extra_arg_sf2sig = 'extra parameters given to sf2sig type of calls, should be effective full args in one string like extra_arg_sf2sig= ''''''-ed'''',2''';
help_struct_all.fit_tension = ['smoothing value used in interpos fitting routine, -30 means ''30 times default value'', thus -1 often a' ... help_struct_all.fit_tension = ['smoothing value used in interpos fitting routine, -30 means ''30 times default value'', thus -1 often a' ...
' good value' char(10) ... ' good value' char(10) ...
'cxrs, nete: if numeric, default for all cases, if structure, default for non given fields']; 'cxrs, nete: if numeric, default for all cases, if structure, default for non given fields'];
......
This diff is collapsed.
...@@ -5,6 +5,7 @@ function [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,zshift,var ...@@ -5,6 +5,7 @@ function [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,zshift,var
% if shot is a structure assumes obtained from gdat(shot,'equil',...); % if shot is a structure assumes obtained from gdat(shot,'equil',...);
% %
% varargin{1:2}: 'source','EQI' (default) or 'source','IDE' (used in gdat(...,'equil') ) % varargin{1:2}: 'source','EQI' (default) or 'source','IDE' (used in gdat(...,'equil') )
% varargin{3:4}: 'extra_arg_sf2sig','[]' (default) or 'extra_arg_sf2sig','''-ed'',2'
% %
% [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time); % [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time);
% [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,[],'source','IDE'); % [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,[],'source','IDE');
...@@ -32,7 +33,7 @@ else ...@@ -32,7 +33,7 @@ else
zshift_eff = zshift; zshift_eff = zshift;
end end
if nargin >= 5 && ~isempty(varargin{1}) if nargin >= 5 && ~isempty(varargin{1}) && strcmp(lower(varargin{1}),'source')
if ~isempty(varargin{2}) if ~isempty(varargin{2})
equil_source = varargin{2} equil_source = varargin{2}
else else
...@@ -45,8 +46,19 @@ end ...@@ -45,8 +46,19 @@ end
equilpar_source = 'FPG'; equilpar_source = 'FPG';
if strcmp(lower(equil_source),'ide'); equilpar_source = 'IDG'; end if strcmp(lower(equil_source),'ide'); equilpar_source = 'IDG'; end
if nargin >= 7 && ~isempty(varargin{3}) && strcmp(lower(varargin{3}),'extra_arg_sf2sig')
if ~isempty(varargin{4})
extra_arg_sf2sig = varargin{4}
else
disp(['Warning extra_arg_sf2sig in geteqdskAUG not defined']);
return;
end
else
extra_arg_sf2sig = '[]';
end
if isnumeric(shot) if isnumeric(shot)
equil=gdat(shot,'equil','equil',equil_source); equil=gdat(shot,'equil','equil',equil_source,'extra_arg_sf2sig',extra_arg_sf2sig);
else else
equil = shot; equil = shot;
shot = equil.shot; shot = equil.shot;
...@@ -96,10 +108,10 @@ fedge=eqdsk.r0.*eqdsk.b0; ...@@ -96,10 +108,10 @@ fedge=eqdsk.r0.*eqdsk.b0;
F2 = psisign.*2.*F2_05 + fedge.^2; F2 = psisign.*2.*F2_05 + fedge.^2;
eqdsk.F = sqrt(F2)*sign(eqdsk.b0); eqdsk.F = sqrt(F2)*sign(eqdsk.b0);
rmag=gdat(shot,'rmag','source',equilpar_source); rmag=gdat(shot,'rmag','source',equilpar_source,'extra_arg_sf2sig',extra_arg_sf2sig);
[zz itrmag]=min(abs(rmag.t-time_eff)); [zz itrmag]=min(abs(rmag.t-time_eff));
eqdsk.raxis = rmag.data(itrmag); eqdsk.raxis = rmag.data(itrmag);
zmag=gdat(shot,'zmag','source',equilpar_source); zmag=gdat(shot,'zmag','source',equilpar_source,'extra_arg_sf2sig',extra_arg_sf2sig);
eqdsk.zaxis = zmag.data(itrmag) - eqdsk.zshift; eqdsk.zaxis = zmag.data(itrmag) - eqdsk.zshift;
% get plasma boundary % get plasma boundary
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment