From bf6c17f1eebf05c2850249456b2620b39fbcb082 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 25 Sep 2001 10:39:07 +0000
Subject: [PATCH] simplifies structure with varargins
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1815 d63d8f72-b253-0410-a779-e742ad2e26cf
---
gdat.m | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/gdat.m b/gdat.m
index 33af288e..1c56ff61 100644
--- a/gdat.m
+++ b/gdat.m
@@ -70,28 +70,20 @@ if nargineff>=3 & ischar(varargin{1})
end
varargin{2}='JET';
end
-
-
% SETTING MACHINE
doplot=0;
if (nargineff>=3 & ~isempty(varargin{1})); doplot=varargin{1}; end
machine='TCV';
if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
-status=ones(1,100);
-if (nargineff>=5 & ~isempty(varargin{3})); status=varargin{3}; end
-index=[];
-if (nargineff>=6 & ~isempty(varargin{4})); index=varargin{4}; end
-zmag=[];
-if (nargineff>=7 & ~isempty(varargin{5})); zmag=varargin{5}; end
% load data from specified machine
-eval(['[trace,error,radius] = load' machine 'data(shot,data_type,status,index,zmag);']);
-
-if (strcmp(data_type,'sxR') | strcmp(data_type,'ece')| strcmp(data_type,'MPX'))
- varargout={radius};
+if nargineff<=2
+ eval(['[trace,error,varargout] = load' machine 'data(shot,data_type);']);
+else
+ eval(['[trace,error,varargout] = load' machine 'data(shot,data_type,varargin);']);
end
-
+
% PLOT DATA (if required)
if doplot==1
figure;zoom on
--
GitLab