minor fixes

matlab/TCV/gdat_tcv.m

@@ -966,7 +966,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     gdat_data.gdat_params.source = source;
     if isfield(params_eff,'cxrs_time_interval') && ~isempty(params_eff.cxrs_time_interval) && length(params_eff.cxrs_time_interval)>=2
       cxrs_time_interval = params_eff.cxrs_time_interval;
-      cxrs_plot=1;
+      if ~isfield(params_eff,'cxrs_plot')
+        cxrs_plot=1;
+      end
     else
       cxrs_time_interval = [];
     end
@@ -3562,8 +3564,12 @@ gdat_data.x = gdat_data.dim{1};
 gdat_data.t = time;
 gdat_data.system=vertcat(data_tmp.system);
 if status_any,gdat_data.units = data_tmp(isys_ref).units;end
-r_thomson = arrayfun(@(x) x.r_thomson, data_tmp, 'UniformOutput', false);
-gdat_data.r_thomson = vertcat(r_thomson{:});
+if isfield(data_tmp,'r_thomson')
+  r_thomson = arrayfun(@(x) x.r_thomson, data_tmp, 'UniformOutput', false);
+  gdat_data.r_thomson = vertcat(r_thomson{:});
+else
+  gdat_data.r_thomson = [];
+end
 
 % add fir if ne requested
 if strcmp(data_request_eff(1:2),'ne')

matlab/TCV_IMAS/tcv2ids.m

 function [ids_from_tcv,varargout] = tcv2ids(shot,varargin);
 %
-%   [ids_from_tcv,varargout] = tcv2ids(shot,varargin);
+%   [ids_from_tcv,ids_aos] = tcv2ids(shot,varargin);
 %
 % Assumes you have done:
 % >> addpath ~g2osaute/public/matlab9_11_2016 (on the gateway)
@@ -131,4 +131,4 @@ if nargout>=2
     varargout{1} = [];
     disp('problems to fill in varargout')
   end
-end
\ No newline at end of file
+end