From 982e08466f081e03c59a36d1c3bec5360cc2cecb Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Thu, 27 Sep 2001 14:27:27 +0000 Subject: [PATCH] A. Scarabosio changes for sxR, R with correct time_base, like ece git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1827 d63d8f72-b253-0410-a779-e742ad2e26cf --- TCV/loadTCVdata.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/TCV/loadTCVdata.m b/TCV/loadTCVdata.m index e087c941..c74b0183 100644 --- a/TCV/loadTCVdata.m +++ b/TCV/loadTCVdata.m @@ -242,15 +242,20 @@ 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{1}={VsxrTCVradius(zmag.data,xchord,ychord)}; t_1=zmag.t(1); t_2=zmag.t(end); + [xtomo_signal,t]=get_xtomo_data(shot,t_1,t_2,13e-6*16, ... + icamera,angfact); + data=interp1(zmag.t,zmag.data,t'); + radius.t=t'; + radius.data={VsxrTCVradius(data,xchord,ychord)}; + varargout{1}={radius}; else t_1=0.001; t_2=3; - end - [xtomo_signal,t]=get_xtomo_data(shot,t_1,t_2,13e-6*16, ... + [xtomo_signal,t]=get_xtomo_data(shot,t_1,t_2,13e-6*16, ... icamera,angfact); + end end for i=1:(20*icamera*ones(10,1)) trace.t(:,i)=t'; -- GitLab