From 227d94c32b38960076ad8edab2bb562bf3bf9a7a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Fri, 4 Oct 2019 12:27:03 +0200
Subject: [PATCH] add rhotornorm and rhovolnorm to .fit in gdat nete_rho for
TCV
---
matlab/TCV/gdat_tcv.m | 34 +++++++++++++++++++++++++++-------
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index dc32e856..56d436ce 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1780,10 +1780,16 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
switch gdat_data.gdat_params.fit_type
case 'avg'
def_proffit = '\results::proffit.avg_time:';
+ def_rhotornorm = '\results::proffit:rhotor';
+ def_rhovolnorm = '\results::proffit:rhovol';
case 'local'
def_proffit = '\results::proffit.local_time:';
+ def_rhotornorm = '\results::proffit:rhotor';
+ def_rhovolnorm = '\results::proffit:rhovol';
case 'conf'
def_proffit = '\results::conf:';
+ def_rhotornorm = '\results::conf:rhotor';
+ def_rhovolnorm = '\results::conf:rhovol';
otherwise
if (gdat_params.nverbose>=1);
disp('should not be in switch gdat_data.gdat_params.fit_type')
@@ -1852,13 +1858,24 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
gdat_data.fit.units=tracetdi.units;
end
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
if strcmp(data_request_eff(1:4),'nete')
- gdat_data.fit.ne.data = gdat_data.fit.data;
- 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;
+ for subfields={'data','x','t','units','help','rhotornorm','rhovolnorm','data_fullpath'}
+ gdat_data.fit.ne.(subfields{1}) = gdat_data.fit.(subfields{1});
+ end
+% $$$ gdat_data.fit.ne.data = gdat_data.fit.data;
+% $$$ 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')
nodenameeff = [def_proffit 'te'];
else
@@ -1875,8 +1892,11 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
return
end
end
- gdat_data.fit.te.x = gdat_data.fit.ne.x;
- gdat_data.fit.te.t = gdat_data.fit.ne.t;
+ for subfields={'x','t','help','rhotornorm','rhovolnorm'}
+ 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'))
gdat_data.fit.te.units=tracetdi.units;
end
--
GitLab