Merge pull request #124 from larshinueber/fix/sdbd-typo

Minor consistency updates

Author: DominicDirkx

estimation/covariance_estimated_parameters.ipynb

@@ -73,7 +73,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "e336516b",
    "metadata": {},
    "outputs": [],
@@ -82,11 +82,11 @@
     "spice.load_standard_kernels()\n",
     "\n",
     "# Set simulation start and end epochs\n",
-    "simulation_start_epoch = DateTime(2000, 1, 1).epoch()\n",
-    "simulation_end_epoch   = DateTime(2000, 1, 5).epoch()\n",
+    "simulation_start_epoch = DateTime(2000, 1, 1).to_epoch()\n",
+    "simulation_end_epoch   = DateTime(2000, 1, 5).to_epoch()\n",
     "\n",
-    "observation_start_epoch = DateTime(2000, 1, 2).epoch()\n",
-    "observation_end_epoch   = DateTime(2000, 1, 4).epoch()"
+    "observation_start_epoch = DateTime(2000, 1, 2).to_epoch()\n",
+    "observation_end_epoch   = DateTime(2000, 1, 4).to_epoch()"
    ]
   },
   {
@@ -256,17 +256,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "id": "12458abf",
    "metadata": {},
    "outputs": [],
    "source": [
     "# Retrieve the initial state of Delfi-C3 using Two-Line-Elements (TLEs)\n",
-    "delfi_tle = environment.Tle(\n",
+    "delfi_tle = environment_setup.ephemeris.sgp4(\n",
     "    \"1 32789U 07021G   08119.60740078 -.00000054  00000-0  00000+0 0  9999\",\n",
     "    \"2 32789 098.0082 179.6267 0015321 307.2977 051.0656 14.81417433    68\",\n",
     ")\n",
-    "delfi_ephemeris = environment.TleEphemeris(\"Earth\", \"J2000\", delfi_tle, False)\n",
+    "delfi_ephemeris = environment_setup.create_body_ephemeris(delfi_tle, \"Delfi-C3\")\n",
     "initial_state = delfi_ephemeris.cartesian_state( simulation_start_epoch )"
    ]
   },
@@ -975,7 +975,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "tudat-examples",
    "language": "python",
    "name": "python3"
   },
@@ -989,7 +989,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.13"
+   "version": "3.12.11"
   }
  },
  "nbformat": 4,

estimation/covariance_estimated_parameters.py

@@ -56,11 +56,11 @@
 spice.load_standard_kernels()
 
 # Set simulation start and end epochs
-simulation_start_epoch = DateTime(2000, 1, 1).epoch()
-simulation_end_epoch   = DateTime(2000, 1, 5).epoch()
+simulation_start_epoch = DateTime(2000, 1, 1).to_epoch()
+simulation_end_epoch   = DateTime(2000, 1, 5).to_epoch()
 
-observation_start_epoch = DateTime(2000, 1, 2).epoch()
-observation_end_epoch   = DateTime(2000, 1, 4).epoch()
+observation_start_epoch = DateTime(2000, 1, 2).to_epoch()
+observation_end_epoch   = DateTime(2000, 1, 4).to_epoch()
 
 
 """
@@ -186,11 +186,11 @@
 
 
 # Retrieve the initial state of Delfi-C3 using Two-Line-Elements (TLEs)
-delfi_tle = environment.Tle(
+delfi_tle = environment_setup.ephemeris.sgp4(
     "1 32789U 07021G   08119.60740078 -.00000054  00000-0  00000+0 0  9999",
     "2 32789 098.0082 179.6267 0015321 307.2977 051.0656 14.81417433    68",
 )
-delfi_ephemeris = environment.TleEphemeris("Earth", "J2000", delfi_tle, False)
+delfi_ephemeris = environment_setup.create_body_ephemeris(delfi_tle, "Delfi-C3")
 initial_state = delfi_ephemeris.cartesian_state( simulation_start_epoch )
 
 

estimation/covariance_propagation_example.ipynb

@@ -70,7 +70,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "e336516b",
    "metadata": {},
    "outputs": [],
@@ -79,14 +79,14 @@
     "spice.load_standard_kernels()\n",
     "\n",
     "# Set simulation start and end epochs\n",
-    "simulation_start_epoch = DateTime(2024, 8, 28).epoch()\n",
-    "simulation_end_epoch   = DateTime(2024, 9, 5).epoch()\n",
-    "observation_start_epoch_1 = DateTime(2024, 8, 30).epoch()\n",
-    "observation_end_epoch_1   = DateTime(2024, 9, 1).epoch()\n",
-    "observation_start_epoch_2   = DateTime(2024, 9, 3).epoch()\n",
-    "observation_end_epoch_2   = DateTime(2024, 9, 4).epoch()\n",
-    "\n",
-    "observation_start_epoch_3   = DateTime(2024, 8, 29).epoch()\n",
+    "simulation_start_epoch = DateTime(2024, 8, 28).to_epoch()\n",
+    "simulation_end_epoch   = DateTime(2024, 9, 5).to_epoch()\n",
+    "observation_start_epoch_1 = DateTime(2024, 8, 30).to_epoch()\n",
+    "observation_end_epoch_1   = DateTime(2024, 9, 1).to_epoch()\n",
+    "observation_start_epoch_2   = DateTime(2024, 9, 3).to_epoch()\n",
+    "observation_end_epoch_2   = DateTime(2024, 9, 4).to_epoch()\n",
+    "\n",
+    "observation_start_epoch_3   = DateTime(2024, 8, 29).to_epoch()\n",
     "observation_end_epoch_3 = simulation_end_epoch"
    ]
   },
@@ -260,17 +260,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "id": "12458abf",
    "metadata": {},
    "outputs": [],
    "source": [
     "# Retrieve the initial state of `Starlink-32101` using Two-Line-Elements (TLEs)\n",
-    "Starlink_tle = environment.Tle(\n",
+    "Starlink_tle = environment_setup.ephemeris.sgp4(\n",
     "    \"1 60447U 24144Y   24239.91667824 -.00652022  00000-0 -25508-2 0  9990\",\n",
     "    \"2 60447  53.1498 303.6008 0000548  88.4809  23.6264 15.87779028  3478\",\n",
     ")\n",
-    "Starlink_ephemeris = environment.TleEphemeris(\"Earth\", \"J2000\", Starlink_tle, False)\n",
+    "Starlink_ephemeris = environment_setup.create_body_ephemeris(Starlink_tle, \"Starlink-32101\")\n",
     "initial_state = Starlink_ephemeris.cartesian_state( simulation_start_epoch )"
    ]
   },
@@ -756,7 +756,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "tudat-examples",
    "language": "python",
    "name": "python3"
   },
@@ -770,7 +770,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.13"
+   "version": "3.12.11"
   }
  },
  "nbformat": 4,

estimation/covariance_propagation_example.py

@@ -53,14 +53,14 @@
 spice.load_standard_kernels()
 
 # Set simulation start and end epochs
-simulation_start_epoch = DateTime(2024, 8, 28).epoch()
-simulation_end_epoch   = DateTime(2024, 9, 5).epoch()
-observation_start_epoch_1 = DateTime(2024, 8, 30).epoch()
-observation_end_epoch_1   = DateTime(2024, 9, 1).epoch()
-observation_start_epoch_2   = DateTime(2024, 9, 3).epoch()
-observation_end_epoch_2   = DateTime(2024, 9, 4).epoch()
-
-observation_start_epoch_3   = DateTime(2024, 8, 29).epoch()
+simulation_start_epoch = DateTime(2024, 8, 28).to_epoch()
+simulation_end_epoch   = DateTime(2024, 9, 5).to_epoch()
+observation_start_epoch_1 = DateTime(2024, 8, 30).to_epoch()
+observation_end_epoch_1   = DateTime(2024, 9, 1).to_epoch()
+observation_start_epoch_2   = DateTime(2024, 9, 3).to_epoch()
+observation_end_epoch_2   = DateTime(2024, 9, 4).to_epoch()
+
+observation_start_epoch_3   = DateTime(2024, 8, 29).to_epoch()
 observation_end_epoch_3 = simulation_end_epoch
 
 
@@ -190,11 +190,11 @@
 
 
 # Retrieve the initial state of `Starlink-32101` using Two-Line-Elements (TLEs)
-Starlink_tle = environment.Tle(
+Starlink_tle = environment_setup.ephemeris.sgp4(
     "1 60447U 24144Y   24239.91667824 -.00652022  00000-0 -25508-2 0  9990",
     "2 60447  53.1498 303.6008 0000548  88.4809  23.6264 15.87779028  3478",
 )
-Starlink_ephemeris = environment.TleEphemeris("Earth", "J2000", Starlink_tle, False)
+Starlink_ephemeris = environment_setup.create_body_ephemeris(Starlink_tle, "Starlink-32101")
 initial_state = Starlink_ephemeris.cartesian_state( simulation_start_epoch )
 
 

estimation/estimation_dynamical_models.ipynb

@@ -83,7 +83,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -92,8 +92,8 @@
     "spice.load_kernel(current_directory + \"/ORMM_T19_031222180906_00052.BSP\")\n",
     "\n",
     "# Set simulation start (January 1st, 2004 - 00:00) and end epochs (January 11th, 2004 - 00:00)\n",
-    "simulation_start_epoch = DateTime(2004, 1,  1).epoch()\n",
-    "simulation_end_epoch   = DateTime(2004, 1, 11).epoch()\n",
+    "simulation_start_epoch = DateTime(2004, 1,  1).to_epoch()\n",
+    "simulation_end_epoch   = DateTime(2004, 1, 11).to_epoch()\n",
     "\n",
     "### CELESTIAL BODIES ###\n",
     "# Create default body settings for \"Mars\", \"Phobos\", \"Deimos\", \"Sun\", \"Jupiter\", \"Earth\"\n",

estimation/estimation_dynamical_models.py

@@ -52,8 +52,8 @@
 spice.load_kernel(current_directory + "/ORMM_T19_031222180906_00052.BSP")
 
 # Set simulation start (January 1st, 2004 - 00:00) and end epochs (January 11th, 2004 - 00:00)
-simulation_start_epoch = DateTime(2004, 1,  1).epoch()
-simulation_end_epoch   = DateTime(2004, 1, 11).epoch()
+simulation_start_epoch = DateTime(2004, 1,  1).to_epoch()
+simulation_end_epoch   = DateTime(2004, 1, 11).to_epoch()
 
 ### CELESTIAL BODIES ###
 # Create default body settings for "Mars", "Phobos", "Deimos", "Sun", "Jupiter", "Earth"

estimation/estimation_with_mpc.ipynb

@@ -79,7 +79,7 @@
     "### Setting some constants\n",
     "Let's setup some constants that are used throughout the tutorial. The **MPC code** for Eros is 433. We also set a start and end date for our observations, the number of iterations for our estimation, a timestep for our integrator and a 1 month buffer to avoid interpolation errors in our analysis.\n",
     "\n",
-    "We use a spice kernel to get a guess for our initial state and to check our estimation afterwards. The default spice kernel `codes_300ast_20100725.bsp` contains many popular asteroids, however they are not all identified by name (433 Eros is `\"Eros\"` but 16 Psyche is `\"2000016\"` etc.). To ensure this example works dynamically, for any single MPC code as input we use the SDBD to retrieve the name and SPK-ID used for the spice kernel.\n",
+    "We use a spice kernel to get a guess for our initial state and to check our estimation afterwards. The default spice kernel `codes_300ast_20100725.bsp` contains many popular asteroids, however they are not all identified by name (433 Eros is `\"Eros\"` but 16 Psyche is `\"2000016\"` etc.). To ensure this example works dynamically, for any single MPC code as input we use the SBDB to retrieve the name and SPK-ID used for the spice kernel.\n",
     "\n",
     "For our frame origin we use the Solar System Barycenter. The data from MPC is presented in the J2000 reference frame, currently BatchMPC does not support conversion to other reference frames and as such we match it in our environment. "
    ]

estimation/estimation_with_mpc.py

@@ -55,7 +55,7 @@
 ### Setting some constants
 Let's setup some constants that are used throughout the tutorial. The **MPC code** for Eros is 433. We also set a start and end date for our observations, the number of iterations for our estimation, a timestep for our integrator and a 1 month buffer to avoid interpolation errors in our analysis.
 
-We use a spice kernel to get a guess for our initial state and to check our estimation afterwards. The default spice kernel `codes_300ast_20100725.bsp` contains many popular asteroids, however they are not all identified by name (433 Eros is `"Eros"` but 16 Psyche is `"2000016"` etc.). To ensure this example works dynamically, for any single MPC code as input we use the SDBD to retrieve the name and SPK-ID used for the spice kernel.
+We use a spice kernel to get a guess for our initial state and to check our estimation afterwards. The default spice kernel `codes_300ast_20100725.bsp` contains many popular asteroids, however they are not all identified by name (433 Eros is `"Eros"` but 16 Psyche is `"2000016"` etc.). To ensure this example works dynamically, for any single MPC code as input we use the SBDB to retrieve the name and SPK-ID used for the spice kernel.
 
 For our frame origin we use the Solar System Barycenter. The data from MPC is presented in the J2000 reference frame, currently BatchMPC does not support conversion to other reference frames and as such we match it in our environment. 
 """

estimation/full_estimation_example.ipynb

@@ -97,15 +97,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "id": "baedd9b2",
    "metadata": {},
    "outputs": [],
    "source": [
     "# Set simulation start and end epochs\n",
     "time_buffer = 10\n",
-    "simulation_start_epoch = DateTime(2000, 1, 1).epoch() - time_buffer\n",
-    "simulation_end_epoch   = DateTime(2000, 1, 4).epoch() + time_buffer"
+    "simulation_start_epoch = DateTime(2000, 1, 1).to_epoch() - time_buffer\n",
+    "simulation_end_epoch   = DateTime(2000, 1, 4).to_epoch() + time_buffer"
    ]
   },
   {
@@ -391,19 +391,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": null,
    "id": "e381be97",
    "metadata": {
     "lines_to_next_cell": 2
    },
    "outputs": [],
    "source": [
     "# Retrieve the initial state of Delfi-C3 using Two-Line-Elements (TLEs)\n",
-    "delfi_tle = environment.Tle(\n",
+    "delfi_tle = environment_setup.ephemeris.sgp4(\n",
     "    \"1 32789U 07021G   08119.60740078 -.00000054  00000-0  00000+0 0  9999\",\n",
     "    \"2 32789 098.0082 179.6267 0015321 307.2977 051.0656 14.81417433    68\",\n",
     ")\n",
-    "delfi_ephemeris = environment.TleEphemeris(\"Earth\", \"J2000\", delfi_tle, False)\n",
+    "delfi_ephemeris = environment_setup.create_body_ephemeris(delfi_tle, \"Delfi-C3\")\n",
     "initial_state = delfi_ephemeris.cartesian_state( simulation_start_epoch )"
    ]
   },

estimation/full_estimation_example.py

@@ -60,8 +60,8 @@
 
 # Set simulation start and end epochs
 time_buffer = 10
-simulation_start_epoch = DateTime(2000, 1, 1).epoch() - time_buffer
-simulation_end_epoch   = DateTime(2000, 1, 4).epoch() + time_buffer
+simulation_start_epoch = DateTime(2000, 1, 1).to_epoch() - time_buffer
+simulation_end_epoch   = DateTime(2000, 1, 4).to_epoch() + time_buffer
 
 
 """
@@ -215,11 +215,11 @@
 
 
 # Retrieve the initial state of Delfi-C3 using Two-Line-Elements (TLEs)
-delfi_tle = environment.Tle(
+delfi_tle = environment_setup.ephemeris.sgp4(
     "1 32789U 07021G   08119.60740078 -.00000054  00000-0  00000+0 0  9999",
     "2 32789 098.0082 179.6267 0015321 307.2977 051.0656 14.81417433    68",
 )
-delfi_ephemeris = environment.TleEphemeris("Earth", "J2000", delfi_tle, False)
+delfi_ephemeris = environment_setup.create_body_ephemeris(delfi_tle, "Delfi-C3")
 initial_state = delfi_ephemeris.cartesian_state( simulation_start_epoch )