diff --git a/matlab/TCV_IMAS/tcv2ids.m b/matlab/TCV_IMAS/tcv2ids.m index a78490fbb50d78fbd3f6f565e77e2ab76678b2fe..9e034a8ac3b4a37940436a49331fbdca5798c347 100644 --- a/matlab/TCV_IMAS/tcv2ids.m +++ b/matlab/TCV_IMAS/tcv2ids.m @@ -29,9 +29,9 @@ function [ids_from_tcv,varargout] = tcv2ids(shot,varargin); % varargout{1}: return also the ids in array of structure with the names, to allow easy use of plotallids % -imas_version_number=str2num(getenv('IMAS_VERSION')); +imas_version_number=getenv('IMAS_VERSION'); cocos_out_default=11; -if imas_version_number(1) >= 4 +if str2num(imas_version_number(1)) >= 4 cocos_out_default=17; end diff --git a/matlab/TCV_IMAS/tcv_get_ids_nbi.m b/matlab/TCV_IMAS/tcv_get_ids_nbi.m index e9ba38c1667e99a648e8529866b3e9f852115e56..e4d15d27664f6d733a1bed5fed935a65c1e2efcd 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_nbi.m +++ b/matlab/TCV_IMAS/tcv_get_ids_nbi.m @@ -9,7 +9,6 @@ function [ids_nbi,ids_nbi_description,varargout] = tcv_get_ids_nbi(shot,ids_nbi_ % Most information taken from NBI and NB_Model wiki pages: % https://spcwiki.epfl.ch/wiki/NBI % https://spcwiki.epfl.ch/wiki/NB_Model -imas_version_number=getenv('IMAS_VERSION'); if exist('gdat_params') [ids_nbi, params_nbi] = tcv_ids_headpart(shot,ids_nbi_empty,'nbi','homogeneous_time',0,'gdat_params',gdat_params,varargin{:}); @@ -176,8 +175,7 @@ end % cocos automatic transform -if exist('ids_generic_cocos_nodes_transformation_symbolic') == 2 && ... - strcmp(imas_version_number(1),'3') +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.nverbose);