From 2ff9c0515cbee02373704bea058ae398732fce99 Mon Sep 17 00:00:00 2001 From: Christopher Rabotin Date: Sat, 15 Jun 2024 15:39:42 -0600 Subject: [PATCH] Fix two way measurement --- src/od/msr/range_doppler.rs | 4 ++-- src/od/simulator/trackdata.rs | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/od/msr/range_doppler.rs b/src/od/msr/range_doppler.rs index b16b1b76..e9f36841 100644 --- a/src/od/msr/range_doppler.rs +++ b/src/od/msr/range_doppler.rs @@ -84,8 +84,8 @@ impl RangeDoppler { ); } - let range_km = (aer_t1.range_km - aer_t0.range_km) * 0.5; - let doppler_km_s = (aer_t1.range_rate_km_s - aer_t0.range_rate_km_s) * 0.5; + let range_km = (aer_t1.range_km + aer_t0.range_km) * 0.5; + let doppler_km_s = (aer_t1.range_rate_km_s + aer_t0.range_rate_km_s) * 0.5; // Time tagged at the realization of this measurement, i.e. at the end of the integration time. let epoch = aer_t1.epoch + timestamp_noise_s * Unit::Second; diff --git a/src/od/simulator/trackdata.rs b/src/od/simulator/trackdata.rs index 7572c056..58ed7be8 100644 --- a/src/od/simulator/trackdata.rs +++ b/src/od/simulator/trackdata.rs @@ -31,8 +31,6 @@ use crate::md::trajectory::Interpolatable; use crate::od::{Measurement, ODError}; use crate::Orbit; -// TODO(ANISE): TrackignDevice is now FromStr. Does that make sense?! - /// Tracking device simulator. pub trait TrackingDeviceSim: ConfigRepr where