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

add argout in gdat even if crash

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5104 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 14261fc4
No related branches found
No related tags found
No related merge requests found
...@@ -1219,6 +1219,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1219,6 +1219,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case {'sxr', 'mpx'} case {'sxr', 'mpx'}
if strcmp(data_request_eff,'mpx') if strcmp(data_request_eff,'mpx')
data_request_eff = 'mpx'; % mpx chosen through parameter 'source' within 'sxr' data_request_eff = 'mpx'; % mpx chosen through parameter 'source' within 'sxr'
gdat_data.data_request = data_request_eff; gdat_data.data_request = data_request_eff;
......
...@@ -77,6 +77,7 @@ if nargin>2 ...@@ -77,6 +77,7 @@ if nargin>2
end end
end end
gdat_data.data = [];
% construct default parameters structure % construct default parameters structure
gdat_params.data_request = ''; gdat_params.data_request = '';
fusion_machine_defaultname=getenv('FUSION_MACHINE_DEFAULTNAME'); fusion_machine_defaultname=getenv('FUSION_MACHINE_DEFAULTNAME');
...@@ -122,6 +123,7 @@ gdat_path = mfilename('fullpath'); ...@@ -122,6 +123,7 @@ gdat_path = mfilename('fullpath');
eval(['addpath ' gdat_path(1:end-4) upper(machine_eff)]); eval(['addpath ' gdat_path(1:end-4) upper(machine_eff)]);
% copy gdat present call: % copy gdat present call:
gdat_data.gdat_call = [];
if nargin==0 if nargin==0
subcall=['gdat;']; subcall=['gdat;'];
elseif nargin>=1 elseif nargin>=1
...@@ -150,7 +152,15 @@ elseif nargin>=1 ...@@ -150,7 +152,15 @@ elseif nargin>=1
subcall = [subcall ');']; subcall = [subcall ');'];
end end
gdat_data.gdat_call = [subcall ' % nargout = ' num2str(nargout)];
gdat_data.gdat_params = gdat_params;
if ~isfield(gdat_data.gdat_params,'doplot')
gdat_data.gdat_params.doplot = 0;
end
% Note: would need to check nargout to make call consistent, but to avoid this, each gdat_xxx should return at least an empty varargout: varargout{1}=cell(1); % Note: would need to check nargout to make call consistent, but to avoid this, each gdat_xxx should return at least an empty varargout: varargout{1}=cell(1);
% copy subcall here so is last subnode
try try
if nargin==0 if nargin==0
eval(['[gdat_data,gdat_params,error_status,varargout] = gdat_' lower(machine_eff) ';']); eval(['[gdat_data,gdat_params,error_status,varargout] = gdat_' lower(machine_eff) ';']);
...@@ -166,13 +176,6 @@ catch ...@@ -166,13 +176,6 @@ catch
return return
end end
% copy subcall here so is last subnode
gdat_data.gdat_call = [subcall ' % nargout = ' num2str(nargout)];
if ~isfield(gdat_data.gdat_params,'doplot')
gdat_data.gdat_params.doplot = 0;
end
if gdat_data.gdat_params.doplot if gdat_data.gdat_params.doplot
% plot gdat_data versus 1st dim by default, if nb_dims<=2, otherwise do not plot % plot gdat_data versus 1st dim by default, if nb_dims<=2, otherwise do not plot
if length(varargout)==0 || isempty(varargout{1}) if length(varargout)==0 || isempty(varargout{1})
......
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