From f310a6464365d35579946a50ac84ae334b53d1f6 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 25 Apr 2002 13:16:31 +0000
Subject: [PATCH] add sxr choice of camera (B, A, ..)
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1883 d63d8f72-b253-0410-a779-e742ad2e26cf
---
AUG/loadAUGdata.m | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/AUG/loadAUGdata.m b/AUG/loadAUGdata.m
index 208fa2ef..50ebb6cd 100644
--- a/AUG/loadAUGdata.m
+++ b/AUG/loadAUGdata.m
@@ -26,6 +26,8 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin)
% like SXR, ECE, etc.)
% varargin{3}: zmag for varargout{1} computation
% varargin{4}: time range [t1 t2] (to limit data collected)
+% varargin{5}: nth to keep only nth time points of traces
+% varargin{6}: camera to use: 'B' (default), 'A',
%
% OUTPUT:
% trace.data: data structure
@@ -301,10 +303,14 @@ switch AUGkeywrdcase{index}
else
nth=13;
end
+ if nargin>=8 & ~isempty(varargin{6})
+ tracename=varargin{6};
+ else
+ tracename='B';
+ end
trace.t=[];
trace.x=[];
ppftype='SXR';
- tracename='B';
[a,e]=rdaAUG_eff(shot,ppftype,tracename,timerange);
trace=a;
trace.dim=[{[starti:endi]'} ; {trace.t}];
@@ -324,7 +330,14 @@ switch AUGkeywrdcase{index}
zmag=loadAUGdata(shot,'zmag');
end
zmageff=interp1(zmag.t,zmag.data,trace.t);
- [R_B, Z_B, ang_B,Rsxr]=sxrbgeometry(zmageff);
+ if strcmp(tracename,'B')
+ [R_B, Z_B, ang_B,Rsxr]=sxrbgeometry(zmageff);
+ elseif strcmp(tracename,'A')
+ [R_A, Z_A, ang_A,Rsxr]=sxrageometry(zmageff);
+ else
+ disp(['sxr camera: ' tracename ' not set yet for calculating R projection'])
+ break
+ end
radius.data=Rsxr;
radius.t=trace.t;
varargout{1}={radius};
--
GitLab