add sxR

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1871 d63d8f72-b253-0410-a779-e742ad2e26cf

AUG/loadAUGdata.m

@@ -167,8 +167,8 @@ AUGsigtimeindx=ones(size(AUGkeywrdall));
 AUGsiglocation=cell(2,size(AUGkeywrdall,2));
 AUGsiglocation(:)={''};
 AUGsiglocation(:,AUGsig.iip)={'MAG'; 'Ipi'};
-AUGsiglocation(:,AUGsig.izmag)={''; ''};
-AUGsiglocation(:,AUGsig.irmag)={''; ''};
+AUGsiglocation(:,AUGsig.izmag)={'FPG'; 'Zmag'};
+AUGsiglocation(:,AUGsig.irmag)={'FPG'; 'Rmag'};
 AUGsiglocation(:,AUGsig.ircont)={'' ; ''}; AUGsigtimeindx(AUGsig.ircont)=2;
 AUGsiglocation(:,AUGsig.izcont)={'' ; ''}; AUGsigtimeindx(AUGsig.izcont)=2;
 AUGsiglocation(:,AUGsig.ivol)={''; ''};
@@ -302,20 +302,19 @@ switch AUGkeywrdcase{index}
     trace.units='W/m^2';
     trace.name=[num2str(shot) '/' ppftype '/' tracename];
     % calculating intersection of the view lines with magnetics axis 
-%    if strcmp(data_type_eff_noext,'sxR')
-%      if nargin>=5 & ~isempty(varargin{3})
-%        zmag=varargin{3};
-%      else
-%        zmag=loadAUGdata(shot,'zmag');
-%      end
-%      zmageff=interp1(zmag.t,zmag.data,trace.t);
-%      for i=starti:endi
-%        radius.data(i,:)=2.848 + (2.172-zmageff') .* tan(-4.5/180.*3.14159 - atan2(0.99.*(i-18),35.31));
-%      end
-%      radius.t=t;
-      varargout{1}={struct([])}; 
-      trace.R=[];
-%    end
+    if strcmp(data_type_eff_noext,'sxR')
+      if nargin>=5 & ~isempty(varargin{3})
+        zmag=varargin{3};
+      else
+        zmag=loadAUGdata(shot,'zmag');
+      end
+      zmageff=interp1(zmag.t,zmag.data,trace.t);
+      [R_B, Z_B, ang_B,Rsxr]=sxrbgeometry(zmageff);
+      radius.data=Rsxr;
+      radius.t=trace.t;
+      varargout{1}={radius};
+      trace.R=radius;
+    end
 
   otherwise
     disp('case not yet defined')