From 0b1fdd5670d0314d735e5b5df8e42314bdb5f494 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 7 Jul 2014 14:55:55 +0000
Subject: [PATCH] add some basic parameters like vol, kappa, deltatop etc
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@4480 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/loadAUGdata.m | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m
index 8a4f122d..3887eb8a 100644
--- a/crpptbx/AUG/loadAUGdata.m
+++ b/crpptbx/AUG/loadAUGdata.m
@@ -251,12 +251,12 @@ if size(data_type_eff,1)==1
if ~isempty(strmatch(data_type_eff_noext,[{'Zgeo'}],'exact'))
data_type_eff_noext='zgeo';
end
- if ~isempty(strmatch(data_type_eff_noext,[{'Rcont'}],'exact'))
- data_type_eff_noext='rcont';
- end
- if ~isempty(strmatch(data_type_eff_noext,[{'Zcont'}],'exact'))
- data_type_eff_noext='zcont';
- end
+% $$$ if ~isempty(strmatch(data_type_eff_noext,[{'Rcont'}],'exact'))
+% $$$ data_type_eff_noext='rcont';
+% $$$ end
+% $$$ if ~isempty(strmatch(data_type_eff_noext,[{'Zcont'}],'exact'))
+% $$$ data_type_eff_noext='zcont';
+% $$$ end
if ~isempty(strmatch(lower(data_type_eff_noext),[{'betan'} {'betn'} {'beta_n'}],'exact'))
data_type_eff_noext='betan';
end
@@ -279,20 +279,20 @@ else
end
% all keywords and corresponding case to run below
-AUGkeywrdall=[{'Ip'} {'b0'} {'zmag'} {'rmag'} {'rgeo'} {'zgeo'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'qrho_fpp'} {'q0'} {'q95'} {'kappa'} ...
+AUGkeywrdall=[{'Ip'} {'b0'} {'zmag'} {'rmag'} {'rgeo'} {'zgeo'} {'vol'} {'qrho'} {'qrho_fpp'} {'q0'} {'q95'} {'kappa'} ...
{'delta'} {'deltatop'} {'deltabot'} {'neint'} {'ne'} {'te'} ...
{'nerho'} {'neterho'} {'terho'} {'cxrs'} {'cxrs_rho'} {'equil'} {'equil_fpp'} {'equil_eqm'} ...
{'equil_eqr'} {'equil_eqh'} {'sxr'} {'sxR'} {'sxb'} {'sxf'} {'ssx_g'} {'ssx_h'} {'ssx_i'} {'ssx_j'} {'ssx'} ...
{'ece'} {'ece_rho'} {'eced'} {'eced_rho'} {'eced_rmd'} {'Halpha'} {'pgyro'} {'powers'} ...
- {'betan'} {'betap'}];
+ {'betan'} {'betap'}]; % rm, not yet implemented: {'rcont'} {'zcont'}
AUGsig.iip=strmatch('Ip',AUGkeywrdall,'exact');
AUGsig.ib0=strmatch('b0',AUGkeywrdall,'exact');
AUGsig.izmag=strmatch('zmag',AUGkeywrdall,'exact');
AUGsig.irmag=strmatch('rmag',AUGkeywrdall,'exact');
AUGsig.irgeo=strmatch('rgeo',AUGkeywrdall,'exact');
AUGsig.izgeo=strmatch('zgeo',AUGkeywrdall,'exact');
-AUGsig.ircont=strmatch('rcont',AUGkeywrdall,'exact');
-AUGsig.izcont=strmatch('zcont',AUGkeywrdall,'exact');
+% $$$ AUGsig.ircont=strmatch('rcont',AUGkeywrdall,'exact');
+% $$$ AUGsig.izcont=strmatch('zcont',AUGkeywrdall,'exact');
AUGsig.ivol=strmatch('vol',AUGkeywrdall,'exact');
AUGsig.iqrho=strmatch('qrho',AUGkeywrdall,'exact');
AUGsig.iqrho_fpp=strmatch('qrho_fpp',AUGkeywrdall,'exact');
@@ -384,14 +384,14 @@ AUGsiglocation(:,AUGsig.izmag)={'FPG'; 'Zmag'};
AUGsiglocation(:,AUGsig.irmag)={'FPG'; 'Rmag'};
AUGsiglocation(:,AUGsig.irgeo)={'FPG'; 'Rgeo'};
AUGsiglocation(:,AUGsig.izgeo)={'FPG'; 'Zgeo'};
-AUGsiglocation(:,AUGsig.ircont)={'' ; ''}; AUGsigtimeindx(AUGsig.ircont)=2;
-AUGsiglocation(:,AUGsig.izcont)={'' ; ''}; AUGsigtimeindx(AUGsig.izcont)=2;
-AUGsiglocation(:,AUGsig.ivol)={''; ''};
+% $$$ AUGsiglocation(:,AUGsig.ircont)={'' ; ''}; AUGsigtimeindx(AUGsig.ircont)=2;
+% $$$ AUGsiglocation(:,AUGsig.izcont)={'' ; ''}; AUGsigtimeindx(AUGsig.izcont)=2;
+AUGsiglocation(:,AUGsig.ivol)={'FPG'; 'Vol'};
AUGsiglocation(:,AUGsig.iq0)={'FPG'; 'q0'};
AUGsiglocation(:,AUGsig.iq95)={'FPG'; 'q95'};
-AUGsiglocation(:,AUGsig.ikappa)={''; ''};
-AUGsiglocation(:,AUGsig.ideltatop)={''; ''};
-AUGsiglocation(:,AUGsig.ideltabot)={''; ''};
+AUGsiglocation(:,AUGsig.ikappa)={'FPG'; 'k'};
+AUGsiglocation(:,AUGsig.ideltatop)={'FPG'; 'delRoben'};
+AUGsiglocation(:,AUGsig.ideltabot)={'FPG'; 'delRuntn'};
AUGsiglocation(:,AUGsig.ibetan)={'TOT'; 'beta_N'};
AUGsiglocation(:,AUGsig.ibetap)={'FPG'; 'betpol'};
AUGsiglocation(:,AUGsig.ineint)={'DCN'; 'H-1'};
--
GitLab