From 0eb56b2e18b91664a870f10d63ffbac75f546adc Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 12 Jun 2015 13:29:34 +0000
Subject: [PATCH] some updates
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@4820 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/gdat.m | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/crpptbx/gdat.m b/crpptbx/gdat.m
index b1da1b4d..825b5635 100644
--- a/crpptbx/gdat.m
+++ b/crpptbx/gdat.m
@@ -6,6 +6,9 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
% keywordlist=gdat; (for the default machine)
% keywordlist=gdat(-9,[],'machine'); (for the specific machine)
%
+% varargin{1}: 0 => no plot (default), 1 => plot (see special case for old JET style below)
+% varargin{2}: machine name 'AUG', 'JET' , 'TCV' (default: depending on where implemented)
+%
% list of data_type currently available:
%
% (almost) All machines
@@ -60,9 +63,6 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
%
% optional arguments valid for all values of data_type (not passed on to loadMACHINEdata function):
%
-% varargin{1}: 0 => no plot (default), 1 => plot
-% varargin{2}: machine name 'AUG', 'JET' , 'TCV' (default: depending on where implemented)
-%
% Additional input arguments for specific traces (passed on to loadMACHINEdata function)
%
% data_type=sxr or ece:
@@ -108,6 +108,8 @@ gdatpaths
nargineff=nargin;
if nargineff>=3 & ischar(varargin{1})
+% $$$ if isempty(strmatch(upper(varargin{1}),[{'TCV'} {'JET'} {'AUG'}]))
+ % old JET way with second part of data structure in varagin{1}
data_type={data_type ; varargin{1}};
if nargineff>=4;
varargin{1}=varargin{2};
@@ -116,6 +118,7 @@ if nargineff>=3 & ischar(varargin{1})
nargineff=4;
end
varargin{2}='JET';
+% $$$ end
end
% SETTING MACHINE
@@ -139,7 +142,7 @@ if ~exist('machine')
end
if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
-
+machine
% load data from specified machine
if ~exist('data_type'); data_type=[]; end
if ~exist('shot') || isempty(shot); shot=-9; end
--
GitLab