diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m index 03feb1f916ae4e1746733fb76d490fbccb575e15..2186635b06e195d9477d8ba7b80f8bafd7019ddd 100644 --- a/crpptbx/TCV/gdat_tcv.m +++ b/crpptbx/TCV/gdat_tcv.m @@ -1093,11 +1093,13 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') return end try + keyboard eval(['[ids_top,ids_top_description]=tcv_get_ids_' ids_top_name '(shot,equil_empty);']) gdat_data.(ids_top_name) = ids_top; gdat_data.([ids_top_name '_description']) = ids_top_description; catch - disp(['check if function: tcv_get_ids_' ids_top_name ' exists in your path']) + disp(['there is a problem with: tcv_get_ids_' ids_top_name ... + ' , may be check if it exists in your path or test it by itself']) gdat_data.(ids_top_name) = struct([]); gdat_data.([ids_top_name '_description']) = struct([]); end diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m index 523bd6ab0b1c8192e8bae84e14221a3557d3b934..bbd82c33be88f28aec5dee70f5e666525baa530c 100644 --- a/crpptbx/TCV_IMAS/tcv_get_ids_tf.m +++ b/crpptbx/TCV_IMAS/tcv_get_ids_tf.m @@ -1,8 +1,22 @@ -function [ids_struct_out] = tcv_get_ids_tf(shot, ids_structures) +function [ids_struct_out,ids_struct_out_description] = tcv_get_ids_tf(shot, ids_struct_in,varargin) +% +% [ids_struct_out] = tcv_get_ids_tf(shot, ids_struct_in,varargin); +% % Get the vacuum toroidal field -ids_struct_out = ids_structures; +% +% ids_struct_in should at least be the empty tf ids structure in input +% + +ids_struct_out = ids_struct_in; tmp = gdat(shot, 'b0'); -ids_struct_out.b_field_tor_vacuum_r.data = tmp.data; -ids_struct_out.b_field_tor_vacuum_r.time = tmp.t; -ids_struct_out.r0 = tmp.r0; \ No newline at end of file +if ~ischar(tmp.data) + ids_struct_out.b_field_tor_vacuum_r.data = tmp.data; + ids_struct_out.b_field_tor_vacuum_r.time = tmp.t; + ids_struct_out.r0 = tmp.r0; + ids_struct_out_description.b_field_tor_vacuum_r.data = ' gdat(shot, ''b0'')'; + ids_struct_out_description.r0 = ' b0.r0 from gdat(shot, ''b0'')'; +else + % leave defaults + ids_struct_out_description = struct([]); +end