simplifies structure with varargins

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1815 d63d8f72-b253-0410-a779-e742ad2e26cf

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