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

make fit=1 default in ne_rho and the like, add check if node not empty

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5074 d63d8f72-b253-0410-a779-e742ad2e26cf
parent f1cee46b
No related branches found
No related tags found
No related merge requests found
......@@ -792,8 +792,10 @@ max(zeffshift)
gdat_data.x=rho;
%%%%%%%%%%% add fitted profiles if 'fit'>=1
default_fit_type = 'conf';
if isfield(gdat_data.gdat_params,'fit') && ~isempty(gdat_data.gdat_params.fit) && ...
gdat_data.gdat_params.fit>0
if ~isfield(gdat_data.gdat_params,'fit') || ~isempty(gdat_data.gdat_params.fit)
gdat_data.gdat_params.fit = 1;
end
if gdat_data.gdat_params.fit>0
% default is from proffit:avg_time
if ~(isfield(gdat_data.gdat_params,'fit_type') && ~isempty(gdat_data.gdat_params.fit_type)) || ~any(strcmp(gdat_data.gdat_params.fit_type,{'local', 'avg', 'conf'}))
gdat_data.gdat_params.fit_type = default_fit_type;
......@@ -831,11 +833,23 @@ max(zeffshift)
end
tracetdi=tdi(nodenameeff);
if isempty(trialindx)
gdat_data.fit.data = tracetdi.data;
if ~isempty(tracetdi.data) && ~isempty(tracetdi.dim) && ~ischar(tracetdi.data)
gdat_data.fit.data = tracetdi.data;
else
if nverbose>=1
disp([nodenameeff ' is empty, thus no fits, check hldsi(shot) and may need to run anaprofs?'])
end
gdat_data.fit.data = [];
gdat_data.fit.data_fullpath = [nodenameeff ' is empty'];
return
end
else
if ~isempty(tracetdi.data) && size(tracetdi.data,3)>=trialindx+1
gdat_data.fit.data = tracetdi.data(:,:,trialindx+1);
else
if nverbose>=1
disp([nodenameeff ' with trialindx=' num2str(trialindx) ' is empty, thus no fits, check hldsi(shot) and may need to run anaprofs?'])
end
gdat_data.fit.data = [];
gdat_data.fit.data_fullpath = [nodenameeff ' with trialindx=' num2str(trialindx) ' is empty'];
return
......@@ -883,7 +897,6 @@ max(zeffshift)
gdat_data.fit.data_fullpath = [gdat_data.fit.data_fullpath ' ; ' nodenameeff ' and pe in data'];
end
else
gdat_data.gdat_params.fit = 0;
gdat_data.gdat_params.fit_type = default_fit_type;
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