Moving to develop for test

tudat-team · Dec 13, 2024 · 9bd0845 · 9bd0845
1 parent ace740d
commit 9bd0845
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 34 deletions.
diff --git a/include/tudat/astro/observation_models/oneWayDopplerObservationModel.h b/include/tudat/astro/observation_models/oneWayDopplerObservationModel.h
@@ -283,7 +283,7 @@ class DirectFirstOrderDopplerProperTimeRateInterface:
      */
     DirectFirstOrderDopplerProperTimeRateInterface(
             const LinkEndType computationPointLinkEndType,
-            const std::function< double( ) > gravitationalParameterFunction,
+            const std::vector< std::function< double( ) > > gravitationalParameterFunction,
             const std::string& referenceBody,
             const LinkEndType referencePointLinkEndType = unidentified_link_end,
             const std::vector< std::function< Eigen::Vector6d( const double ) > > referencePointStateFunction =
@@ -386,44 +386,44 @@ class DirectFirstOrderDopplerProperTimeRateInterface:
             return ( ( referencePointLinkEndType_ == transmitter ) ? linkEndStates.at( 0 ) : linkEndStates.at( 1 ) );
         }
     }
-
-    //! Function to retrieve central body gravitational parameter
-    /*!
-     * Function to retrieve central body gravitational parameter
-     * \return Central body gravitational parameter
-     */
-    double getGravitationalParameter( )
-    {
-        return gravitationalParameterFunction_( );
-    }
-
-    //! Function to return the name of body generating the gravity field.
-    /*!
-     * Function to return the name of body generating the gravity field
-     * \return Name of body generating the gravity field
-     */
-    std::string getCentralBody( )
-    {
-        return referenceBody_;
-    }
+//
+//    //! Function to retrieve central body gravitational parameter
+//    /*!
+//     * Function to retrieve central body gravitational parameter
+//     * \return Central body gravitational parameter
+//     */
+//    double getGravitationalParameter( )
+//    {
+//        return gravitationalParameterFunction_( );
+//    }
+//
+//    //! Function to return the name of body generating the gravity field.
+//    /*!
+//     * Function to return the name of body generating the gravity field
+//     * \return Name of body generating the gravity field
+//     */
+//    std::string getCentralBody( )
+//    {
+//        return referenceBodies_;
+//    }
 
 private:
 
     //! Function that returns the gravitational parameter of the central body.
-    std::function< double( ) > gravitationalParameterFunction_;
+    std::vector< std::function< double( ) > > gravitationalParameterFunctions_;
 
     //! Name of body generating the gravity field.
-    std::string referenceBody_;
+    std::vector< std::string > referenceBodies_;
 
     //! Link end type of central body (unidentified_link_end if central body is not one of the link ends)
-    LinkEndType referencePointLinkEndType_;
+    std::vector< LinkEndType > referencePointLinkEndType_;
 
     //! Function that returns the state of the central body as a function of time.
     /*!
      *  Function that returns the state of the central body as a function of time,  must be provided if
      *  referencePointLinkEndType equals unidentified_link_end.
      */
-    std::function< Eigen::Vector6d( const double ) > referencePointStateFunction_;
+    std::vector< std::function< Eigen::Vector6d( const double ) > > referencePointStateFunctions_;
 
 
 };

diff --git a/include/tudat/simulation/estimation_setup/createObservationModel.h b/include/tudat/simulation/estimation_setup/createObservationModel.h
@@ -2499,7 +2499,6 @@ class ObservationModelCreator< 1, ObservationScalarType, TimeType >
                             "Error when making n-way differenced range observation model, input "
                             "type inconsistent" );
                 }
-<<<<<<< HEAD
             }
 
             std::shared_ptr< ground_stations::GroundStationState > receivingStationState =
@@ -2534,13 +2533,6 @@ class ObservationModelCreator< 1, ObservationScalarType, TimeType >
                     ObservationModelCreator< 1, ObservationScalarType, TimeType >::createObservationModel(
                         twoWaySettings, bodies ) );
                 if( twoWayDopplerModel == nullptr )
-=======
-                std::shared_ptr< NWayRangeObservationModel< ObservationScalarType, TimeType > >
-                        arcStartObservationModel;
-                std::shared_ptr< NWayRangeObservationModel< ObservationScalarType, TimeType > >
-                        arcEndObservationModel;
-                try
->>>>>>> develop
                 {
                     std::shared_ptr< ObservationModelSettings > undifferencedObservationSettings =
                             nWayDifferencedRangeObservationSettings
@@ -2586,7 +2578,8 @@ class ObservationModelCreator< 1, ObservationScalarType, TimeType >
                         observationBias );
                 break;
             }
-            case dsn_n_way_averaged_doppler: {
+            case dsn_n_way_averaged_doppler:
+            {
                 std::shared_ptr< DsnNWayAveragedDopplerObservationSettings >
                         dsnNWayAveragedDopplerObservationSettings = std::dynamic_pointer_cast<
                                 DsnNWayAveragedDopplerObservationSettings >( observationSettings );