From e711fb1f9c537b5c7ae6e2e19c43545b724e5937 Mon Sep 17 00:00:00 2001
From: Luke Simons <luke.simons@epfl.ch>
Date: Wed, 23 Apr 2025 13:54:11 +0200
Subject: [PATCH] Changed handling of COCOS transformation in tcv_get_ids_nbi
to use gdat cocos_out convention
---
matlab/TCV_IMAS/tcv2ids.m | 4 ++--
matlab/TCV_IMAS/tcv_get_ids_nbi.m | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv2ids.m b/matlab/TCV_IMAS/tcv2ids.m
index a78490f..9e034a8 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 e9ba38c..e4d15d2 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);
--
GitLab