From 2fa878f9a74a4650013e2ba4fedf15575ec93700 Mon Sep 17 00:00:00 2001 From: Olivier Sauter <Olivier.Sauter@epfl.ch> Date: Wed, 25 Sep 2019 09:26:21 +0200 Subject: [PATCH] change sign of the_pol waiting for ids2cpo to change transformation --- matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m | 18 +++++++++++++----- 1 file changed, 13 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 4c40d5ca..0653cc30 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m +++ b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m @@ -34,6 +34,8 @@ end % $$$ ids_ec_antennas_description.time = 'time from power'; [r_phi0,z_phi0,r1,z1,rc,zc,thetphi_L,thetphi_tor,raysbylauncher,powers,fname,z_axis,launch_params] = ... toray_raygeom_TCV(shot,pow.ec.t(1:10:end)); +ids_ec_antennas_description.launch_params = launch_params; + for iant=1:nb_antennas ids_ec_antennas.antenna{iant}.identifier = ['L' num2str(iant)]; @@ -74,17 +76,23 @@ for iant=1:nb_antennas ids_ec_antennas.antenna{iant}.launching_position.r.time(i) = time_launch; ids_ec_antennas.antenna{iant}.launching_position.z.time(i) = time_launch; ids_ec_antennas.antenna{iant}.launching_position.phi.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = (90.-launch_params{iant}{it_ok{iant}(i)}.theta_toray) * pi/180.; + ids_ec_antennas.antenna{iant}.launching_angle_pol.data(i) = - (90.-launch_params{iant}{it_ok{iant}(i)}.theta_toray) * pi/180.; ids_ec_antennas.antenna{iant}.launching_angle_pol.time(i) = time_launch; ids_ec_antennas.antenna{iant}.launching_angle_tor.data(i) = (180.-launch_params{iant}{it_ok{iant}(i)}.phi_toray) * pi/180.; ids_ec_antennas.antenna{iant}.launching_angle_tor.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.spot.size.data(i,1:2) = 0.05.*ones(size(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; + ids_ec_antennas.antenna{iant}.beam.spot.size.data(1,i) = 0.023; + ids_ec_antennas.antenna{iant}.beam.spot.size.data(2,i) = 0.012; ids_ec_antennas.antenna{iant}.beam.spot.size.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.spot.angle.data(i,1:2) = 0.0.*ones(size(time_launch)); + ids_ec_antennas.antenna{iant}.beam.spot.angle.data(i) = 0.0; ids_ec_antennas.antenna{iant}.beam.spot.angle.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.phase.angle.data(i,1:2) = 0.0.*ones(size(time_launch)); +% $$$ ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(i,1) = 1./1.88; +% $$$ ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(i,2) = 1./-0.95; % negative in launch_params... + ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(1,i) = 1./1.88; + ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(2,i) = 1./-0.95; % negative in launch_params... + ids_ec_antennas.antenna{iant}.beam.phase.angle.data(i) = 0.0; ids_ec_antennas.antenna{iant}.beam.phase.angle.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(i,1:2) = 1.0.*ones(size(time_launch)); ids_ec_antennas.antenna{iant}.beam.phase.curvature.time(i) = time_launch; end end -- GitLab