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

add keyword list for AUG as well and with either gdat empty call or gdat(-9) call

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@4455 d63d8f72-b253-0410-a779-e742ad2e26cf
parent dc10161d
No related branches found
No related tags found
No related merge requests found
...@@ -129,6 +129,8 @@ if size(data_type,1)==1 ...@@ -129,6 +129,8 @@ if size(data_type,1)==1
disp(['more / than expected in tracename: length(i)= ' num2str(length(i))]) disp(['more / than expected in tracename: length(i)= ' num2str(length(i))])
data_type data_type
end end
elseif isempty(data_type)
data_type_eff = ' ';
end end
i_efitm=0; i_efitm=0;
...@@ -391,6 +393,24 @@ AUGexplocation(AUGsig.ieced)={'ECED'}; ...@@ -391,6 +393,24 @@ AUGexplocation(AUGsig.ieced)={'ECED'};
AUGexplocation(AUGsig.ieced_rho)={'ECED'}; AUGexplocation(AUGsig.ieced_rho)={'ECED'};
AUGexplocation(AUGsig.ieced_rmd)={'ECED'}; AUGexplocation(AUGsig.ieced_rmd)={'ECED'};
if shot==-9
clear trace
for i=1:length(AUGkeywrdall)
fieldname_eff = lower(AUGkeywrdall{i});
keyword_eff = AUGkeywrdall{i};
ij=findstr(fieldname_eff,':');
if ~isempty(ij);
fieldname_eff(ij)='_';
keyword_eff(ij:end+1)=[':i' keyword_eff(ij+1:end)] ;
end
trace.(fieldname_eff) = keyword_eff;
end
% add example for Ip trace full call
trace.ipfullcall = 'MAG/Ipa';
% trace.data=[];
return
end
% initialize order of substructures and allows just a "return" if data empty % initialize order of substructures and allows just a "return" if data empty
trace.data=[]; trace.data=[];
trace.x=[]; trace.x=[];
......
...@@ -2,7 +2,9 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin) ...@@ -2,7 +2,9 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
% %
% function [trace,error,varargout] = gdat(shot,data_type,varargin) % function [trace,error,varargout] = gdat(shot,data_type,varargin)
% %
% new: shot=-9 to get keywords relevant for the related experiment % new: no args or with shot=-9 to get keywords relevant for the related experiment
% keywordlist=gdat; (for the default machine)
% keywordlist=gdat(-9,[],'machine'); (for the specific machine)
% %
% list of data_type currently available: % list of data_type currently available:
% %
...@@ -99,6 +101,7 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin) ...@@ -99,6 +101,7 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
% [zmag,error]=gdat(shot,'ppf','efit/zmag',1); as above for JET % [zmag,error]=gdat(shot,'ppf','efit/zmag',1); as above for JET
% %
% keywordlist=gdat(-9,[],[],machine); % to get examples and the keywords defined for the relevant machine % keywordlist=gdat(-9,[],[],machine); % to get examples and the keywords defined for the relevant machine
% keywordlist=gdat; % to get examples and the keywords defined for the local machine
% %
gdatpaths gdatpaths
...@@ -138,6 +141,8 @@ end ...@@ -138,6 +141,8 @@ end
if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
% load data from specified machine % load data from specified machine
if ~exist('data_type'); data_type=[]; end
if ~exist('shot') || isempty(shot); shot=-9; end
if nargineff<=4 if nargineff<=4
eval(['[trace,error,varargout] = load' machine 'data(shot,data_type);']); eval(['[trace,error,varargout] = load' machine 'data(shot,data_type);']);
else else
......
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