diff --git a/matlab/TCV_IMAS/tcv_ids_bpol_probe.m b/matlab/TCV_IMAS/tcv_ids_bpol_probe.m
index 2cb28fae28b146248cbfd4d7a4ded9bf941f754d..453c94b9a587ea673f9f8a9430e139945f482dc1 100644
--- a/matlab/TCV_IMAS/tcv_ids_bpol_probe.m
+++ b/matlab/TCV_IMAS/tcv_ids_bpol_probe.m
@@ -25,24 +25,17 @@ tmp = gdat_tcv( shot,params_eff);
names = tmp.dim{2};
time = tmp.dim{1};
data = tmp.data;
-params_eff.data_request = 'static("ANG_M")';
-% ang_m = gdat_tcv(shot,params_eff);
-% ang_m_desc = params_eff.data_request;
+ang_m = mdsvalue('static("ANG_M")[$1]',names);
+ang_m_desc = 'from ''static("ANG_M")''';
+r_m = mdsvalue('static("R_M")[$1]',names);
+r_m_desc = 'from ''static("R_M")''';
+z_m = mdsvalue('static("Z_M")[$1]',names);
+z_m_desc = 'from ''static("Z_M")''';
+area = mdsvalue('\magnetics::bpol_003:area');
+area_desc = 'from ''\magnetics::bpol_003_area''';
-%TODO find this either in the static or the magnetics tree.
% from mapping file from Holger:
-probes_name={ '001' '002' '003' '004' '005' '006' '007' '008' '009' '010' '011' '012' '013' '014' '015' '016' '017' '018' '019' ...
- '020' '021' '022' '023' '024' '025' '026' '027' '028' '029' '030' '031' '032' '033' '034' '035' '036' '037' '038'};
-probes_area = [9.200040D-03, 9.126160D-03, 9.163320D-03, 9.158160D-03, 9.147700D-03, 9.141400D-03, 9.155220D-03, 9.160560D-03, 9.058100D-03, ...
- 9.228630D-03, 9.251260D-03, 9.149670D-03, 9.271000D-03, 9.112610D-03, 9.114790D-03, 9.180870D-03, 9.131410D-03, 9.120490D-03, ...
- 9.154670D-03, 9.115670D-03, 9.190590D-03, 9.176150D-03, 9.186540D-03, 9.207520D-03, 9.176340D-03, 9.085060D-03, 9.155950D-03, ...
- 9.135940D-03, 9.112780D-03, 9.059920D-03, 9.316970D-03, 9.114470D-03, 9.132330D-03, 9.086280D-03, 9.122720D-03, 9.045430D-03, ...
- 9.106670D-03, 9.124440D-03];
-probes_length = [2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
- 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
- 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
- 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
- 2.400000D-02, 2.400000D-02];
+probes_length = 2.400000D-02;
% Preallocate output structure
Nprobes = size(tmp.data,2);
@@ -50,26 +43,23 @@ sub_ids_struct_out(1:Nprobes) = ids_structures;
sub_ids_struct_out_description = cell(1,Nprobes);
for ii=1:Nprobes
- sub_ids_struct_out{ii}.name = [names{ii}];
- sub_ids_struct_out_description{ii}.name = [names{ii}];
- sub_ids_struct_out{ii}.position.r = mdsvalue('STATIC("R_M" )[$1]',sub_ids_struct_out{ii}.name);
- sub_ids_struct_out_description{ii}.position_r = ['from ''STATIC("R_M" )[' sub_ids_struct_out{ii}.name ']'''];
- sub_ids_struct_out{ii}.position.z = mdsvalue('STATIC("Z_M" )[$1]',sub_ids_struct_out{ii}.name);
- sub_ids_struct_out_description{ii}.position_z = ['from ''STATIC("Z_M" )[' sub_ids_struct_out{ii}.name ']'''];
+ sub_ids_struct_out{ii}.name = names{ii};
+ sub_ids_struct_out_description{ii}.name = names{ii};
+ sub_ids_struct_out{ii}.position.r = r_m(ii);
+ sub_ids_struct_out_description{ii}.position_r = r_m_desc;
+ sub_ids_struct_out{ii}.position.z = z_m(ii);
+ sub_ids_struct_out_description{ii}.position_z = z_m_desc;
sub_ids_struct_out{ii}.field.data = data(:,ii);
sub_ids_struct_out_description{ii}.field_data = 'from ''\MAGNETICS::BPOL_003''';
sub_ids_struct_out{ii}.field.time = time;
- sub_ids_struct_out{ii}.toroidal_angle = 0.; % to see if should match sector 3 (bpol003)
- params_eff.data_request = ['static("ANG_M")[$1]'',''' sub_ids_struct_out{ii}.name ''];
- aa = gdat_tcv(shot,params_eff);
- sub_ids_struct_out{ii}.poloidal_angle = -aa.data;
- ij=strcmp(names{ii},probes_name);
- sub_ids_struct_out{ii}.area = probes_area(ij);
- sub_ids_struct_out{ii}.length = probes_length(ij);
- sub_ids_struct_out_description{ii}.poloidal_angle = ['from ' aa.data_fullpath];
+ sub_ids_struct_out{ii}.toroidal_angle = 0.;
+ sub_ids_struct_out{ii}.poloidal_angle = -ang_m(ii);
+ sub_ids_struct_out{ii}.area = area(ii);
+ sub_ids_struct_out{ii}.length = probes_length;
+ sub_ids_struct_out_description{ii}.poloidal_angle = ang_m_desc;
sub_ids_struct_out_description{ii}.toroidal_angle = 'set to 0';
- sub_ids_struct_out_description{ii}.area = 'from array in machine description file';
+ sub_ids_struct_out_description{ii}.area = area_desc;
sub_ids_struct_out_description{ii}.length = 'from array in machine description file';
end