diff --git a/Analisys_absolute.m b/Analisys_absolute.m index cc52752dbfa6907f5593ef1d9ebc9670a385a4ab..e9ae317de66fa4edb91797504435f68dfe458914 100644 --- a/Analisys_absolute.m +++ b/Analisys_absolute.m @@ -22,7 +22,7 @@ clc MMX_InitializeSPICE cspice_furnsh(which('mar097.bsp')); cspice_furnsh(which('MARPHOFRZ.txt')); - cspice_furnsh(which('MMX_QSO_031_2x2_826891269_828619269.bsp')); + cspice_furnsh(which('MMX_QSO_049_2x2_826891269_828619269.bsp')); % cspice_furnsh(which('MMX_3DQSO_031_009_2x2_826891269_828619269.bsp')); % cspice_furnsh(which('MMX_SwingQSO_031_011_2x2_826891269_828619269.bsp')); cspice_furnsh(which('Phobos_826891269_828619269.bsp')); @@ -101,8 +101,7 @@ clc % @Observables_model_Absolute,... % pars.R,YObs,pars,units,file_features,file_features_Mars); - Results(Est, pars, units) - - % save('./Result_thesis/QSOLb_6days_NoDSN_10feat.mat', 'Est') - % save('./Result_thesis_noVisCheckFeatures/QSOLb_6days_NoDSN_10feat.mat', 'Est') + % Results(Est, pars, units) + save('./Result_thesis/QSOLa_6days_NoDSN&Limb_10feat.mat', 'Est') + diff --git a/CovarianceAnalysisParameters.m b/CovarianceAnalysisParameters.m index e407730d1f48cda55a344ff66c20895d8cd55c70..ba2500fec1b46c556f1a97617379e67663a0a6ae 100644 --- a/CovarianceAnalysisParameters.m +++ b/CovarianceAnalysisParameters.m @@ -72,12 +72,12 @@ pars.R(5,5) = pars.ObsNoise.range^2; pars.R(6,6) = pars.ObsNoise.range_rate^2; pars.R(7,7) = pars.ObsNoise.lidar^2; pars.R(8,8) = pars.ObsNoise.pixel^2; -pars.R(8,8) = pars.ObsNoise.ISL^2; +pars.R(9,9) = pars.ObsNoise.ISL^2; % Seconds between observation pars.interval_Range = 3600; % s pars.interval_Range_rate = 600; % s -pars.interval_lidar = 600; % s +pars.interval_lidar = 200; % s pars.interval_features = 600; % s pars.interval_limbs = 600; % s pars.interval_ISL = 600; % s @@ -85,7 +85,7 @@ pars.interval_ISL = 600; % s % Observables selection pars.flag_DSN = 0; pars.flag_lidar = 1; -pars.flag_Limb = 1; +pars.flag_Limb = 0; pars.flag_features = 1; pars.flag_features_Mars = 0; pars.flag_Deimos = 1; diff --git a/Observations_Generation.m b/Observations_Generation.m index 8a9ca9f40ec073ec17c7ca9cfd17b68fbfba1c1b..06a911e9a4ad3214c90f11b4a8f9ff80dec37547 100644 --- a/Observations_Generation.m +++ b/Observations_Generation.m @@ -21,7 +21,7 @@ clc MMX_InitializeSPICE cspice_furnsh(which('mar097.bsp')); cspice_furnsh(which('MARPHOFRZ.txt')); - cspice_furnsh(which('MMX_QSO_031_2x2_826891269_828619269.bsp')); + cspice_furnsh(which('MMX_QSO_049_2x2_826891269_828619269.bsp')); % cspice_furnsh(which('MMX_3DQSO_031_009_2x2_826891269_828619269.bsp')); % cspice_furnsh(which('MMX_SwingQSO_031_011_2x2_826891269_828619269.bsp')); cspice_furnsh(which('Phobos_826891269_828619269.bsp')); @@ -31,7 +31,7 @@ clc % Time of the analysis data = '2026-03-16 00:00:00 (UTC)'; data = cspice_str2et(data); - Ndays = 2; + Ndays = 6; t = Ndays*86400; date_end = data+t; diff --git a/Result_thesis/QSOLa_6days_NoDSN&Deimos_10feat.mat b/Result_thesis/QSOLa_6days_NoDSN&Deimos_10feat.mat new file mode 100644 index 0000000000000000000000000000000000000000..18a60eb8f88f65320a84db78def821d78684673c Binary files /dev/null and b/Result_thesis/QSOLa_6days_NoDSN&Deimos_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Deimos_10feat.mat b/Result_thesis/QSOLa_6days_NoDSN&Features_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Deimos_10feat.mat rename to Result_thesis/QSOLa_6days_NoDSN&Features_10feat.mat index 11ba405623aad881890d91846aca9387aa738ac0..869da833e01e8aa6fb421397e79728022888aa4f 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Deimos_10feat.mat and b/Result_thesis/QSOLa_6days_NoDSN&Features_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN_10feat.mat b/Result_thesis/QSOLa_6days_NoDSN&Limb&Deimos_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN_10feat.mat rename to Result_thesis/QSOLa_6days_NoDSN&Limb&Deimos_10feat.mat index 36de9ffe21fa62e467992235ab4b14bb53f4b83a..acfaefd8bdf7cf5a6251893306a98e4b66ed4e7a 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN_10feat.mat and b/Result_thesis/QSOLa_6days_NoDSN&Limb&Deimos_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Deimos_10feat.mat b/Result_thesis/QSOLa_6days_NoDSN&Limb_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Deimos_10feat.mat rename to Result_thesis/QSOLa_6days_NoDSN&Limb_10feat.mat index 13930105bee8dad8de0e7bd01db22009f62ea57c..e23852328454a3fde419f942baf3b065c0ea0b9d 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Deimos_10feat.mat and b/Result_thesis/QSOLa_6days_NoDSN&Limb_10feat.mat differ diff --git a/Result_thesis/QSOM_6days_NoDSN&Limb_10feat.mat b/Result_thesis/QSOLa_6days_NoDSN_10feat.mat similarity index 63% rename from Result_thesis/QSOM_6days_NoDSN&Limb_10feat.mat rename to Result_thesis/QSOLa_6days_NoDSN_10feat.mat index 83c76f1c10b8b4fc045e29e6f6e48be854799ad6..01656b3443c4dfc6916f671e7e0f42a66a073dca 100644 Binary files a/Result_thesis/QSOM_6days_NoDSN&Limb_10feat.mat and b/Result_thesis/QSOLa_6days_NoDSN_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat b/Result_thesis/QSOLb_6days_NoDSN&Deimos_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat rename to Result_thesis/QSOLb_6days_NoDSN&Deimos_10feat.mat index a7c828ef727a4c77488dd4090aa47acde8570e19..ad28fe4b1eadd404214113a1b612789a642bf223 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat and b/Result_thesis/QSOLb_6days_NoDSN&Deimos_10feat.mat differ diff --git a/Result_thesis/QSOLb_6days_NoDSN&Features_10feat.mat b/Result_thesis/QSOLb_6days_NoDSN&Features_10feat.mat new file mode 100644 index 0000000000000000000000000000000000000000..8f18486191c18fbd0e2eeda91756e733ef390632 Binary files /dev/null and b/Result_thesis/QSOLb_6days_NoDSN&Features_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN_10feat.mat b/Result_thesis/QSOLb_6days_NoDSN&Limb&Deimos_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN_10feat.mat rename to Result_thesis/QSOLb_6days_NoDSN&Limb&Deimos_10feat.mat index 017d8cd4e8737b69d9653aee25db9b6974669259..ad3c059685e2ae80eb687919c4d1430fa9aab9ec 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOM_6days_NoDSN_10feat.mat and b/Result_thesis/QSOLb_6days_NoDSN&Limb&Deimos_10feat.mat differ diff --git a/Result_thesis/QSOLb_6days_NoDSN&Limb_10feat.mat b/Result_thesis/QSOLb_6days_NoDSN&Limb_10feat.mat new file mode 100644 index 0000000000000000000000000000000000000000..be590759f888e4f97d09b603fbf13ec64635e28d Binary files /dev/null and b/Result_thesis/QSOLb_6days_NoDSN&Limb_10feat.mat differ diff --git a/Result_thesis/QSOLb_6days_NoDSN_10feat.mat b/Result_thesis/QSOLb_6days_NoDSN_10feat.mat index 717017376041104df9acdef62d1357a984b77ada..3703438b4cf5144e8776ca30b8a3ae9a46887d9e 100644 Binary files a/Result_thesis/QSOLb_6days_NoDSN_10feat.mat and b/Result_thesis/QSOLb_6days_NoDSN_10feat.mat differ diff --git a/Result_thesis/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat b/Result_thesis/QSOLc_6days_NoDSN&Deimos_10feat.mat similarity index 63% rename from Result_thesis/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat rename to Result_thesis/QSOLc_6days_NoDSN&Deimos_10feat.mat index 413133a3e5f4cfcbc3c0c23be464d2425dae2417..05b7648ddd9dca9b566368cf6170144bc5d8aa7b 100644 Binary files a/Result_thesis/QSOM_6days_NoDSN&Limb&Deimos_10feat.mat and b/Result_thesis/QSOLc_6days_NoDSN&Deimos_10feat.mat differ diff --git a/Result_thesis/QSOLc_6days_NoDSN&Features_10feat.mat b/Result_thesis/QSOLc_6days_NoDSN&Features_10feat.mat new file mode 100644 index 0000000000000000000000000000000000000000..27ef71e8203e1875f85a77add0621ba06bbf4bb9 Binary files /dev/null and b/Result_thesis/QSOLc_6days_NoDSN&Features_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_Full_10feat.mat b/Result_thesis/QSOLc_6days_NoDSN&Limb&Deimos_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOH_6days_Full_10feat.mat rename to Result_thesis/QSOLc_6days_NoDSN&Limb&Deimos_10feat.mat index bfc7b0cd333b873d768868f7de126ec1b6792001..590834c62b9a423941dd157a16d64faf8abdcf69 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_Full_10feat.mat and b/Result_thesis/QSOLc_6days_NoDSN&Limb&Deimos_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb&Deimos_10feat.mat b/Result_thesis/QSOLc_6days_NoDSN&Limb_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb&Deimos_10feat.mat rename to Result_thesis/QSOLc_6days_NoDSN&Limb_10feat.mat index cd192d9ec3c85f0c3fe08ddf1111a72f4af5306a..4a20e7b4dc480e490badba96007743557ea6c643 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb&Deimos_10feat.mat and b/Result_thesis/QSOLc_6days_NoDSN&Limb_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb_10feat.mat b/Result_thesis/QSOLc_6days_NoDSN_10feat.mat similarity index 63% rename from Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb_10feat.mat rename to Result_thesis/QSOLc_6days_NoDSN_10feat.mat index 084263f4c6a6ae70b2c9ff304783ad746d23e028..9416415faba754da72774b1399155d286379f7f6 100644 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_NoDSN&Limb_10feat.mat and b/Result_thesis/QSOLc_6days_NoDSN_10feat.mat differ diff --git a/Result_thesis_noVisCheckFeatures/QSOH_6days_CameraOnly_10feat.mat b/Result_thesis_noVisCheckFeatures/QSOH_6days_CameraOnly_10feat.mat deleted file mode 100644 index 90588a5935f6a1a113fa2bee35562530516b0ce4..0000000000000000000000000000000000000000 Binary files a/Result_thesis_noVisCheckFeatures/QSOH_6days_CameraOnly_10feat.mat and /dev/null differ diff --git a/Result_thesis_noVisCheckFeatures/QSOM_6days_CameraOnly_10feat.mat b/Result_thesis_noVisCheckFeatures/QSOM_6days_CameraOnly_10feat.mat deleted file mode 100644 index 7069459d1c1acc4e1ab1d6d21133ab13ea6baa57..0000000000000000000000000000000000000000 Binary files a/Result_thesis_noVisCheckFeatures/QSOM_6days_CameraOnly_10feat.mat and /dev/null differ diff --git a/Result_thesis_noVisCheckFeatures/QSOM_6days_Full_10feat.mat b/Result_thesis_noVisCheckFeatures/QSOM_6days_Full_10feat.mat deleted file mode 100644 index b129d3c5ea86ac40ab51416002faedd1d13b6f0a..0000000000000000000000000000000000000000 Binary files a/Result_thesis_noVisCheckFeatures/QSOM_6days_Full_10feat.mat and /dev/null differ diff --git a/Utilities/Deimos_Pic.m b/Utilities/Deimos_Pic.m index 865f42bd88fc321d50160131b3e82546307145b9..85e00b35b2393a20c7456395ff8ac0e6bc9a3e39 100644 --- a/Utilities/Deimos_Pic.m +++ b/Utilities/Deimos_Pic.m @@ -24,15 +24,6 @@ function Deimos_obs = Deimos_Pic(MMX, Phobos, Deimos, Xsi, theta, pars, units) % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % i_feat = Phobos(1:3)/norm(Phobos(1:3)); - % v = Phobos(4:6)/norm(Phobos(4:6)); - % k = cross(i_feat, v)/norm(cross(i_feat, v)); - % j = cross(k, i_feat)/norm(cross(k, i_feat)); - % - % R2rot = [i_feat, j, k]'; - % r_sb = MMX(1:3) - Phobos(1:3); - % r_sb_Ph = R2rot'*r_sb; - MMX = pars.MARSIAU2perifocal*MMX(1:3); Phobos = [pars.MARSIAU2perifocal, zeros(3,3); zeros(3,3), pars.MARSIAU2perifocal]*Phobos; @@ -45,18 +36,15 @@ function Deimos_obs = Deimos_Pic(MMX, Phobos, Deimos, Xsi, theta, pars, units) % Position of MMX wrt Phobos-fixed frame r_sb = MMX(1:3) - Phobos(1:3); - % r_sb_Ph = r_sb; r_sb_Ph = RLibration*Rtheta*r_sb; % Mars pole position in the Phobos rotating frame Deimos_center = Deimos(1:3); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Deimos_center = R_ini*R2rot'*Deimos_center - Phobos(1:3); Deimos_center = R_ini*Rtheta'*RLibration'*Deimos_center - Phobos(1:3); Deimos_pole = [0; 15; 0]+Deimos(1:3); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Deimos_pole = R_ini*R2rot'*Deimos_pole - Phobos(1:3); Deimos_pole = R_ini*Rtheta'*RLibration'*Deimos_pole - Phobos(1:3); % Check if Mars is in the pic diff --git a/Utilities/Deimos_Pic_model.m b/Utilities/Deimos_Pic_model.m index 25c8831f8d77371bd0756d28472120207ed9b20a..c9c9d47f683da82652fb7e1211c7582ae85669e1 100644 --- a/Utilities/Deimos_Pic_model.m +++ b/Utilities/Deimos_Pic_model.m @@ -25,14 +25,6 @@ function [Deimos_LOS, Deimos_Limb] = Deimos_Pic_model(MMX, Phobos, Deimos, Xsi, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % i_feat = Phobos(1:3)/norm(Phobos(1:3)); - % v = Phobos(4:6)/norm(Phobos(4:6)); - % k = cross(i_feat, v)/norm(cross(i_feat, v)); - % j = cross(k, i_feat)/norm(cross(k, i_feat)); - % - % R2rot = [i_feat, j, k]'; - - MMX = pars.MARSIAU2perifocal*MMX(1:3); Phobos = [pars.MARSIAU2perifocal, zeros(3,3); zeros(3,3), pars.MARSIAU2perifocal]*Phobos; Deimos = pars.MARSIAU2perifocal*Deimos(1:3); @@ -45,18 +37,15 @@ function [Deimos_LOS, Deimos_Limb] = Deimos_Pic_model(MMX, Phobos, Deimos, Xsi, % Position of MMX wrt Phobos-fixed frame r_sb = MMX(1:3) - Phobos(1:3); - % r_sb_Ph = r_sb; r_sb_Ph = RLibration*Rtheta*r_sb; % Mars pole position in the Phobos rotating frame Deimos_center = Deimos(1:3); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Deimos_center = R_ini*R2rot'*Deimos_center - Phobos(1:3); Deimos_center = R_ini*Rtheta'*RLibration'*Deimos_center - Phobos(1:3); Deimos_pole = [0; 15; 0] + Deimos(1:3); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Deimos_pole = R_ini*R2rot'*Deimos_pole - Phobos(1:3); Deimos_pole = R_ini*Rtheta'*RLibration'*Deimos_pole - Phobos(1:3); [~, ~, PM] = ProjMatrix(-r_sb_Ph, pars, units); diff --git a/Utilities/visible_features.m b/Utilities/visible_features.m index 684c2d06c0ef45334041145fc2cd6b202a124317..2f5a34d643f2387533ea2223ff5922e0bb128604 100644 --- a/Utilities/visible_features.m +++ b/Utilities/visible_features.m @@ -23,13 +23,6 @@ function [Y_LOS, Y_pix] = visible_features(MMX, Phobos, Sun, Phi, theta, file_fe %% Geometry - i_feat = Phobos(1:3)/norm(Phobos(1:3)); - v = Phobos(4:6)/norm(Phobos(4:6)); - k = cross(i_feat, v)/norm(cross(i_feat, v)); - j = cross(k, i_feat)/norm(cross(k, i_feat)); - - R2rot = [i_feat, j, k]'; - MMX = pars.MARSIAU2perifocal*MMX(1:3); Phobos = [pars.MARSIAU2perifocal, zeros(3,3); zeros(3,3), pars.MARSIAU2perifocal]*Phobos; @@ -42,13 +35,11 @@ function [Y_LOS, Y_pix] = visible_features(MMX, Phobos, Sun, Phi, theta, file_fe Rtheta = [cos(theta), sin(theta), 0; -sin(theta), cos(theta), 0; 0, 0, 1]; % Light rays direction in the Phobos-fixed reference frame - % r_PhSun = RLibration*R2rot*(Sun(1:3) - Phobos(1:3))/norm(Sun(1:3) - Phobos(1:3)); r_PhSun = RLibration*Rtheta*(Sun(1:3) - Phobos(1:3))/norm(Sun(1:3) - Phobos(1:3)); % Position of MMX wrt Phobos-fixed frame r_sb = MMX(1:3) - Phobos(1:3); R_sb = norm(r_sb); - % r_sb_Ph = RLibration*r_sb; r_sb_Ph = RLibration*Rtheta*r_sb; % MMX-Phobos direction in the Phobos-fixed reference frame @@ -58,7 +49,6 @@ function [Y_LOS, Y_pix] = visible_features(MMX, Phobos, Sun, Phi, theta, file_fe % Features defined in the Phobos-fixed reference frame load(file_features); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Point_Cloud = R_ini*R2rot'*Point_Cloud'; Point_Cloud = R_ini*Point_Cloud'; points = zeros(4,size(Point_Cloud,2)); Y_pix_tot = zeros(2,size(Point_Cloud,2)); diff --git a/Utilities/visible_features_model.m b/Utilities/visible_features_model.m index 22908acba45e542ed93058e611f037222492b64d..a072b8a05ed367546e2618ea2cc0fd3615aac1ac 100644 --- a/Utilities/visible_features_model.m +++ b/Utilities/visible_features_model.m @@ -23,12 +23,6 @@ function [Y_LOS, Y_pix] = visible_features_model(MMX, Phobos, Sun, Xsi, theta, f %% Geometry - i_feat = Phobos(1:3)/norm(Phobos(1:3)); - v = Phobos(4:6)/norm(Phobos(4:6)); - k = cross(i_feat, v)/norm(cross(i_feat, v)); - j = cross(k, i_feat)/norm(cross(k, i_feat)); - - R2rot = [i_feat, j, k]'; MMX = pars.MARSIAU2perifocal*MMX(1:3); Phobos = [pars.MARSIAU2perifocal, zeros(3,3); zeros(3,3), pars.MARSIAU2perifocal]*Phobos; @@ -40,13 +34,11 @@ function [Y_LOS, Y_pix] = visible_features_model(MMX, Phobos, Sun, Xsi, theta, f Rtheta = [cos(theta), sin(theta), 0; -sin(theta), cos(theta), 0; 0, 0, 1]; % Light rays direction in the Phobos-fixed reference frame - % r_PhSun = RLibration*R2rot*(Sun(1:3) - Phobos(1:3))/norm(Sun(1:3) - Phobos(1:3)); r_PhSun = RLibration*Rtheta*(Sun(1:3) - Phobos(1:3))/norm(Sun(1:3) - Phobos(1:3)); % Position of MMX wrt Phobos-fixed frame r_sb = MMX(1:3) - Phobos(1:3); R_sb = norm(r_sb); - % r_sb_Ph = RLibration*r_sb; r_sb_Ph = RLibration*Rtheta*r_sb; @@ -57,7 +49,6 @@ function [Y_LOS, Y_pix] = visible_features_model(MMX, Phobos, Sun, Xsi, theta, f % Features defined in the Phobos-fixed reference frame load(file_features); R_ini = [0, -1, 0; 1, 0, 0; 0, 0, 1]; - % Point_Cloud = R_ini*R2rot'*Point_Cloud'; Point_Cloud = R_ini*Point_Cloud'; points = zeros(4,size(Point_Cloud,2)); Y_pix_tot = zeros(2,size(Point_Cloud,2)); @@ -112,7 +103,7 @@ function [Y_LOS, Y_pix] = visible_features_model(MMX, Phobos, Sun, Xsi, theta, f angle_sun = acos(dot(I,r_PhSun)); - if (angle_feat<pars.FOV)&&(angle_sun>pars.FOV)&&(dot(r_sb_Ph, point_in_light(1:3,n))>0) + % if (angle_feat<pars.FOV)&&(angle_sun>pars.FOV)&&(dot(r_sb_Ph, point_in_light(1:3,n))>0) k = 1; visible = [candidate, visible]; LOS_feat = [y_cam'; z_cam'] * r_sf/norm(r_sf) + [random('Normal',0, pars.ObsNoise.camera);... @@ -124,7 +115,7 @@ function [Y_LOS, Y_pix] = visible_features_model(MMX, Phobos, Sun, Xsi, theta, f pix_feat = pix_feat./repmat(pix_feat(3),3,1); Y_pix = [[pix_feat(1:2); point_in_light(end,n)], Y_pix]; - end + % end end diff --git a/YObs.mat b/YObs.mat index 20e3d9aaf1092409debf4b259f306a3318af5c3c..f8595ba72b9f3a1bd5d1e8822f42e97492542b77 100644 Binary files a/YObs.mat and b/YObs.mat differ