diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 92660f9200a9f96bd38e48ac8816b442df4a3288..a33fbad9b38106317babc7c7a2814fe3b0d44b02 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -3419,8 +3419,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       sxr = rc_load_diodes(shot,'diag_name',"sxr",'channels',gdat_data.x); % since all cameras with different channel number
       gdat_data.data = sxr.data(:,[sxr.channels==gdat_data.x])';
       gdat_data.t = sxr.time;
-      gdat_data.r_x = sxr.geometry.xchord([sxr.channels==gdat_data.x],:);
-      gdat_data.z_x = sxr.geometry.ychord([sxr.channels==gdat_data.x],:);
+
+      gdat_data.r_x = sxr.geometry.xchord(gdat_data.x,:);
+      gdat_data.z_x = sxr.geometry.ychord(gdat_data.x,:);
       gdat_data.good_channels = sxr.good_channels;
       gdat_data.data_fullpath = ['using  rc_load_diodes(shot,''diag_name'',"sxr",...) with params in gdat_data.gdat_params'];
       gdat_data.units = 'au';
@@ -3431,8 +3432,8 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         ij = iround_os(sxr.channels,gdat_data.(gdat_data.gdat_params.camera{i}).x);
         gdat_data.(gdat_data.gdat_params.camera{i}).data = sxr.data(:,ij)';
         gdat_data.(gdat_data.gdat_params.camera{i}).t = sxr.time;
-        gdat_data.(gdat_data.gdat_params.camera{i}).r_x = sxr.geometry.xchord(ij,:);
-        gdat_data.(gdat_data.gdat_params.camera{i}).z_x = sxr.geometry.ychord(ij,:);
+        gdat_data.(gdat_data.gdat_params.camera{i}).r_x = sxr.geometry.xchord(gdat_data.(gdat_data.gdat_params.camera{i}).x,:);
+        gdat_data.(gdat_data.gdat_params.camera{i}).z_x = sxr.geometry.ychord(gdat_data.(gdat_data.gdat_params.camera{i}).x,:);
         gdat_data.(gdat_data.gdat_params.camera{i}).good_channels = intersect(gdat_data.(gdat_data.gdat_params.camera{i}).x,sxr.good_channels);
         gdat_data.(gdat_data.gdat_params.camera{i}).label = sprintf('radcam %s nb chords: %d', ...
           gdat_data.gdat_params.camera{i},numel(gdat_data.(gdat_data.gdat_params.camera{i}).x));