diff --git a/matlab/TCV_IMAS/tcv_get_ids_ec_launchers.m b/matlab/TCV_IMAS/tcv_get_ids_ec_launchers.m
index fd319ab8888956ce63fa7b722778dabbf51d6f69..e6f3b040e8ce238e03ed89f3baaeb51aebaa838a 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_ec_launchers.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_ec_launchers.m
@@ -78,40 +78,30 @@ for iant=1:nb_launchers
     ids_ec_launchers.beam{iant}.frequency.data =[launch_params{iant}{it_ok{iant}(1)}.freq launch_params{iant}{it_ok{iant}(end)}.freq];
     % ids_ec_launchers.beam{iant}.mode.time = [pow.ec.t(1) pow.ec.t(end)];
     % ids_ec_launchers.beam{iant}.mode.data = [-1 -1]; % at this stage assume X mode always, to change when available
-    ids_ec_launchers.beam{iant}.time = [pow.ec.t(1) pow.ec.t(end)];
-    ids_ec_launchers.beam{iant}.data = [-1 -1]; % at this stage assume X mode always, to change when available
+    % ids_ec_launchers.beam{iant}.time = [pow.ec.t(1) pow.ec.t(end)];
+    ids_ec_launchers.beam{iant}.mode = -1; % at this stage assume X mode always, to change when available
     for i=1:length(it_ok{iant})
       r0 = sqrt(launch_params{iant}{it_ok{iant}(i)}.x0.^2 + launch_params{iant}{it_ok{iant}(i)}.y0.^2) / 100.; % in [m]
       time_launch = launch_params{iant}{it_ok{iant}(i)}.time;
       ids_ec_launchers.beam{iant}.launching_position.r(i) = r0;
       ids_ec_launchers.beam{iant}.launching_position.z(i) = launch_params{iant}{it_ok{iant}(i)}.z0/100.;
       ids_ec_launchers.beam{iant}.launching_position.phi(i) = atan2(launch_params{iant}{it_ok{iant}(i)}.y0/100,r0);
-      ids_ec_launchers.beam{iant}.launching_position.time(i) = time_launch;
+      ids_ec_launchers.beam{iant}.time(i) = time_launch;
       kz = cos(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.);
       kmr = -sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*cos(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.);
       kphi = sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*sin(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.); %*sigma_Rphiz (=+1 for TCV cocos=17)
       if (kz==0 && kmr==0)
-        ids_ec_launchers.beam{iant}.steering_angle_pol.data(i) = 0.;
+        ids_ec_launchers.beam{iant}.steering_angle_pol(i) = 0.;
       else
-        ids_ec_launchers.beam{iant}.steering_angle_pol.data(i) = atan2(-kz,kmr);
+        ids_ec_launchers.beam{iant}.steering_angle_pol(i) = atan2(-kz,kmr);
       end
-      ids_ec_launchers.beam{iant}.steering_angle_pol.time(i) = time_launch;
-      ids_ec_launchers.beam{iant}.steering_angle_tor.data(i) = asin(kphi);
-      ids_ec_launchers.beam{iant}.steering_angle_tor.time(i) = time_launch;
-% $$$       ids_ec_launchers.beam{iant}.beam.spot.size.data(i,1) = 0.023;
-% $$$       ids_ec_launchers.beam{iant}.beam.spot.size.data(i,2) = 0.012;
-      ids_ec_launchers.beam{iant}.spot.size.data(1,i) = 0.023;
-      ids_ec_launchers.beam{iant}.spot.size.data(2,i) = 0.012;
-      ids_ec_launchers.beam{iant}.spot.size.time(i) = time_launch;
-      ids_ec_launchers.beam{iant}.spot.angle.data(i) = 0.0;
-      ids_ec_launchers.beam{iant}.spot.angle.time(i) = time_launch;
-% $$$       ids_ec_launchers.beam{iant}.beam.phase.curvature.data(i,1) = 1./1.88;
-% $$$       ids_ec_launchers.beam{iant}.beam.phase.curvature.data(i,2) = 1./-0.95; % negative in launch_params...
-      ids_ec_launchers.beam{iant}.phase.curvature.data(1,i) = 1./1.88;
-      ids_ec_launchers.beam{iant}.phase.curvature.data(2,i) = 1./-0.95; % negative in launch_params...
-      ids_ec_launchers.beam{iant}.phase.angle.data(i) = 0.0;
-      ids_ec_launchers.beam{iant}.phase.angle.time(i) = time_launch;
-      ids_ec_launchers.beam{iant}.phase.curvature.time(i) = time_launch;
+      ids_ec_launchers.beam{iant}.steering_angle_tor(i) = asin(kphi);
+      ids_ec_launchers.beam{iant}.spot.size(1,i) = 0.023;
+      ids_ec_launchers.beam{iant}.spot.size(2,i) = 0.012;
+      ids_ec_launchers.beam{iant}.spot.angle(i) = 0.0;
+      ids_ec_launchers.beam{iant}.phase.curvature(1,i) = 1./1.88;
+      ids_ec_launchers.beam{iant}.phase.curvature(2,i) = 1./-0.95; % negative in launch_params...
+      ids_ec_launchers.beam{iant}.phase.angle(i) = 0.0;
     end
   end
 end