From d596662716682a6b6a5c43d5bdee9d7ef41236ec Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 26 Sep 2001 06:45:25 +0000
Subject: [PATCH] first 2 varargin only for gdat
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1818 d63d8f72-b253-0410-a779-e742ad2e26cf
---
gdat.m | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gdat.m b/gdat.m
index 1c56ff61..e6956d3c 100644
--- a/gdat.m
+++ b/gdat.m
@@ -20,12 +20,12 @@ function [trace,error,varargout] = gdat(shot,data_type,varargin)
% shot: shot number
% data_type: type of the required data.( see above)
%
-% optional arguments valid for all values of data_type:
+% 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 'JET', 'TCV' (default)
%
-% Additional input arguments for specific traces
+% Additional input arguments for specific traces (passed on to loadMACHINEdata function)
%
% data_type=sxr or ece:
% varargin{3}: channel status 1= unread yet, 0= read
@@ -78,10 +78,10 @@ machine='TCV';
if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
% load data from specified machine
-if nargineff<=2
+if nargineff<=4
eval(['[trace,error,varargout] = load' machine 'data(shot,data_type);']);
else
- eval(['[trace,error,varargout] = load' machine 'data(shot,data_type,varargin);']);
+ eval(['[trace,error,varargout] = load' machine 'data(shot,data_type,varargin(3:end));']);
end
% PLOT DATA (if required)
--
GitLab