From 0d410ab585f122c791e413a22b8ff92e31112ad0 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Thu, 26 Sep 2019 19:37:48 +0200
Subject: [PATCH] correct alpha beta, from kmr, kz,kphi, set 1 nbi unit as
default
---
matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m | 13 ++++++++-----
matlab/TCV_IMAS/tcv_get_ids_nbi.m | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
index 08671e12..b7a15132 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m
@@ -77,12 +77,15 @@ for iant=1:nb_antennas
ids_ec_antennas.antenna{iant}.launching_position.z.time(i) = time_launch;
ids_ec_antennas.antenna{iant}.launching_position.phi.time(i) = time_launch;
kz = cos(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.);
- kr = sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*cos(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.);
- kphi=sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*sin(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.); %*sigma_Rphiz (=+1 for TCV cocos=17)
- ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = atan2(kz,-kr);
- ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = atan2(-kz,-kr);
+ kmr = -sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*cos(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.);
+ kphi = sin(launch_params{iant}{it_ok{iant}(i)}.theta_toray*pi/180.).*sin(launch_params{iant}{it_ok{iant}(i)}.phi_toray*pi/180.); %*sigma_Rphiz (=+1 for TCV cocos=17)
+ if (kz==0 && kmr==0)
+ ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = 0.;
+ else
+ ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = atan2(-kz,kmr);
+ end
ids_ec_antennas.antenna{iant}.launching_angle_pol.time(i) = time_launch;
- ids_ec_antennas.antenna{iant}.launching_angle_tor.data(i) = atan2(kphi,-kr);
+ ids_ec_antennas.antenna{iant}.launching_angle_tor.data(i) = asin(kphi);
ids_ec_antennas.antenna{iant}.launching_angle_tor.time(i) = time_launch;
% $$$ ids_ec_antennas.antenna{iant}.beam.spot.size.data(i,1) = 0.023;
% $$$ ids_ec_antennas.antenna{iant}.beam.spot.size.data(i,2) = 0.012;
diff --git a/matlab/TCV_IMAS/tcv_get_ids_nbi.m b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
index 073bf1d4..b4c5e644 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_nbi.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
@@ -15,6 +15,7 @@ ids_nbi_description='';
nb_units = 2; % assume 2 units: 1st NBH and DNBI
+nb_units = 1; % assume 2 units: 1st NBH and DNBI
ids_nbi.unit(1:nb_units) = ids_nbi.unit(1); % copy empty structure for all units, then fill in
% create lists of what is different for each units so that can scan through units
--
GitLab