Merging code for Horizons interface

tudat-team · Oct 30, 2023 · 2fcd53c · 2fcd53c
1 parent 58b5770
commit 2fcd53c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/tests/test_time_conversions.py b/tests/test_time_conversions.py
@@ -10,7 +10,7 @@ def test_datetime_conversions():
 
     python_datetime = datetime.fromisoformat('2023-06-20T00:05:23.281765')
     tudat_datetime = time_conversion.datetime_to_tudat( python_datetime )
-    tudat_datetime_string = tudat_datetime.iso_string( False )
+    tudat_datetime_string = tudat_datetime.iso_string( False, 12 )
     python_datetime_reconstructed = time_conversion.datetime_to_python( tudat_datetime )
 
     while (tudat_datetime_string[-1] == '0'):

diff --git a/tudatpy/data/horizons.py b/tudatpy/data/horizons.py
@@ -643,7 +643,7 @@ def vectors(
         aberations: str = "geometric",
     ) -> astropy.table.Table:
         """Retrieve Horizons Vectors api data in raw astropy format.
-        For general purposes, use the `.carthesian()` method instead.
+        For general purposes, use the `.cartesian()` method instead.
 
         Parameters
         ----------
@@ -709,12 +709,12 @@ def vectors(
 
         return raw
 
-    def carthesian(
+    def cartesian(
         self,
         frame_orientation: str = "ECLIPJ2000",
         aberations: str = "geometric",
     ) -> np.ndarray:
-        """Retrieve the carthesian state using the Horizons Vector API.
+        """Retrieve the cartesian state using the Horizons Vector API.
 
         Parameters
         ----------
@@ -737,7 +737,7 @@ def carthesian(
         -------
         np.ndarray
             returns an n by 7 array with the time in seconds since J2000 TDB, 
-            and the carthesian position and velocities.
+            and the cartesian position and velocities.
         """
         raw = self.vectors(frame_orientation=frame_orientation, aberations=aberations)
 
@@ -819,7 +819,7 @@ def create_ephemeris_tabulated(
             raise ValueError(
                 "refplane parameter must be one of: " + '"ECLIPJ2000", "J2000"'
             )
-        vector = self.carthesian(
+        vector = self.cartesian(
             frame_orientation=frame_orientation, aberations=aberations
         )
 

diff --git a/tudatpy/kernel/expose_astro/expose_time_conversion.cpp b/tudatpy/kernel/expose_astro/expose_time_conversion.cpp
@@ -302,6 +302,7 @@ void expose_time_conversion(py::module &m) {
         .def("iso_string",
              &tba::DateTime::isoString,
              py::arg("add_T") = false,
+             py::arg("number_of_digits_seconds") = 15,
              get_docstring("DateTime.iso_string").c_str( ) )
         .def("day_of_year",
              &tba::DateTime::dayOfYear,