Skip to content
Snippets Groups Projects
Commit f310a646 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

add sxr choice of camera (B, A, ..)

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1883 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 68129659
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,8 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin) ...@@ -26,6 +26,8 @@ function [trace,error,varargout]=loadAUGdata(shot,data_type,varargin)
% like SXR, ECE, etc.) % like SXR, ECE, etc.)
% varargin{3}: zmag for varargout{1} computation % varargin{3}: zmag for varargout{1} computation
% varargin{4}: time range [t1 t2] (to limit data collected) % 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: % OUTPUT:
% trace.data: data structure % trace.data: data structure
...@@ -301,10 +303,14 @@ switch AUGkeywrdcase{index} ...@@ -301,10 +303,14 @@ switch AUGkeywrdcase{index}
else else
nth=13; nth=13;
end end
if nargin>=8 & ~isempty(varargin{6})
tracename=varargin{6};
else
tracename='B';
end
trace.t=[]; trace.t=[];
trace.x=[]; trace.x=[];
ppftype='SXR'; ppftype='SXR';
tracename='B';
[a,e]=rdaAUG_eff(shot,ppftype,tracename,timerange); [a,e]=rdaAUG_eff(shot,ppftype,tracename,timerange);
trace=a; trace=a;
trace.dim=[{[starti:endi]'} ; {trace.t}]; trace.dim=[{[starti:endi]'} ; {trace.t}];
...@@ -324,7 +330,14 @@ switch AUGkeywrdcase{index} ...@@ -324,7 +330,14 @@ switch AUGkeywrdcase{index}
zmag=loadAUGdata(shot,'zmag'); zmag=loadAUGdata(shot,'zmag');
end end
zmageff=interp1(zmag.t,zmag.data,trace.t); 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.data=Rsxr;
radius.t=trace.t; radius.t=trace.t;
varargout{1}={radius}; varargout{1}={radius};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment