diff --git a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
index 0ded6b689d502c261ea2ab452d872a15192209f9..db0959328b621d6b6be7822b7162e967aa6698b7 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
@@ -57,95 +57,55 @@ if status
         'VT: Vertical Top, UL: Upper Lateral, ML: Middle Lateral, ' ...
         'DIV: Divertor, VB: Vertical bottom. Matches cabling.'];
     
-    ids_bolometer.channel{ii}.identifier = ...
-        bolo_geom.channel{ii}.identifier;
+    ids_bolometer.channel{ii}.identifier = bolo_geom.channel{ii}.identifier;
     ids_bolometer_description.channel{ii}.identifier = ...
         ['RADCAM bolometer system, global index from order in ' ...
         '\results::bolo_u tree'];
     
-    ids_bolometer.channel{ii}.detector.geometry_type= ...
-        bolo_geom.channel{ii}.detector.geometry_type;
-    ids_bolometer.channel{ii}.detector.centre.phi= ...
-        bolo_geom.channel{ii}.detector.centre.phi;
-    ids_bolometer.channel{ii}.detector.centre.r= ...
-        bolo_geom.channel{ii}.detector.centre.r;
-    ids_bolometer.channel{ii}.detector.centre.z= ...
-        bolo_geom.channel{ii}.detector.centre.z;
-    ids_bolometer.channel{ii}.detector.x1_unit_vector.x= ...
-        bolo_geom.channel{ii}.detector.x1_unit_vector.x;
-    ids_bolometer.channel{ii}.detector.x1_unit_vector.y= ...
-        bolo_geom.channel{ii}.detector.x1_unit_vector.y;
-    ids_bolometer.channel{ii}.detector.x1_unit_vector.z= ...
-        bolo_geom.channel{ii}.detector.x1_unit_vector.z;
-    ids_bolometer.channel{ii}.detector.x2_unit_vector.x= ...
-        bolo_geom.channel{ii}.detector.x2_unit_vector.x;
-    ids_bolometer.channel{ii}.detector.x2_unit_vector.y= ...
-        bolo_geom.channel{ii}.detector.x2_unit_vector.y;
-    ids_bolometer.channel{ii}.detector.x2_unit_vector.z= ...
-        bolo_geom.channel{ii}.detector.x2_unit_vector.z;
-    ids_bolometer.channel{ii}.detector.x3_unit_vector.x= ...
-        bolo_geom.channel{ii}.detector.x3_unit_vector.x;
-    ids_bolometer.channel{ii}.detector.x3_unit_vector.y= ...
-        bolo_geom.channel{ii}.detector.x3_unit_vector.y;
-    ids_bolometer.channel{ii}.detector.x3_unit_vector.z= ...
-        bolo_geom.channel{ii}.detector.x3_unit_vector.z;
-    ids_bolometer.channel{ii}.detector.x1_width= ...
-        bolo_geom.channel{ii}.detector.x1_width;
-    ids_bolometer.channel{ii}.detector.x2_width= ...
-        bolo_geom.channel{ii}.detector.x2_width;
-    ids_bolometer.channel{ii}.detector.surface= ...
-        bolo_geom.channel{ii}.detector.surface;
+    ids_bolometer.channel{ii}.detector.geometry_type= bolo_geom.channel{ii}.detector.geometry_type;
+    ids_bolometer.channel{ii}.detector.centre.phi= bolo_geom.channel{ii}.detector.centre.phi;
+    ids_bolometer.channel{ii}.detector.centre.r= bolo_geom.channel{ii}.detector.centre.r;
+    ids_bolometer.channel{ii}.detector.centre.z= bolo_geom.channel{ii}.detector.centre.z;
+    ids_bolometer.channel{ii}.detector.x1_unit_vector.x= bolo_geom.channel{ii}.detector.x1_unit_vector.x;
+    ids_bolometer.channel{ii}.detector.x1_unit_vector.y= bolo_geom.channel{ii}.detector.x1_unit_vector.y;
+    ids_bolometer.channel{ii}.detector.x1_unit_vector.z= bolo_geom.channel{ii}.detector.x1_unit_vector.z;
+    ids_bolometer.channel{ii}.detector.x2_unit_vector.x= bolo_geom.channel{ii}.detector.x2_unit_vector.x;
+    ids_bolometer.channel{ii}.detector.x2_unit_vector.y= bolo_geom.channel{ii}.detector.x2_unit_vector.y;
+    ids_bolometer.channel{ii}.detector.x2_unit_vector.z= bolo_geom.channel{ii}.detector.x2_unit_vector.z;
+    ids_bolometer.channel{ii}.detector.x3_unit_vector.x= bolo_geom.channel{ii}.detector.x3_unit_vector.x;
+    ids_bolometer.channel{ii}.detector.x3_unit_vector.y= bolo_geom.channel{ii}.detector.x3_unit_vector.y;
+    ids_bolometer.channel{ii}.detector.x3_unit_vector.z= bolo_geom.channel{ii}.detector.x3_unit_vector.z;
+    ids_bolometer.channel{ii}.detector.x1_width= bolo_geom.channel{ii}.detector.x1_width;
+    ids_bolometer.channel{ii}.detector.x2_width= bolo_geom.channel{ii}.detector.x2_width;
+    ids_bolometer.channel{ii}.detector.surface= bolo_geom.channel{ii}.detector.surface;
     
-    ids_bolometer.channel{ii}.aperture{1}.geometry_type= ...
-        bolo_geom.channel{ii}.aperture{1}.geometry_type;
-    ids_bolometer.channel{ii}.aperture{1}.centre.r= ...
-        bolo_geom.channel{ii}.aperture{1}.centre.r;
-    ids_bolometer.channel{ii}.aperture{1}.centre.z= ...
-        bolo_geom.channel{ii}.aperture{1}.centre.z;
-    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.x= ...
-        bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.x;
-    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.y= ...
-        bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.y;
-    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.z= ...
-        bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.z;
-    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.x= ...
-        bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.x;
-    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.y= ...
-        bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.y;
-    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.z= ...
-        bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.z;
-    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.x= ...
-        bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.x;
-    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.y= ...
-        bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.y;
-    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.z= ...
-        bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.z;
-    ids_bolometer.channel{ii}.aperture{1}.x1_width= ...
-        bolo_geom.channel{ii}.aperture{1}.x1_width;
-    ids_bolometer.channel{ii}.aperture{1}.x2_width= ...
-        bolo_geom.channel{ii}.aperture{1}.x2_width;
-    ids_bolometer.channel{ii}.aperture{1}.surface= ...
-        bolo_geom.channel{ii}.aperture{1}.surface;
+    ids_bolometer.channel{ii}.aperture{1}.geometry_type= bolo_geom.channel{ii}.aperture{1}.geometry_type;
+    ids_bolometer.channel{ii}.aperture{1}.centre.r= bolo_geom.channel{ii}.aperture{1}.centre.r;
+    ids_bolometer.channel{ii}.aperture{1}.centre.z= bolo_geom.channel{ii}.aperture{1}.centre.z;
+    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.x= bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.x;
+    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.y= bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.y;
+    ids_bolometer.channel{ii}.aperture{1}.x1_unit_vector.z= bolo_geom.channel{ii}.aperture{1}.x1_unit_vector.z;
+    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.x= bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.x;
+    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.y= bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.y;
+    ids_bolometer.channel{ii}.aperture{1}.x2_unit_vector.z= bolo_geom.channel{ii}.aperture{1}.x2_unit_vector.z;
+    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.x= bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.x;
+    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.y= bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.y;
+    ids_bolometer.channel{ii}.aperture{1}.x3_unit_vector.z= bolo_geom.channel{ii}.aperture{1}.x3_unit_vector.z;
+    ids_bolometer.channel{ii}.aperture{1}.x1_width= bolo_geom.channel{ii}.aperture{1}.x1_width;
+    ids_bolometer.channel{ii}.aperture{1}.x2_width= bolo_geom.channel{ii}.aperture{1}.x2_width;
+    ids_bolometer.channel{ii}.aperture{1}.surface= bolo_geom.channel{ii}.aperture{1}.surface;
     
     ids_bolometer.channel{ii}.etendue = bolo_geom.channel{ii}.etendue;
-    ids_bolometer.channel{ii}.etendue_method.name = ...
-        bolo_geom.channel{ii}.etendue_method.name;
-    ids_bolometer.channel{ii}.etendue_method.description = ...
-        bolo_geom.channel{ii}.etendue_method.description;
+    ids_bolometer.channel{ii}.etendue_method.name = bolo_geom.channel{ii}.etendue_method.name;
+    ids_bolometer.channel{ii}.etendue_method.description = bolo_geom.channel{ii}.etendue_method.description;
     
-    ids_bolometer.channel{ii}.line_of_sight.first_point.phi = ...
-        bolo_geom.channel{ii}.line_of_sight.first_point.phi;
-    ids_bolometer.channel{ii}.line_of_sight.first_point.r = ...
-        bolo_geom.channel{ii}.line_of_sight.first_point.r;
-    ids_bolometer.channel{ii}.line_of_sight.first_point.z = ...
-        bolo_geom.channel{ii}.line_of_sight.first_point.z;
+    ids_bolometer.channel{ii}.line_of_sight.first_point.phi = bolo_geom.channel{ii}.line_of_sight.first_point.phi;
+    ids_bolometer.channel{ii}.line_of_sight.first_point.r = bolo_geom.channel{ii}.line_of_sight.first_point.r;
+    ids_bolometer.channel{ii}.line_of_sight.first_point.z = bolo_geom.channel{ii}.line_of_sight.first_point.z;
     
-    ids_bolometer.channel{ii}.line_of_sight.second_point.phi = ...
-        bolo_geom.channel{ii}.line_of_sight.second_point.phi;
-    ids_bolometer.channel{ii}.line_of_sight.second_point.r = ...
-        bolo_geom.channel{ii}.line_of_sight.second_point.r;
-    ids_bolometer.channel{ii}.line_of_sight.second_point.z = ...
-        bolo_geom.channel{ii}.line_of_sight.second_point.z;
+    ids_bolometer.channel{ii}.line_of_sight.second_point.phi = bolo_geom.channel{ii}.line_of_sight.second_point.phi;
+    ids_bolometer.channel{ii}.line_of_sight.second_point.r = bolo_geom.channel{ii}.line_of_sight.second_point.r;
+    ids_bolometer.channel{ii}.line_of_sight.second_point.z = bolo_geom.channel{ii}.line_of_sight.second_point.z;
     
     ids_bolometer.channel{ii}.power.data = bolo_u_intensity.data(ii,:);
     ids_bolometer_description.channel{ii}.power.data = ...