diff --git a/matlab/TCV_IMAS/ids2database.m b/matlab/TCV_IMAS/ids2database.m
index dd163847c2cc74a4c0d5347342e0feb30139a8f6..0ed705e6661bd218f04f4d1d24da818f713f1bed 100644
--- a/matlab/TCV_IMAS/ids2database.m
+++ b/matlab/TCV_IMAS/ids2database.m
@@ -107,7 +107,7 @@ try
%% Put the field
for i=1:length(ids_names_ok)
- ids_to_get = ids_names_ok{i}
+ ids_to_get = ids_names_ok{i};
if occurence <= 0
ids_put(idx,ids_to_get,ids2put.(ids_to_get));
else
diff --git a/matlab/TCV_IMAS/tcv2ids.m b/matlab/TCV_IMAS/tcv2ids.m
index 94557c92b0e379f423c578d3b58131952503a401..4adfb493f600a33e146a0f534431f22448dd18be 100644
--- a/matlab/TCV_IMAS/tcv2ids.m
+++ b/matlab/TCV_IMAS/tcv2ids.m
@@ -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
% '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)
+% '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
% 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
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('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char
+p.addOptional('nverbose', 1, @(x) isempty(x) || isnumeric(x) );
p.parse;
defaults_tcv2ids = p.Results; % to keep track of defaults
@@ -91,7 +93,7 @@ end
for i=1:length(params_tcv2ids.ids_names)
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, ...
- '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 '_description']) = tmp.([ids_to_get '_description']);
end
diff --git a/matlab/TCV_IMAS/tcv2ids2database.m b/matlab/TCV_IMAS/tcv2ids2database.m
index a95cf90ad9f09d02d7a1d52110ed0b5de6fddf45..27299c84cfe857b4d9212d6ace51b6997cdb809c 100644
--- a/matlab/TCV_IMAS/tcv2ids2database.m
+++ b/matlab/TCV_IMAS/tcv2ids2database.m
@@ -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('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('nverbose', 1, @(x) isempty(x) || isnumeric(x) );
p.parse;
defaults_tcv2ids2database = p.Results; % to keep track of defaults
diff --git a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
index b0d2703e37833f1a3148aceb4bf929c2ee43978b..02a68e75220af41fe6155c11a0e7acb7c61ab693 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
@@ -304,5 +304,6 @@ end
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
index 353aac4a4297d8535fcd268c6295e25c666c9311..717c393d008d01d5a2ccd8ebd35010a680b7b3b0 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
@@ -113,5 +113,6 @@ end
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
index 54dbc48c7ddf12c905972c18095ebcd7ee9822cb..23a5ef28d20e38ca5b66e18710af0ee44896f16e 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m
@@ -406,5 +406,6 @@ end
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_magnetics.m b/matlab/TCV_IMAS/tcv_get_ids_magnetics.m
index bf1ea8506afb6c81b1628d6c971a7d8ab5e3e251..2e302ccec7a17d9f13638c1f14dda8a114cdec2c 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_magnetics.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_magnetics.m
@@ -21,5 +21,6 @@ end
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_nbi.m b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
index 8da3b80b1ea51f7b4d7517e3bb8b66b8a3f91cf2..3b83394499d33ac5b423f8de86fdeb45fb014da1 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_nbi.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
@@ -129,5 +129,6 @@ end
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_pf_active.m b/matlab/TCV_IMAS/tcv_get_ids_pf_active.m
index 8d3ef3e202727699fa1c69d1efac9a0c95b26705..e893ee03e30e67f125a9eb3caa1b9e6446265556 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_pf_active.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_pf_active.m
@@ -21,5 +21,6 @@ ids_pf_active.vertical_force = {};
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_tf.m b/matlab/TCV_IMAS/tcv_get_ids_tf.m
index 2a5774ecd3226078e50257ea1b4ff6bce80dc160..d658a82afb5fa95f526250b8dea352f4b96386b1 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_tf.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_tf.m
@@ -36,5 +36,6 @@ ids_tf.field_map = {};
% cocos automatic transform
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, ...
- 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
diff --git a/matlab/TCV_IMAS/tcv_get_ids_wall.m b/matlab/TCV_IMAS/tcv_get_ids_wall.m
index fca0dfa25bd300b2886cc4ea871e46cbf696c6d2..9d90d36eebda92b49cf1ff9ba8b89add21aaafc9 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_wall.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_wall.m
@@ -26,5 +26,6 @@ ids_description = [];
% cocos automatic transform (should have nothing to do for wall)
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, ...
- 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