diff --git a/matlab/TCV_IMAS/tcv2ids.m b/matlab/TCV_IMAS/tcv2ids.m index f064fa64cf725aa379d78a58296926c75a956157..9c0577ad47155c7d8624e570b92385ac2936e2d6 100644 --- a/matlab/TCV_IMAS/tcv2ids.m +++ b/matlab/TCV_IMAS/tcv2ids.m @@ -11,7 +11,7 @@ function [ids_from_tcv,varargout] = tcv2ids(shot,varargin); % mdsconnect('localhost:5555') % % varargin: 'ids_names': cell, idss to load, by default all defined so far (if empty or empty string or not given) -% {'equilibrium', 'magnetics', 'pf_active','wall','core_profiles'} or a subset +% {'equilibrium', 'magnetics', 'pf_active','wall','core_profiles','ec_antennas','nbi'} or a subset % varargin{2}: 'error_bar': type (string) % empty or 'delta' (default): meaning difference in upper is set (standard error_bar % 'added': errorbar is added: upper=data+delta and lower=data-delta @@ -26,7 +26,7 @@ p = inputParser; % no required inputs here so one can call with empty args and get defaults parameters % effectively required inputs should have defaults as empty p.addOptional('shot', [], @(x) (isnumeric(x) && isscalar(x) && (x == round(x)))); % integer -p.addOptional('ids_names', {'equilibrium', 'magnetics', 'pf_active','wall', 'tf','core_profiles','ec_antennas'}, @(x) isempty(x) | iscell(x) ); % char or cell array +p.addOptional('ids_names', {'equilibrium', 'magnetics', 'pf_active','wall', 'tf','core_profiles','ec_antennas','nbi'}, @(x) isempty(x) | iscell(x) ); % char or cell array p.addOptional('error_bar', 'delta', @(x) isempty(x) | ischar(x) ); % char or cell array p.parse; defaults_tcv2ids = p.Results; % to keep track of defaults diff --git a/matlab/TCV_IMAS/tcv2ids2database.m b/matlab/TCV_IMAS/tcv2ids2database.m index 08cf51f0db47abdce43a716fb61543caa6fdac8a..3cc584a79457f8a5bdf0cc66545017f7a4803b41 100644 --- a/matlab/TCV_IMAS/tcv2ids2database.m +++ b/matlab/TCV_IMAS/tcv2ids2database.m @@ -42,7 +42,7 @@ p = inputParser; p.addOptional('shot', [], @(x) (isnumeric(x) && isscalar(x) && (x == round(x)))); % integer p.addOptional('run_out', [], @(x) (isnumeric(x) && isscalar(x) && (x == round(x)))); % integer p.addOptional('occurence', 0, @(x) (isnumeric(x) && isscalar(x) && (x == round(x)))); % integer -p.addOptional('ids_names', {'equilibrium', 'magnetics', 'pf_active','wall', 'tf','core_profiles','ec_antennas'}, @(x) isempty(x) | iscell(x)); % char or cell array +p.addOptional('ids_names', {'equilibrium', 'magnetics', 'pf_active','wall', 'tf','core_profiles','ec_antennas','nbi'}, @(x) isempty(x) | iscell(x)); % char or cell array p.addOptional('error_bar', 'delta', @(x) isempty(x) | ischar(x) ); % char or cell array p.addOptional('tree_user', getenv('USER'), @(x) isempty(x) | ischar(x) ); % char p.addOptional('tree_tokamak', 'tcv', @(x) isempty(x) | ischar(x) ); % char