From 10ea20e9d80e0442420d602e7df263c18348234c Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Wed, 18 Sep 2019 20:09:06 +0200
Subject: [PATCH] to be compatible with older matlab version
---
matlab/TCV_IMAS/tcv_get_ids_nbi.m | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv_get_ids_nbi.m b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
index 27a77052..c0ce5639 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_nbi.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_nbi.m
@@ -33,7 +33,7 @@ for iunit=1:nb_units
p_frac=gdat(shot,'\results::nbh:fraction');
ids_nbi.unit{iunit}.beam_power_fraction.data = p_frac.data(:,1:3)*0.01;
ids_nbi.unit{iunit}.beam_power_fraction.time = p_frac.t;
- i_frac = p_frac.data(:,1:3).*[1 2 3];
+ i_frac = p_frac.data(:,1:3).*repmat([1 2 3],size(p_frac.data,1),1); % to be compatible with older matlab version .*[1 2 3] not ok
i_frac = i_frac.*1./sum(i_frac);
ids_nbi.unit{iunit}.beam_current_fraction.data = i_frac;
ids_nbi.unit{iunit}.beam_current_fraction.time = p_frac.t;
@@ -59,7 +59,7 @@ for iunit=1:nb_units
ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical = 250*1e-3;
% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_index: -999999999
% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_lower: -9.0000e+40
-% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_upper: -9.0000e+40
+% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_upper: -9.0000e+40
%% focus struct
focus = struct();
focus.focal_length_horizontal = 3.76;
@@ -87,7 +87,7 @@ for iunit=1:nb_units
ids_nbi.unit{iunit}.beamlets_group{1}.divergence_component{1} = div;
%% tilting
% it is fixed in time. what should we do about it?
-
+
%% position
%dcd_NBH = psitbxdcd(4.5889, 0.0, 211.9535*pi/180, 0.0, -9.2308*pi/180);
pos = struct();
@@ -148,7 +148,7 @@ for iunit=1:nb_units
ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical = 87.2*1e-3;
% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_index: -999999999
% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_lower: -9.0000e+40
-% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_upper: -9.0000e+40
+% ids_nbi.unit{iunit}.beamlets_group{1}.width_vertical_error_upper: -9.0000e+40
%% focus struct
focus = struct();
focus.focal_length_horizontal = 1.8;
@@ -176,7 +176,7 @@ for iunit=1:nb_units
ids_nbi.unit{iunit}.beamlets_group{1}.divergence_component{1} = div;
%% tilting
% it is fixed in time. what should we do about it?
-
+
%% position
%dcd_NBH = psitbxdcd(4.5889, 0.0, 211.9535*pi/180, 0.0, -9.2308*pi/180);
pos = struct();
--
GitLab