From ae5d26c75677a2a0d24c61720f7d59fbeb45570a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 26 Sep 2001 10:07:44 +0000
Subject: [PATCH] minor debugging with varargin and out cell definitions
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1824 d63d8f72-b253-0410-a779-e742ad2e26cf
---
TCV/loadTCVdata.m | 17 +++++++----------
gdat.m | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/TCV/loadTCVdata.m b/TCV/loadTCVdata.m
index 9c4e6fcc..b601d5ca 100644
--- a/TCV/loadTCVdata.m
+++ b/TCV/loadTCVdata.m
@@ -30,7 +30,7 @@
% [zmag,error]=loadTCVdata(shot,'zmag');
%
-varargout=cell(1,1);
+varargout{1}=cell(1,1);
% all keywords and corresponding case to run below
TCVkeywrdall=[{'Ip'} {'zmag'} {'rmag'} {'sxr'} {'sxR'} {'ece'}];
@@ -83,12 +83,12 @@ if nargineff>=3
for i=1:length(varargin)
if ~isempty(varargin{i})
if isstruct(varargin{i})
- zmag=varargin{1};
+ zmag=varargin{i};
elseif size(varargin{i},2)>2
status=varargin{i};
else
- i1 =varargin{2}(1);
- i2 =varargin{2}(2);
+ i1 =varargin{i}(1);
+ i2 =varargin{i}(2);
end
end
end
@@ -139,7 +139,7 @@ switch TCVkeywrdcase{index}
[fans,vangle,xchord,ychord,aomega,angfact]=xtomo_geometry(1,icamera);
% calculating intersection of the view lines with magnetic axis
if strcmp(data_type,'sxR')
- varargout={VsxrTCVradius(zmag.data,xchord,ychord)};
+ varargout{1}={VsxrTCVradius(zmag.data,xchord,ychord)};
t_1=zmag.t(1);
t_2=zmag.t(end);
else
@@ -173,7 +173,7 @@ switch TCVkeywrdcase{index}
trace.data=TE_ECE(a:b,:);
radius.t=trace.t;
radius.data=R(a:b,:);
- varargout={radius};
+ varargout{1}={radius};
error=0;
case 'MPX'
@@ -191,7 +191,7 @@ switch TCVkeywrdcase{index}
end
end
[xchord,ychord]=mpx_geometry;
- varargout={VsxrTCVradius(zmag.data,xchord,ychord)};
+ varargout{1}={VsxrTCVradius(zmag.data,xchord,ychord)};
error=0;
otherwise
@@ -199,6 +199,3 @@ switch TCVkeywrdcase{index}
disp(['this data_type' ' ' data_type ' ' 'not yet programmed in loadTCVdata, ask Andrea.Scarabosio@epfl.ch']);
end
-
-
-
diff --git a/gdat.m b/gdat.m
index e6956d3c..b8e84277 100644
--- a/gdat.m
+++ b/gdat.m
@@ -81,7 +81,7 @@ if (nargineff>=4 & ~isempty(varargin{2})); machine=varargin{2}; end
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(3:end));']);
+ eval(['[trace,error,varargout] = load' machine 'data(shot,data_type,varargin{3:end});']);
end
% PLOT DATA (if required)
--
GitLab