From 2069eca7c5284785e7c029244896ad2b4c24276a Mon Sep 17 00:00:00 2001
From: Luke Simons <luke.simons@epfl.ch>
Date: Fri, 7 Mar 2025 18:00:14 +0100
Subject: [PATCH] Updated slightly calls to tcv_get_deploymentinfo
---
matlab/TCV_IMAS/tcv2ids.m | 11 +++++++++++
matlab/TCV_IMAS/tcv_get_ids_bolometer.m | 10 +---------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv2ids.m b/matlab/TCV_IMAS/tcv2ids.m
index 312cb4bc..e1fdd055 100644
--- a/matlab/TCV_IMAS/tcv2ids.m
+++ b/matlab/TCV_IMAS/tcv2ids.m
@@ -117,6 +117,17 @@ for i=1:length(params_tcv2ids.ids_names)
tmp = gdat(shot,gdat_params);
ids_from_tcv.(ids_to_get) = tmp.(ids_to_get);
ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']);
+
+ % Retrieve versioning information from .this-deployment.info
+
+ for ii = 1:numel(ids_from_tcv.code.library)
+ library_gitinfo= ...
+ tcv_get_deploymentinfo(fullfile(fileparts(which(ids_from_tcv_.code.library{ii}.name)),'.this-deployment.info'));
+ ids_bolometer.code.library{ii}.commit = library_gitinfo.git_commit;
+ ids_bolometer.code.library{ii}.version = library_gitinfo.git_tag;
+ ids_bolometer.code.library{ii}.repository =library_gitinfo.gitlab_project_url;
+ end
+
end
if nargout>=2
diff --git a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
index 76d89102..38b695fa 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
@@ -167,17 +167,9 @@ if status
ids_bolometer.code.library{1}.parameters = 'TCV_EQ("psi")';
%% Code legacy for GTI
- ids_bolometer.code.library{2}.name = 'gti';
+ ids_bolometer.code.library{2}.name = 'gti_do_inversion';
ids_bolometer.code.library{2}.description = ...
'General Tomographic Inversion';
- for ii = 1:numel(ids_bolometer.code.library)
-
- library_gitinfo= ...
- tcv_get_deploymentinfo(fullfile(fileparts(which('gti_do_inversion')),'.this-deployment.info'));
- ids_bolometer.code.library{ii}.commit = library_gitinfo.git_commit;
- ids_bolometer.code.library{ii}.version = library_gitinfo.git_tag;
- ids_bolometer.code.library{ii}.repository = library_gitinfo.gitlab_project_url;
- end
ids_bolometer.code.library{2}.parameters = '';
% FIXME: Values of bolo_u_confidence don't match output_flag
--
GitLab