Define angles in IDS as disucssed with F.Poli

change name

matlab/TCV_IMAS/tcv_get_ids_ec_launchers.m

@@ -85,22 +85,16 @@ for iant=1:nb_launchers
       ids_ec_launchers.beam{iant}.launching_position.phi(i) = atan2(launch_params{iant}{it_ok{iant}(i)}.y0/100,r0);
       ids_ec_launchers.beam{iant}.time(i) = time_launch;
 
-      % define wave vector based on TORAY angles
+      % define angles based on TORAY angles, as discussed with F. Poli Oct 2024
       % Reminder: theta_toray, zero on z-axis, pointing inwards with 90deg
-      %           phi_toray, zero along outpard radial direction, pointing
-      %           towards core with 180deg, +: clockwise, -: counter-clockwise
-      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.);
-      kmr  = cos((launch_params{iant}{it_ok{iant}(i)}.phi_toray)*pi/180.);
-      kphi = sin((launch_params{iant}{it_ok{iant}(i)}.phi_toray)*pi/180.); %*sigma_Rphiz (=+1 for TCV cocos=17)
+      %           phi_toray, 0deg=outwards radial, 180deg=pointing
+      %           towards core, +: clockwise, -: counter-clockwise
+      % IDS angles have same convention as TORBEAM and GRAY
+      pol_angle_ids = launch_params{iant}{it_ok{iant}(i)}.theta_toray-90;
+      tor_angle_ids = launch_params{iant}{it_ok{iant}(i)}.phi_toray-180;
 
-      % poloidal angle defined from -R axis to -Z axis
-      if kz==0 % if kz=0 wave vector lies in toroidal plane
-        ids_ec_launchers.beam{iant}.steering_angle_pol(i) = 0.;
-      else
-        ids_ec_launchers.beam{iant}.steering_angle_pol(i) = -atan2(kz,-kR);
-      end
-      ids_ec_launchers.beam{iant}.steering_angle_tor(i) = -atan2(kphi,-kmr);
+      ids_ec_launchers.beam{iant}.steering_angle_pol(i) = pol_angle_ids*pi/180;
+      ids_ec_launchers.beam{iant}.steering_angle_tor(i) = tor_angle_ids*pi/180;
       ids_ec_launchers.beam{iant}.spot.size(1,i) = 0.023;
       ids_ec_launchers.beam{iant}.spot.size(2,i) = 0.012;
       ids_ec_launchers.beam{iant}.spot.angle(i) = 0.0;