add option for fixed R value for sxR using B. Alper values

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

JET/loadJETdata.m

@@ -59,8 +59,10 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin)
 %                                (for traces with many channel, enables to load additional channels,
 %                                 like SXR, ECE, etc.)
 %                  varargin{3}:  zmag for varargout{1} computation
-%                  (can have more inputs for AUG, but not used here)
-%
+%                  varargin{4}, {5} (used by AUG, time interval and skip interval to reduce time points)
+%                  varargin{6}: sxr camera extra option: use to choose R projection: 
+%                               empty or '0'=default (intersection with zmag with 5 degrees)
+%                               '1'=fixed to B. Alper R array (fixed in time)
 %
 % OUTPUT:
 % trace.data:   data structure
@@ -72,6 +74,8 @@ function [trace,error,varargout]=loadJETdata(shot,data_type,varargin)
 %
 % data_type=sxR:
 %                varargout{1}: intersection of the view lines with magnetic axis
+%                              uses 5 degrees and zmag (varargin{3} if given) as default
+%                              if varargin{4}==1, uses B. Alper fixed R array for V camera
 %
 % functions needed: jetreaddata or mdsplus routines
 %
@@ -455,10 +459,14 @@ switch JETkeywrdcase{index}
     %  load JET soft x-ray data 
     % parameters needed for correct convertion of JET Sxr data
     vconvert=   [1.379 1.311 1.249 1.191 1.139 1.093 1.049 ...
-                 1.011 0.975 0.945 0.917 0.893 0.873 0.856 ...
-                 0.842 0.829 0.821 0.815 0.821 0.829 0.842 ...
-                 0.856 0.873 0.894 0.918 0.946 0.976 1.012 ...
-                 1.050 1.094 1.141 1.193 1.251 1.313 1.382];
+          1.011 0.975 0.945 0.917 0.893 0.873 0.856 ...
+          0.842 0.829 0.821 0.815 0.821 0.829 0.842 ...
+          0.856 0.873 0.894 0.918 0.946 0.976 1.012 ...
+          1.050 1.094 1.141 1.193 1.251 1.313 1.382];
+    rconvert= [3.45 3.43 3.41 3.37 3.33 3.28 3.23 3.18 3.14 ...
+          3.09 3.05 3.00 2.94 2.89 2.83 2.77 2.72 2.68 2.63 ...
+          2.59 2.55 2.49 2.44 2.40 2.37 2.33 2.29 2.26 2.23 ...
+          2.19 2.14 2.12 2.10 2.08 2.06];
     if  nargin>=3 & ~isempty(varargin{1})
       starti=varargin{1}(1);
       endi=varargin{1}(2);
@@ -529,7 +537,17 @@ switch JETkeywrdcase{index}
       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));
+        radius.data(i,:)=2.848 + (2.172-zmageff') .* tan(-5.0/180.*3.14159 - atan2(0.99.*(i-18),35.31));
+      end
+      iii=0;
+      if nargin>=8 & ~isempty(varargin{6})
+        iii=str2num(varargin{6});
+      end
+      if iii==1
+        for i=starti:endi
+          radius.data(i,:)=rconvert(i);
+        end
+        disp('uses B. Alper fixed R array for SXR R intersection')
       end
       radius.t=t;
       varargout{1}={radius};