From b9e91a7df9043c9d4bd7f704d8daef7663473ed6 Mon Sep 17 00:00:00 2001
From: Luke Simons <luke.simons@epfl.ch>
Date: Thu, 13 Mar 2025 16:25:33 +0100
Subject: [PATCH] Updates to comments, formatting and versioning of
tcv_get_ids_bolometer.m
---
matlab/TCV_IMAS/tcv_get_ids_bolometer.m | 28 ++++++++++++++++---------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
index 697e49f..b4b4935 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_bolometer.m
@@ -45,16 +45,17 @@ params_eff.data_request='\tcv_shot::top.results.bolo_u.confidence';
bolo_u_confidence = gdat(shot,params_eff);
status = ~ischar(bolo_u_intensity.data) & ~ischar(bolo_u_prad_core.data);
-imas_version_number=getenv('IMAS_VERSION')
+imas_version_number=getenv('IMAS_VERSION');
if status
nchannel = numel(bolo_u_intensity.x);
ids_bolometer.channel(1:nchannel) = ids_bolometer.channel(1);
for ii = 1:nchannel
-
+ %% Fill geometry information
+ % Fill information from bolo_geom=bolou_load_geometry();
ids_bolometer.channel{ii}.name = bolo_geom.channel{ii}.name;
- if strcmp(aa(1),'3')
+ if strcmp(imas_version_number(1),'3')
ids_bolometer.channel{ii}.identifier = bolo_geom.channel{ii}.identifier;
- elseif strcmp(aa(1),'4')
+ elseif strcmp(imas_version_number(1),'4')
ids_bolometer.channel{ii}.description = bolo_geom.channel{ii}.identifier;
end
ids_bolometer.channel{ii}.detector.geometry_type= bolo_geom.channel{ii}.detector.geometry_type;
@@ -102,6 +103,7 @@ if status
ids_bolometer.channel{ii}.line_of_sight.second_point.r = bolo_geom.channel{ii}.line_of_sight.second_point.r;
ids_bolometer.channel{ii}.line_of_sight.second_point.z = bolo_geom.channel{ii}.line_of_sight.second_point.z;
+ %% Fill measurement information
ids_bolometer.channel{ii}.power.data = bolo_u_intensity.data(ii,:);
ids_bolometer_description.channel{ii}.power.data = ...
['From results.bolo_u.intensity data, Radiance measured by ' ...
@@ -136,21 +138,27 @@ if status
ids_bolometer.code.name = 'rc_gti_prep';
ids_bolometer.code.description = ...
['rc_gti_prep, RADCAM gitlab repo, calls GTI to generate emissivity profiles with liuqe.']
-% '/usr/local/bin/matlab960 -nojvm -nosplash -nodisplay -r ' ...
-% '"anasrvmat(''rc_gti_prep'',$2,[0 2.2],''bolo'', 10, 1, 0.04, 30,' ...
-% 'false, false,false, [], ''automated'', 1)"'];
ids_bolometer.code.commit='';
ids_bolometer.code.version='';
ids_bolometer.code.repository= ...
'https://gitlab.epfl.ch/spc/tcv/diag/radcam/';
- ids_bolometer.code.parameters='';
- ids_bolometer.code.library{1}.name = 'meq';
+ ids_bolometer.code.parameters=['rc_gti_prep(shot,[0 2.2],''bolo'', 10, 1, 0.04, 30,' ...
+ + 'false, false,false, [], ''automated'', 1)'];
+ %% Code legacy for TCV_EQ; FBTE
+ % Call to gti: gti_get_disc
+ % Call to TCV_eq: temp=tdi('TCV_EQ("psi")',disc.s.equilsrc);
+ % https://spcwiki.epfl.ch/wiki/Tcv_eq
+ % a=gdat(shot,'TCV_EQ("psi")');
+ ids_bolometer.code.library{1}.name = 'fbte';
ids_bolometer.code.library{1}.description = 'Magnetic equilibrium';
ids_bolometer.code.library{1}.commit = '';
ids_bolometer.code.library{1}.version = '';
ids_bolometer.code.library{1}.repository = ...
'https://gitlab.epfl.ch/spc/tcv/tbx/meq';
- ids_bolometer.code.library{1}.parameters = '';
+ 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}.description = ...
'General Tomographic Inversion';
--
GitLab