diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index 4507ff46c699b506ff6d522d8337280c388e97e6..7f4dd7f1b850f6e70a0201e5b9e3a34402b26e68 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1639,7 +1639,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
 
           % power deposition related:
           ec_data.p_abs_plasma.data = pabs_gyro.data * 1e6;
-          ec_data.p_abs_plasma.data(end+1,:) = sum(ec_data.p_abs_plasma.data,1,'omitnan');
+          ec_data.p_abs_plasma.data(end+1,:) = sum(ec_data.p_abs_plasma.data,1,'omitnan');  % add total
           ec_data.p_abs_plasma.label = [strrep(pabs_gyro.comment,'MW','W') ' ; last index is total'];
           ec_data.p_abs_plasma.units = 'W';
           ec_data.p_abs_plasma.x = launchers_grid;
@@ -1648,21 +1648,21 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
           ec_data.p_abs_plasma.dimunits = {launchers_label, 's'};
           %
           ec_data.p_dens.data = pow_dens.data * 1e6;
-          ec_data.p_dens.data(:,end+1,:) = sum(ec_data.p_dens.data,2,'omitnan');
+          ec_data.p_dens.data(:,end+1,:) = sum(ec_data.p_dens.data,2,'omitnan'); % add total
           ec_data.p_dens.label = [strrep(pow_dens.comment,'MW','W') ' ; last index is total'];
           ec_data.p_dens.units = 'W/m^3';
-          ec_data.p_dens.x = pow_dens.rgrid';
-          ec_data.p_dens.rhotor_norm = ec_data.p_dens.x;
+          ec_data.p_dens.x = pow_dens.rgrid;
+          ec_data.p_dens.grids = pow_dens.grids;
           ec_data.p_dens.t = pow_dens.tgrid;
           ec_data.p_dens.dim = {ec_data.p_dens.x, launchers_grid, ec_data.p_dens.t};
           ec_data.p_dens.dimunits = {'rhotor_norm', launchers_label, 's'};
           %
           ec_data.p_integrated.data = power_integrated.data * 1e6;
-          ec_data.p_integrated.data(:,end+1,:) = sum(ec_data.p_integrated.data,2,'omitnan');
+          ec_data.p_integrated.data(:,end+1,:) = sum(ec_data.p_integrated.data,2,'omitnan');  % add total
           ec_data.p_integrated.label = [strrep(power_integrated.comment,'MW','W') ' ; last index is total'];
           ec_data.p_integrated.units = 'W';
-          ec_data.p_integrated.x = power_integrated.rgrid';
-          ec_data.p_integrated.rhotor_norm = ec_data.p_integrated.x;
+          ec_data.p_integrated.x = power_integrated.rgrid;
+          ec_data.p_integrated.grids = power_integrated.grids;
           ec_data.p_integrated.t = power_integrated.tgrid;
           ec_data.p_integrated.dim = {ec_data.p_integrated.x, launchers_grid, ec_data.p_integrated.t};
           ec_data.p_integrated.dimunits = {'rhotor_norm', launchers_label, 's'};
@@ -1693,7 +1693,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
 
           % current drive deposition related:
           ec_data.cd_tot.data = icdtot.data * 1e6;
-          ec_data.cd_tot.data(end+1,:) = sum(ec_data.cd_tot.data,1,'omitnan');
+          ec_data.cd_tot.data(end+1,:) = sum(ec_data.cd_tot.data,1,'omitnan'); % add total
           ec_data.cd_tot.label = [strrep(icdtot.comment,'MA','A') ' ; last index is total'];
           ec_data.cd_tot.units = 'A';
           ec_data.cd_tot.x = launchers_grid;
@@ -1702,21 +1702,21 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
           ec_data.cd_tot.dimunits = {launchers_label, 's'};
           %
           ec_data.cd_dens.data = currentdrive_dens.data * 1e6;
-          ec_data.cd_dens.data(:,end+1,:) = sum(ec_data.cd_dens.data,2,'omitnan');
+          ec_data.cd_dens.data(:,end+1,:) = sum(ec_data.cd_dens.data,2,'omitnan');  % add total
           ec_data.cd_dens.label = [strrep(currentdrive_dens.comment,'MA','A') ' ; last index is total'];
           ec_data.cd_dens.units = 'A/m^2';
-          ec_data.cd_dens.x = currentdrive_dens.rgrid';
-          ec_data.cd_dens.rhotor_norm = ec_data.cd_dens.x;
+          ec_data.cd_dens.x = currentdrive_dens.rgrid;
+          ec_data.cd_dens.grids = currentdrive_dens.grids;
           ec_data.cd_dens.t = currentdrive_dens.tgrid;
           ec_data.cd_dens.dim = {ec_data.cd_dens.x, launchers_grid, ec_data.cd_dens.t};
           ec_data.cd_dens.dimunits = {'rhotor_norm', launchers_label, 's'};
           %
           ec_data.cd_integrated.data = currentdrive_integrated.data * 1e6;
-          ec_data.cd_integrated.data(:,end+1,:) = sum(ec_data.cd_integrated.data,2,'omitnan');
+          ec_data.cd_integrated.data(:,end+1,:) = sum(ec_data.cd_integrated.data,2,'omitnan'); % add total
           ec_data.cd_integrated.label = [strrep(currentdrive_integrated.comment,'MA','A') ' ; last index is total'];
           ec_data.cd_integrated.units = 'A';
-          ec_data.cd_integrated.x = currentdrive_integrated.rgrid';
-          ec_data.cd_integrated.rhotor_norm = ec_data.cd_integrated.x;
+          ec_data.cd_integrated.x = currentdrive_integrated.rgrid;
+          ec_data.cd_integrated.grids = currentdrive_integrated.grids;
           ec_data.cd_integrated.t = currentdrive_integrated.tgrid;
           ec_data.cd_integrated.dim = {ec_data.cd_integrated.x, launchers_grid, ec_data.cd_integrated.t};
           ec_data.cd_integrated.dimunits = {'rhotor_norm', launchers_label, 's'};
@@ -1746,8 +1746,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
           ec_data.width_cd_dens.dimunits = {'s'};
           %
           ec_data.cd_dens_doublewidth.data = currentdrive_dens_w2.data * 1e6;
+          ec_data.cd_dens_doublewidth.data(:,end+1,:) = sum(ec_data.cd_dens_doublewidth.data,2,'omitnan');  % add total
           ec_data.cd_dens_doublewidth.label = [strrep(currentdrive_dens_w2.comment,'MA','A') ' ; last index is total'];
-          for subfields={'x','rhotor_norm','t','dim','dimunits','units'}
+          for subfields={'x','grids','t','dim','dimunits','units'}
             ec_data.cd_dens_doublewidth.(subfields{1}) = ec_data.cd_dens.(subfields{1});
           end