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

add rhotornorm and rhovolnorm to .fit in gdat nete_rho for TCV

parent a6b9b22a
No related branches found
No related tags found
1 merge request!24Add rhotor and small fixes
Pipeline #22201 passed
...@@ -1780,10 +1780,16 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1780,10 +1780,16 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
switch gdat_data.gdat_params.fit_type switch gdat_data.gdat_params.fit_type
case 'avg' case 'avg'
def_proffit = '\results::proffit.avg_time:'; def_proffit = '\results::proffit.avg_time:';
def_rhotornorm = '\results::proffit:rhotor';
def_rhovolnorm = '\results::proffit:rhovol';
case 'local' case 'local'
def_proffit = '\results::proffit.local_time:'; def_proffit = '\results::proffit.local_time:';
def_rhotornorm = '\results::proffit:rhotor';
def_rhovolnorm = '\results::proffit:rhovol';
case 'conf' case 'conf'
def_proffit = '\results::conf:'; def_proffit = '\results::conf:';
def_rhotornorm = '\results::conf:rhotor';
def_rhovolnorm = '\results::conf:rhovol';
otherwise otherwise
if (gdat_params.nverbose>=1); if (gdat_params.nverbose>=1);
disp('should not be in switch gdat_data.gdat_params.fit_type') disp('should not be in switch gdat_data.gdat_params.fit_type')
...@@ -1852,13 +1858,24 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1852,13 +1858,24 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
gdat_data.fit.units=tracetdi.units; gdat_data.fit.units=tracetdi.units;
end end
gdat_data.fit.data_fullpath = nodenameeff; gdat_data.fit.data_fullpath = nodenameeff;
gdat_data.fit.help = '.x is rhopol coordinate';
tmp = tdi(def_rhotornorm);
gdat_data.fit.rhotornorm = tmp.data;
tmp = tdi(def_rhovolnorm);
gdat_data.fit.rhovolnorm = tmp.data;
% do te as well if nete asked for % do te as well if nete asked for
if strcmp(data_request_eff(1:4),'nete') if strcmp(data_request_eff(1:4),'nete')
gdat_data.fit.ne.data = gdat_data.fit.data; for subfields={'data','x','t','units','help','rhotornorm','rhovolnorm','data_fullpath'}
gdat_data.fit.ne.x = gdat_data.fit.x; gdat_data.fit.ne.(subfields{1}) = gdat_data.fit.(subfields{1});
gdat_data.fit.ne.t = gdat_data.fit.t; end
gdat_data.fit.ne.units = gdat_data.fit.units; % $$$ gdat_data.fit.ne.data = gdat_data.fit.data;
gdat_data.fit.ne.data_fullpath = gdat_data.fit.data_fullpath; % $$$ gdat_data.fit.ne.x = gdat_data.fit.x;
% $$$ gdat_data.fit.ne.t = gdat_data.fit.t;
% $$$ gdat_data.fit.ne.units = gdat_data.fit.units;
% $$$ gdat_data.fit.ne.data_fullpath = gdat_data.fit.data_fullpath;
% $$$ gdat_data.fit.ne.help = gdat_data.fit.help;
% $$$ gdat_data.fit.ne.rhotornorm = gdat_data.fit.rhotornorm;
% $$$ gdat_data.fit.ne.rhovolnorm = gdat_data.fit.rhovolnorm;
if strcmp(gdat_data.gdat_params.fit_type,'conf') if strcmp(gdat_data.gdat_params.fit_type,'conf')
nodenameeff = [def_proffit 'te']; nodenameeff = [def_proffit 'te'];
else else
...@@ -1875,8 +1892,11 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') ...@@ -1875,8 +1892,11 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
return return
end end
end end
gdat_data.fit.te.x = gdat_data.fit.ne.x; for subfields={'x','t','help','rhotornorm','rhovolnorm'}
gdat_data.fit.te.t = gdat_data.fit.ne.t; gdat_data.fit.te.(subfields{1}) = gdat_data.fit.ne.(subfields{1});
end
% $$$ gdat_data.fit.te.x = gdat_data.fit.ne.x;
% $$$ gdat_data.fit.te.t = gdat_data.fit.ne.t;
if any(strcmp(fieldnames(tracetdi),'units')) if any(strcmp(fieldnames(tracetdi),'units'))
gdat_data.fit.te.units=tracetdi.units; gdat_data.fit.te.units=tracetdi.units;
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