Skip to content
Snippets Groups Projects
Commit eb36c925 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

add nverbose throughout tcv2ids2database

add timings for cocos transformation for nverbose >=3
parent e06f8840
No related branches found
No related tags found
1 merge request!29add nverbose throughout tcv2ids2database
Pipeline #24488 passed
...@@ -107,7 +107,7 @@ try ...@@ -107,7 +107,7 @@ try
%% Put the field %% Put the field
for i=1:length(ids_names_ok) for i=1:length(ids_names_ok)
ids_to_get = ids_names_ok{i} ids_to_get = ids_names_ok{i};
if occurence <= 0 if occurence <= 0
ids_put(idx,ids_to_get,ids2put.(ids_to_get)); ids_put(idx,ids_to_get,ids2put.(ids_to_get));
else else
......
...@@ -19,6 +19,7 @@ function [ids_from_tcv,varargout] = tcv2ids(shot,varargin); ...@@ -19,6 +19,7 @@ function [ids_from_tcv,varargout] = tcv2ids(shot,varargin);
% 'cocos_out': (default 11) cocos to transform ids from TCV cocos_in=17 to cocos_out % 'cocos_out': (default 11) cocos to transform ids from TCV cocos_in=17 to cocos_out
% 'ipsign_out': if a specific sign fo Ip is desired in output within the cocos_out system (default 0=no specific sign) % 'ipsign_out': if a specific sign fo Ip is desired in output within the cocos_out system (default 0=no specific sign)
% 'b0sign_out': if a specific sign fo B0 is desired in output within the cocos_out system (default 0=no specific sign) % 'b0sign_out': if a specific sign fo B0 is desired in output within the cocos_out system (default 0=no specific sign)
% 'nverbose': (default 1), set it to 3 to have more messages, for example about not fully valid nodes when doing transformation (empty or Nans)
% %
% Outputs % Outputs
% varargout{1}: return also the ids in array of structure with the names, to allow easy use of plotallids % varargout{1}: return also the ids in array of structure with the names, to allow easy use of plotallids
...@@ -34,6 +35,7 @@ p.addOptional('error_bar', 'delta', @(x) isempty(x) || ischar(x) ); % char or ce ...@@ -34,6 +35,7 @@ p.addOptional('error_bar', 'delta', @(x) isempty(x) || ischar(x) ); % char or ce
p.addOptional('cocos_out', 11, @(x) isempty(x) || isnumeric(x) ); % char p.addOptional('cocos_out', 11, @(x) isempty(x) || isnumeric(x) ); % char
p.addOptional('ipsign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char p.addOptional('ipsign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char
p.addOptional('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char p.addOptional('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char
p.addOptional('nverbose', 1, @(x) isempty(x) || isnumeric(x) );
p.parse; p.parse;
defaults_tcv2ids = p.Results; % to keep track of defaults defaults_tcv2ids = p.Results; % to keep track of defaults
...@@ -91,7 +93,7 @@ end ...@@ -91,7 +93,7 @@ end
for i=1:length(params_tcv2ids.ids_names) for i=1:length(params_tcv2ids.ids_names)
ids_to_get = params_tcv2ids.ids_names{i}; ids_to_get = params_tcv2ids.ids_names{i};
tmp = gdat(shot,'ids','source',ids_to_get,'machine','tcv','error_bar',params_tcv2ids.error_bar,'cocos_out',params_tcv2ids.cocos_out, ... tmp = gdat(shot,'ids','source',ids_to_get,'machine','tcv','error_bar',params_tcv2ids.error_bar,'cocos_out',params_tcv2ids.cocos_out, ...
'b0sign_out',params_tcv2ids.b0sign_out,'ipsign_out',params_tcv2ids.ipsign_out); 'b0sign_out',params_tcv2ids.b0sign_out,'ipsign_out',params_tcv2ids.ipsign_out,'nverbose',params_tcv2ids.nverbose);
ids_from_tcv.(ids_to_get) = tmp.(ids_to_get); ids_from_tcv.(ids_to_get) = tmp.(ids_to_get);
ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']); ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']);
end end
......
...@@ -53,6 +53,7 @@ p.addOptional('tree_majorversion', '3', @(x) isempty(x) || ischar(x) ); % char ...@@ -53,6 +53,7 @@ p.addOptional('tree_majorversion', '3', @(x) isempty(x) || ischar(x) ); % char
p.addOptional('cocos_out', 11, @(x) isempty(x) || isnumeric(x) ); % char p.addOptional('cocos_out', 11, @(x) isempty(x) || isnumeric(x) ); % char
p.addOptional('ipsign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char p.addOptional('ipsign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char
p.addOptional('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char p.addOptional('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char
p.addOptional('nverbose', 1, @(x) isempty(x) || isnumeric(x) );
p.parse; p.parse;
defaults_tcv2ids2database = p.Results; % to keep track of defaults defaults_tcv2ids2database = p.Results; % to keep track of defaults
......
...@@ -304,5 +304,6 @@ end ...@@ -304,5 +304,6 @@ end
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_core_profiles,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_core_profiles,'core_profiles',gdat_params.cocos_in, ... [ids_core_profiles,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_core_profiles,'core_profiles',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -113,5 +113,6 @@ end ...@@ -113,5 +113,6 @@ end
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_ec_antennas,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_ec_antennas,'ec_antennas',gdat_params.cocos_in, ... [ids_ec_antennas,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_ec_antennas,'ec_antennas',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -406,5 +406,6 @@ end ...@@ -406,5 +406,6 @@ end
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_equilibrium,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_equilibrium,'equilibrium',gdat_params.cocos_in, ... [ids_equilibrium,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_equilibrium,'equilibrium',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -21,5 +21,6 @@ end ...@@ -21,5 +21,6 @@ end
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_magnetics,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_magnetics,'magnetics',gdat_params.cocos_in, ... [ids_magnetics,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_magnetics,'magnetics',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -129,5 +129,6 @@ end ...@@ -129,5 +129,6 @@ end
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_nbi,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_nbi,'nbi',gdat_params.cocos_in, ... [ids_nbi,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_nbi,'nbi',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -21,5 +21,6 @@ ids_pf_active.vertical_force = {}; ...@@ -21,5 +21,6 @@ ids_pf_active.vertical_force = {};
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_pf_active,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_pf_active,'pf_active',gdat_params.cocos_in, ... [ids_pf_active,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_pf_active,'pf_active',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -36,5 +36,6 @@ ids_tf.field_map = {}; ...@@ -36,5 +36,6 @@ ids_tf.field_map = {};
% cocos automatic transform % cocos automatic transform
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_tf,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_tf,'tf',gdat_params.cocos_in, ... [ids_tf,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_tf,'tf',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
...@@ -26,5 +26,6 @@ ids_description = []; ...@@ -26,5 +26,6 @@ ids_description = [];
% cocos automatic transform (should have nothing to do for wall) % cocos automatic transform (should have nothing to do for wall)
if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2
[ids_wall,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_wall,'wall',gdat_params.cocos_in, ... [ids_wall,cocoscoeff]=ids_generic_cocos_nodes_transformation_symbolic(ids_wall,'wall',gdat_params.cocos_in, ...
gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in,gdat_params.error_bar); gdat_params.cocos_out,gdat_params.ipsign_out,gdat_params.b0sign_out,gdat_params.ipsign_in,gdat_params.b0sign_in, ...
gdat_params.error_bar,gdat_params.nverbose);
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment