Merge branch 'feature/observation_collection_logic' into develop

tudat-team · Jan 21, 2025 · 79ee306 · 79ee306
2 parents bf1257c + 61ea53b
commit 79ee306
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/tudatpy/kernel/expose_numerical_simulation/expose_estimation.cpp b/tudatpy/kernel/expose_numerical_simulation/expose_estimation.cpp
@@ -796,7 +796,10 @@ void expose_estimation(py::module &m) {
                           &tom::ObservationCollection< STATE_SCALAR_TYPE, TIME_TYPE >::setTabulatedWeights ),
                   py::arg( "tabulated_weights" ),
                   get_docstring( "set_tabulated_weights" ).c_str() )
-            .def( "filter_observations",
+             .def( "append",
+                   &tom::ObservationCollection< STATE_SCALAR_TYPE, TIME_TYPE >::appendObservationCollection,
+                   py::arg( "observation_collection_to_append" ) )
+        .def( "filter_observations",
                   py::overload_cast<
                   const std::map< std::shared_ptr< tom::ObservationCollectionParser >,
                   std::shared_ptr< tom::ObservationFilterBase > >&,
@@ -915,6 +918,9 @@ void expose_estimation(py::module &m) {
                   py::arg( "observation_parser" ) = std::make_shared< tom::ObservationCollectionParser >( ),
                   get_docstring( "dependent_variable_history" ).c_str( ) );
 
+    m.def("merge_observation_collections",
+          &tss::mergeObservationCollections< STATE_SCALAR_TYPE, TIME_TYPE >,
+          py::arg("observation_collection_list") );
 
     m.def( "create_single_observation_set",
            py::overload_cast<

diff --git a/...y/kernel/expose_numerical_simulation/expose_estimation_setup/expose_observation_setup.cpp b/...y/kernel/expose_numerical_simulation/expose_estimation_setup/expose_observation_setup.cpp
@@ -1415,6 +1415,19 @@ void expose_observation_setup( py::module& m )
                    tss::getCombinedApproximateGroundStationPositions( ),
            get_docstring( "create_odf_observed_observation_collection" ).c_str( ) );
 
+    m.def( "observations_from_multi_station_ifms_files",
+           &tom::createMultiStationIfmsObservedObservationCollectionFromFiles< STATE_SCALAR_TYPE, TIME_TYPE >,
+           py::arg( "ifms_file_names" ),
+           py::arg( "bodies" ),
+           py::arg( "target_name" ),
+           py::arg( "ground_station_names" ),
+           py::arg( "reception_band" ),
+           py::arg( "transmission_band" ),
+           py::arg( "apply_troposphere_correction" ) = true,
+           py::arg( "earth_fixed_station_positions" ) =
+               tss::getCombinedApproximateGroundStationPositions( ),
+           get_docstring( "create_odf_observed_observation_collection" ).c_str( ) );
+
     m.def( "observations_from_fdets_files",
            &tom::createFdetsObservedObservationCollectionFromFile< STATE_SCALAR_TYPE, TIME_TYPE >,
            py::arg( "ifms_file_name" ),