Fix the calculation of the conversion factor. Note that the conversio…

…n factor is now calculated using the reference frequency read from odf files. This should be the uplink frequency. Add the set_transponder_delay method to the ObservationCollection class. Changes: - modified: include/tudat/astro/observation_models/dsnNWayRangeObservationModel.h - modified: include/tudat/astro/observation_models/lightTimeSolution.h - modified: include/tudat/astro/observation_models/observationModel.h - modified: include/tudat/simulation/estimation_setup/createObservationModel.h - modified: include/tudat/simulation/estimation_setup/observations.h - modified: include/tudat/simulation/estimation_setup/processOdfFile.h
valeriof7 · Dec 10, 2024 · 7cec905 · 7cec905
1 parent 58e8e83
commit 7cec905
Show file tree

Hide file tree

Showing 6 changed files with 2,067 additions and 1,186 deletions.
diff --git a/include/tudat/astro/observation_models/dsnNWayRangeObservationModel.h b/include/tudat/astro/observation_models/dsnNWayRangeObservationModel.h
@@ -18,7 +18,6 @@
 #include <stdexcept>
 #include <string>
 
-#include "tudat/astro/basic_astro/physicalConstants.h"
 #include "tudat/astro/observation_models/nWayRangeObservationModel.h"
 #include "tudat/astro/observation_models/observableTypes.h"
 #include "tudat/astro/observation_models/observationFrequencies.h"
@@ -198,10 +197,6 @@ class DsnNWayRangeObservationModel : public ObservationModel< 1, ObservationScal
                                 utcTransmissionTime, utcReceptionTime );
         ObservationScalarType rangeUnitIntegral = conversionFactor * transmitterFrequencyIntegral;
 
-        ancillarySettings->setAncilliaryDoubleData(
-                range_conversion_factor,
-                1 / rangeUnitIntegral * physical_constants::SPEED_OF_LIGHT );
-
         // Moyer (2000), eq. 13-54
         Eigen::Matrix< ObservationScalarType, 1, 1 > observation =
                 ( Eigen::Matrix< ObservationScalarType, 1, 1 >( )

diff --git a/include/tudat/astro/observation_models/lightTimeSolution.h b/include/tudat/astro/observation_models/lightTimeSolution.h
@@ -871,8 +871,6 @@ class MultiLegLightTimeCalculator
                     link_ends_delays, false );
         }
 
-        linkEndsDelays_[1] = 1.4149E-6;
-
         if ( !linkEndsDelays_.empty( ) )
         {
             // Delays vector already including delays at receiving and transmitting stations

diff --git a/include/tudat/astro/observation_models/observationModel.h b/include/tudat/astro/observation_models/observationModel.h
@@ -303,7 +303,6 @@ inline std::shared_ptr< ObservationAncilliarySimulationSettings > getDsnNWayRang
         const std::vector< FrequencyBands > &frequencyBands,
         const double referenceFrequency,
         const double lowestRangingComponent,
-        const double rangeConversionFactor = 0.0,
         const std::vector< double > linkEndsDelays = std::vector< double >( ) )
 
 {
@@ -314,7 +313,6 @@ inline std::shared_ptr< ObservationAncilliarySimulationSettings > getDsnNWayRang
                                                 lowestRangingComponent );
     ancillarySettings->setAncilliaryDoubleData( sequential_range_reference_frequency,
                                                 referenceFrequency );
-    ancillarySettings->setAncilliaryDoubleData( range_conversion_factor, rangeConversionFactor );
 
     ancillarySettings->setAncilliaryDoubleVectorData(
             frequency_bands, convertFrequencyBandsToDoubleVector( frequencyBands ) );

diff --git a/include/tudat/simulation/estimation_setup/createObservationModel.h b/include/tudat/simulation/estimation_setup/createObservationModel.h
@@ -1057,9 +1057,10 @@ class DsnNWayRangeObservationSettings : public ObservationModelSettings
     /*!
      * Constructor for different light-time corrections per link
      * \param oneWayRangeObservationSettings List of settings for the one-way range observation
-     * models \param biasSettings Settings for the observation bias model that is to be used
-     * (default none: nullptr) \param lightTimeConvergenceCriteria Settings for the light-time
-     * convergence criteria
+     * models
+     * \param biasSettings Settings for the observation bias model that is to be used (default none:
+     * nullptr)
+     * \param lightTimeConvergenceCriteria Settings for the light-time convergence criteria
      */
     DsnNWayRangeObservationSettings(
             const std::vector< std::shared_ptr< ObservationModelSettings > >