open-space-toolkit-astrodynamics 15.4.0__py310-none-manylinux2014_x86_64.whl → 15.6.0__py310-none-manylinux2014_x86_64.whl

{open_space_toolkit_astrodynamics-15.4.0.dist-info → open_space_toolkit_astrodynamics-15.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: open-space-toolkit-astrodynamics
-Version: 15.4.0
+Version: 15.6.0
 Summary: Orbit, attitude, access.
 Author: Open Space Collective
 Author-email: contact@open-space-collective.org

{open_space_toolkit_astrodynamics-15.4.0.dist-info → open_space_toolkit_astrodynamics-15.6.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 ostk/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
-ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-310-x86_64-linux-gnu.so,sha256=33Lo0JWYGrxPzR-W_BYiEcZDuPQWDU0ikz3i3XoRc88,2783456
+ostk/astrodynamics/OpenSpaceToolkitAstrodynamicsPy.cpython-310-x86_64-linux-gnu.so,sha256=Ql5Pwl8rTTQCnDr2SqKdzbXfEs9pUyYIshgqrBFNRsk,2783456
 ostk/astrodynamics/__init__.py,sha256=3gWyqFIbhAfcdeMhmfBPQPlPQTmaOzm-6flkJe745Zk,251
-ostk/astrodynamics/__init__.pyi,sha256=Mo09GGyTG38COfV--jg9sNwOb_zC_-Ijo0a3DklFn7A,31428
+ostk/astrodynamics/__init__.pyi,sha256=k5qacrb9mi4C7v67m6gUVYzgz_Wq4NwMuv75apjXx-s,31428
 ostk/astrodynamics/access.pyi,sha256=t2CF0TU6_6ow_rkV_I4rVKap7ZIdC4jYKL3WkTDHRXg,25157
 ostk/astrodynamics/converters.py,sha256=luPh30qMp9bzEkN7hUccmxlLf7zRp_AzqmBe8IUjPhU,3314
 ostk/astrodynamics/converters.pyi,sha256=HrZFyizkc6Hv_K38ZKZ80fX_bAxd6keA_NFWNQygvbs,1745
-ostk/astrodynamics/dataframe.py,sha256=9fXRk7sJl_OrBTCjZC_TFx6JMPE7IDGqv2JgEmGCdgM,18775
+ostk/astrodynamics/dataframe.py,sha256=v-36rBHKdf7kQw1jdvJWrvkR-ZjW5DKRchtTEJWhdxk,25012
 ostk/astrodynamics/display.py,sha256=LZESZgx2wlrFO4cwAGMb3VPJfdtcjNgCgKFrqot0NYU,6339
 ostk/astrodynamics/dynamics.pyi,sha256=gZ95KoGex4SB-1z6yMrngkZN1Ir9X6bEmrZgdLxq1ZE,13270
 ostk/astrodynamics/estimator.pyi,sha256=MnahWzp8aACxrNKWlYRsgQr5zpBxogNr-yPm7hJob5k,14000
 ostk/astrodynamics/event_condition.pyi,sha256=LXvZCbKnX6kzES7iMG51lJRnIA64YFsU5mUY2RW9fkM,24798
 ostk/astrodynamics/guidance_law.pyi,sha256=rVmbpV2Y5FsIXejaInxINS67nVHmTIxVEkhaDIn17SA,12171
-ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.15,sha256=GJv_goDvh5E39uNWSU6gGDJkatb_ahkfGg736-RT2sw,120481608
+ostk/astrodynamics/libopen-space-toolkit-astrodynamics.so.15,sha256=wiX7NXvgBVERrXHEVvMrk_ckQiTd-JMebV4jAkJWLqs,120497008
 ostk/astrodynamics/solver.pyi,sha256=sPqyYPXBfFGC24dzzYyFyt01VfMAlWQ5_gh_RpeaBFk,17734
 ostk/astrodynamics/utilities.py,sha256=y8mr3M46J5z-GhS1oIEnuEJA6otwcyJ9YDhvn_5JxHM,6976
-ostk/astrodynamics/viewer.py,sha256=SpcvBqXx3CAZpk7UGOPT1ilxywmAmNpgqpuRY11Hwx0,16376
+ostk/astrodynamics/viewer.py,sha256=-Q4migLFOB9dNzs6TRPIXHNewyV5udsDSpcSma0kv8A,16376
 ostk/astrodynamics/conjunction/__init__.pyi,sha256=HFvWl8bCmrq3cBkUh5X5RGIh8webmVGxaZdpsz3WN-E,79
 ostk/astrodynamics/conjunction/message/__init__.pyi,sha256=5H__sg_QUx7ybf9jtVWvXzrUHeK3ECotfhddAdHjJUc,75
 ostk/astrodynamics/conjunction/message/ccsds.pyi,sha256=1Peto19hRqlD7KHf1cyLP3CT4OAKzwtemqvO6_4FZ0g,28162
@@ -32,7 +32,7 @@ ostk/astrodynamics/test/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3I
 ostk/astrodynamics/test/conftest.py,sha256=stmQOt7UXjBlXKJzNN6RkS2miv1xXSOX-YNpFhaHTqI,2771
 ostk/astrodynamics/test/test_access.py,sha256=MCBsUPtuVm7NgHZR0z0DpWnPZ_qBu4aRhLI2PnRNUYs,3940
 ostk/astrodynamics/test/test_converters.py,sha256=mFpDD0YM8o356lj91GGIwYdMk2ut6xZFV3uYcgZepMY,8744
-ostk/astrodynamics/test/test_dataframe.py,sha256=IJMOODzTVYtiPxekmltH6lOMArPXbHwSEAl-jg0Ab2g,28414
+ostk/astrodynamics/test/test_dataframe.py,sha256=NddmwnV8R1QgTD_iLXn_h0xK2kP5Qk22Oh93hF6KjT0,38300
 ostk/astrodynamics/test/test_display.py,sha256=6giw_i08YMOSRgqNpdVWtzDu6fFalEVKz_Uisu3N_X8,3870
 ostk/astrodynamics/test/test_event_condition.py,sha256=fQ-rVYpQsa7xacxRMBOQDyn61CuAGX1QBOGZxGWR0_s,2204
 ostk/astrodynamics/test/test_import.py,sha256=py_hALBR0IYuUzv9dfgQZzrrLHJIpnyKvt3Oi1XBqCg,1251
@@ -111,7 +111,7 @@ ostk/astrodynamics/test/trajectory/orbit/models/kepler/test_coe.py,sha256=ryMfYH
 ostk/astrodynamics/test/trajectory/orbit/models/sgp4/__init__.py,sha256=epnVn2PwdQkUDZ1msqBRO5nEZIOUBIq-IfK3IlNPijE,21
 ostk/astrodynamics/test/trajectory/orbit/models/sgp4/test_tle.py,sha256=jkyRr5NJQMaSpI3ey7cKcH0E-BlalaUlf_mZPYTSow8,11482
 ostk/astrodynamics/test/trajectory/state/test_coordinate_broker.py,sha256=ho5FBfB3IvIjfQl7EYoIN1KBuH9lu76IiNMuweq8cqg,2844
-ostk/astrodynamics/test/trajectory/state/test_coordinate_subset.py,sha256=uSvwLSZ332IreBkHD6PmAF2TFE6g_-o4tRLu9mR-IDg,1580
+ostk/astrodynamics/test/trajectory/state/test_coordinate_subset.py,sha256=UnJM4sYsE6-s6tETDI3aR846Zd3u2j75RfrGlpoKLyE,1691
 ostk/astrodynamics/test/trajectory/state/test_numerical_solver.py,sha256=0uh87wFRRF7UNh4cSI6WWAcAEF13TY4_VRBJ_gifnyY,9415
 ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_angular_velocity.py,sha256=xjyGREKpxDuT8gjtBPkV4osfW-6UyWv9hgvBXZVb_wk,625
 ostk/astrodynamics/test/trajectory/state/coordinate_subset/test_attitude_quaternion.py,sha256=UEu9ApzQLmT87eeISw6_gcHTlX-4b2scIvHz-uE1p_c,393
@@ -126,10 +126,10 @@ ostk/astrodynamics/trajectory/orbit/model/__init__.pyi,sha256=DYgjafm4rMV9Cqzg6d
 ostk/astrodynamics/trajectory/orbit/model/brouwerLyddaneMean.pyi,sha256=t1jbWsK8JgXkx-l_WSg96xfEG9fsddZ_CjqLpC3GBVY,5874
 ostk/astrodynamics/trajectory/orbit/model/kepler.pyi,sha256=KZH_m7mqwXNKFTu4zLRMl_pG7ADQ9Zo6j3FYuVNnLwQ,26955
 ostk/astrodynamics/trajectory/orbit/model/sgp4.pyi,sha256=OhFzoPPQHlYy7m3LiZ8TXF89M4uBTfNk6tGsBEp0sjI,14235
-ostk/astrodynamics/trajectory/state/__init__.pyi,sha256=_NrkgYTo9YQ3vv8y76PHJ8_1DFoYRvkrGGIxtDoXlcc,17348
+ostk/astrodynamics/trajectory/state/__init__.pyi,sha256=bq__Fii35czVrTeNxc9eQVjXdqwbbQxUdNQWK3vLrMo,17649
 ostk/astrodynamics/trajectory/state/coordinate_subset.pyi,sha256=kYMfMwEjCqO1NepMYFT4QS6kIPBkVL6sGCLeLbogcMw,10176
-open_space_toolkit_astrodynamics-15.4.0.dist-info/METADATA,sha256=IkSkTep__oIwwyZtQvdDdS1KkPOOKRZ0qEWlPMmyz2Q,1913
-open_space_toolkit_astrodynamics-15.4.0.dist-info/WHEEL,sha256=T9LN2NZIbRzW_NMBvL-Wx3BjkFw14mmvFvaC5ClfXRs,110
-open_space_toolkit_astrodynamics-15.4.0.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
-open_space_toolkit_astrodynamics-15.4.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-open_space_toolkit_astrodynamics-15.4.0.dist-info/RECORD,,
+open_space_toolkit_astrodynamics-15.6.0.dist-info/METADATA,sha256=5Nm6f5thffoDOhAlypysgUY8KnkhTGONPBbGR8LSJOI,1913
+open_space_toolkit_astrodynamics-15.6.0.dist-info/WHEEL,sha256=T9LN2NZIbRzW_NMBvL-Wx3BjkFw14mmvFvaC5ClfXRs,110
+open_space_toolkit_astrodynamics-15.6.0.dist-info/top_level.txt,sha256=zOR18699uDYnafgarhL8WU_LmTZY_5NVqutv-flp_x4,5
+open_space_toolkit_astrodynamics-15.6.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+open_space_toolkit_astrodynamics-15.6.0.dist-info/RECORD,,

ostk/astrodynamics/__init__.pyi

@@ -14,20 +14,20 @@ from ostk import mathematics as OpenSpaceToolkitMathematicsPy
 from ostk.mathematics import curve_fitting
 from ostk.mathematics import geometry
 from ostk.mathematics import object
-from ostk import physics as OpenSpaceToolkitPhysicsPy
 import ostk.physics
+from ostk import physics as OpenSpaceToolkitPhysicsPy
 from ostk.physics import Environment
 from ostk.physics import Manager
 from ostk.physics import Unit
-import ostk.physics.coordinate
 from ostk.physics import coordinate
+import ostk.physics.coordinate
 import ostk.physics.coordinate.spherical
 from ostk.physics import environment
 import ostk.physics.environment.object
-import ostk.physics.time
 from ostk.physics import time
-from ostk.physics import unit
+import ostk.physics.time
 import ostk.physics.unit
+from ostk.physics import unit
 import typing
 from . import access
 from . import conjunction

ostk/astrodynamics/dataframe.py

@@ -51,10 +51,17 @@ DEFAULT_ANGULAR_VELOCITY_COLUMNS_FORMAT: list[str] = [
     "w_B_{frame}_in_B_y",
     "w_B_{frame}_in_B_z",
 ]
+DEFAULT_MASS_COLUMN: str = "mass"
+DEFAULT_DRAG_COEFFICIENT_COLUMN: str = "drag_coefficient"
+DEFAULT_SURFACE_AREA_COLUMN: str = "surface_area"
+
 CARTESIAN_POSITION_SUBSET: CartesianPosition = CartesianPosition.default()
 CARTESIAN_VELOCITY_SUBSET: CartesianVelocity = CartesianVelocity.default()
 ATTITUDE_QUATERNION_SUBSET: AttitudeQuaternion = AttitudeQuaternion.default()
 ANGULAR_VELOCITY_SUBSET: AngularVelocity = AngularVelocity.default()
+MASS_SUBSET: CoordinateSubset = CoordinateSubset.mass()
+DRAG_COEFFICIENT_SUBSET: CoordinateSubset = CoordinateSubset.drag_coefficient()
+SURFACE_AREA_SUBSET: CoordinateSubset = CoordinateSubset.surface_area()
 
 DEFAULT_INTERPOLATION_TYPE: Interpolator.Type = Interpolator.Type.BarycentricRational
 
@@ -66,7 +73,10 @@ def generate_column_names(
     velocity_columns: list[str] | None = None,
     attitude_columns: list[str] | None = None,
     angular_velocity_columns: list[str] | None = None,
-) -> tuple[str, list[str], list[str], list[str], list[str]]:
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
+) -> tuple[str, list[str], list[str], list[str], list[str], str, str, str]:
     """
     Generate column names for a DataFrame containing orbit data.
 
@@ -77,6 +87,9 @@ def generate_column_names(
         velocity_columns (list[str] | None): List of column names containing the velocity data in [m/s].
         attitude_columns (list[str] | None): List of column names containing the attitude data in [x, y, z, s] form.
         angular_velocity_columns (list[str] | None): List of column names containing the angular velocity data in [rad/s].
+        mass_column (str | None): Name of the column containing the mass data in [kg]
+        drag_coefficient_column (str | None): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None): Name of the column containing the surface area data in [m^2].
 
     Returns:
         tuple[str, list[str], list[str], list[str], list[str]: Tuple containing the column names.
@@ -105,6 +118,9 @@ def generate_column_names(
             column.format(frame=reference_frame_name)
             for column in DEFAULT_ANGULAR_VELOCITY_COLUMNS_FORMAT
         ],
+        mass_column or DEFAULT_MASS_COLUMN,
+        drag_coefficient_column or DEFAULT_DRAG_COEFFICIENT_COLUMN,
+        surface_area_column or DEFAULT_SURFACE_AREA_COLUMN,
     )
 
 
@@ -116,6 +132,9 @@ def generate_states_from_dataframe(
     velocity_columns: list[str] | None = None,
     attitude_columns: list[str] | None = None,
     angular_velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     output_frame: Frame | None = None,
 ) -> list[State]:
     """
@@ -129,6 +148,9 @@ def generate_states_from_dataframe(
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
         attitude_columns (list[str] | None, optional): List of column names containing the attitude data in [x, y, z, s] form.
         angular_velocity_columns (list[str] | None, optional): List of column names containing the angular velocity data in [rad/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data in m^2].
         output_frame (Frame | None, optional): Output frame for the states.
 
     Returns:
@@ -145,6 +167,9 @@ def generate_states_from_dataframe(
         velocity_columns,
         attitude_columns,
         angular_velocity_columns,
+        mass_column,
+        drag_coefficient_column,
+        surface_area_column,
     ) = generate_column_names(
         reference_frame=reference_frame,
         time_column=time_column,
@@ -152,6 +177,9 @@ def generate_states_from_dataframe(
         velocity_columns=velocity_columns,
         attitude_columns=attitude_columns,
         angular_velocity_columns=angular_velocity_columns,
+        mass_column=mass_column,
+        drag_coefficient_column=drag_coefficient_column,
+        surface_area_column=surface_area_column,
     )
 
     if not set(position_columns).issubset(dataframe.columns):
@@ -169,6 +197,15 @@ def generate_states_from_dataframe(
     # check if the dataframe contains angular velocity
     has_angular_velocity: bool = set(angular_velocity_columns).issubset(dataframe.columns)
 
+    # check if the dataframe contains mass
+    has_mass: bool = mass_column in dataframe.columns
+
+    # check if the dataframe contains drag coefficient
+    has_drag_coefficient: bool = drag_coefficient_column in dataframe.columns
+
+    # check if the dataframe contains surface area
+    has_surface_area: bool = surface_area_column in dataframe.columns
+
     coordinate_subsets = [
         CARTESIAN_POSITION_SUBSET,
         CARTESIAN_VELOCITY_SUBSET,
@@ -180,6 +217,15 @@ def generate_states_from_dataframe(
     if has_angular_velocity:
         coordinate_subsets.extend([ANGULAR_VELOCITY_SUBSET])
 
+    if has_mass:
+        coordinate_subsets.append(MASS_SUBSET)
+
+    if has_drag_coefficient:
+        coordinate_subsets.append(DRAG_COEFFICIENT_SUBSET)
+
+    if has_surface_area:
+        coordinate_subsets.append(SURFACE_AREA_SUBSET)
+
     state_builder: StateBuilder = StateBuilder(
         frame=reference_frame,
         coordinate_subsets=coordinate_subsets,
@@ -199,6 +245,15 @@ def generate_states_from_dataframe(
         if has_angular_velocity:
             coordinates.extend([row[column] for column in angular_velocity_columns])
 
+        if has_mass:
+            coordinates.append(row[mass_column])
+
+        if has_drag_coefficient:
+            coordinates.append(row[drag_coefficient_column])
+
+        if has_surface_area:
+            coordinates.append(row[surface_area_column])
+
         states.append(
             state_builder.build(
                 instant=coerce_to_instant(
@@ -219,6 +274,9 @@ def generate_dataframe_from_states(
     velocity_columns: list[str] | None = None,
     attitude_columns: list[str] | None = None,
     angular_velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     set_time_index: bool = True,
 ) -> pd.DataFrame:
     """
@@ -232,6 +290,9 @@ def generate_dataframe_from_states(
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
         attitude_columns (list[str] | None, optional): List of column names containing the attitude data in [x, y, z, s] form.
         angular_velocity_columns (list[str] | None, optional): List of column names containing the angular velocity data in [rad/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data in [m^2].
         set_time_index (bool, optional): Whether to set the time column as the index. Defaults to True.
 
     Returns:
@@ -239,6 +300,9 @@ def generate_dataframe_from_states(
     """
     has_attitude: bool = states[0].has_subset(ATTITUDE_QUATERNION_SUBSET)
     has_angular_velocity: bool = states[0].has_subset(ANGULAR_VELOCITY_SUBSET)
+    has_mass: bool = states[0].has_subset(MASS_SUBSET)
+    has_drag_coefficient: bool = states[0].has_subset(DRAG_COEFFICIENT_SUBSET)
+    has_surface_area: bool = states[0].has_subset(SURFACE_AREA_SUBSET)
 
     reference_frame = reference_frame or DEFAULT_REFERENCE_FRAME
 
@@ -248,6 +312,9 @@ def generate_dataframe_from_states(
         velocity_columns,
         attitude_columns,
         angular_velocity_columns,
+        mass_column,
+        drag_coefficient_column,
+        surface_area_column,
     ) = generate_column_names(
         reference_frame=reference_frame,
         time_column=time_column,
@@ -255,6 +322,9 @@ def generate_dataframe_from_states(
         velocity_columns=velocity_columns,
         attitude_columns=attitude_columns,
         angular_velocity_columns=angular_velocity_columns,
+        mass_column=mass_column,
+        drag_coefficient_column=drag_coefficient_column,
+        surface_area_column=surface_area_column,
     )
 
     if len(position_columns) != 3:
@@ -290,6 +360,18 @@ def generate_dataframe_from_states(
                     state, angular_velocity_columns, ANGULAR_VELOCITY_SUBSET
                 )
             )
+        if has_mass:
+            datum.update(**_get_entry_from_state(state, [mass_column], MASS_SUBSET))
+        if has_drag_coefficient:
+            datum.update(
+                **_get_entry_from_state(
+                    state, [drag_coefficient_column], DRAG_COEFFICIENT_SUBSET
+                )
+            )
+        if has_surface_area:
+            datum.update(
+                **_get_entry_from_state(state, [surface_area_column], SURFACE_AREA_SUBSET)
+            )
 
         data.append(datum)
 
@@ -307,6 +389,9 @@ def generate_orbit_from_dataframe(
     time_column: str | None = None,
     position_columns: list[str] | None = None,
     velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     initial_revolution_number: int = 1,
     interpolation_type: Interpolator.Type | None = None,
     output_frame: Frame | None = None,
@@ -321,6 +406,9 @@ def generate_orbit_from_dataframe(
         time_column (str | None, optional): Name of the column containing the time data in [UTC].
         position_columns (list[str] | None, optional): List of column names containing the position data in [m].
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data  in [m^2].
         initial_revolution_number (int, optional): Initial revolution number. Defaults to 1.
         interpolation_type (Interpolator.Type | None, optional): Interpolation type.
         output_frame (Frame | None, optional): Output frame for the states.
@@ -336,6 +424,9 @@ def generate_orbit_from_dataframe(
                 time_column=time_column,
                 position_columns=position_columns,
                 velocity_columns=velocity_columns,
+                mass_column=mass_column,
+                drag_coefficient_column=drag_coefficient_column,
+                surface_area_column=surface_area_column,
                 reference_frame=reference_frame,
                 output_frame=output_frame,
             ),
@@ -353,6 +444,9 @@ def generate_dataframe_from_orbit(
     time_column: str | None = None,
     position_columns: list[str] | None = None,
     velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     set_time_index: bool = True,
 ) -> pd.DataFrame:
     """
@@ -365,6 +459,9 @@ def generate_dataframe_from_orbit(
         time_column (str | None, optional): Name of the column containing the time data in [UTC].
         position_columns (list[str] | None, optional): List of column names containing the position data in [m].
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data  in [m^2].
         set_time_index (bool, optional): Whether to set the time column as the DataFrame index. Defaults to True.
 
     Returns:
@@ -379,6 +476,9 @@ def generate_dataframe_from_orbit(
         time_column=time_column,
         position_columns=position_columns,
         velocity_columns=velocity_columns,
+        mass_column=mass_column,
+        drag_coefficient_column=drag_coefficient_column,
+        surface_area_column=surface_area_column,
         set_time_index=set_time_index,
     )
 
@@ -391,6 +491,9 @@ def generate_profile_from_dataframe(
     velocity_columns: list[str] | None = None,
     attitude_columns: list[str] | None = None,
     angular_velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     output_frame: Frame | None = None,
 ) -> Profile:
     """
@@ -404,6 +507,9 @@ def generate_profile_from_dataframe(
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
         attitude_columns (list[str] | None, optional): List of column names containing the attitude data in [x, y, z, s] form.
         angular_velocity_columns (list[str] | None, optional): List of column names containing the angular velocity data in [rad/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data [m^2].
         output_frame (Frame | None, optional): Output frame for the states.
 
     Returns:
@@ -420,6 +526,9 @@ def generate_profile_from_dataframe(
                 velocity_columns=velocity_columns,
                 attitude_columns=attitude_columns,
                 angular_velocity_columns=angular_velocity_columns,
+                mass_column=mass_column,
+                drag_coefficient_column=drag_coefficient_column,
+                surface_area_column=surface_area_column,
                 output_frame=output_frame,
             ),
         ),
@@ -435,6 +544,9 @@ def generate_dataframe_from_profile(
     velocity_columns: list[str] | None = None,
     attitude_columns: list[str] | None = None,
     angular_velocity_columns: list[str] | None = None,
+    mass_column: str | None = None,
+    drag_coefficient_column: str | None = None,
+    surface_area_column: str | None = None,
     set_time_index: bool = True,
 ) -> pd.DataFrame:
     """
@@ -449,6 +561,9 @@ def generate_dataframe_from_profile(
         velocity_columns (list[str] | None, optional): List of column names containing the velocity data in [m/s].
         attitude_columns (list[str] | None, optional): List of column names containing the attitude data in [x, y, z, s] form.
         angular_velocity_columns (list[str] | None, optional): List of column names containing the angular velocity data in [rad/s].
+        mass_column (str | None, optional): Name of the column containing the mass data in [kg].
+        drag_coefficient_column (str | None, optional): Name of the column containing the drag coefficient data.
+        surface_area_column (str | None, optional): Name of the column containing the surface area data [m^2].
         set_time_index (bool, optional): Whether to set the time column as the DataFrame index. Defaults to True.
 
     Returns:
@@ -465,6 +580,9 @@ def generate_dataframe_from_profile(
         velocity_columns=velocity_columns,
         attitude_columns=attitude_columns,
         angular_velocity_columns=angular_velocity_columns,
+        mass_column=mass_column,
+        drag_coefficient_column=drag_coefficient_column,
+        surface_area_column=surface_area_column,
         set_time_index=set_time_index,
     )
 

ostk/astrodynamics/test/test_dataframe.py

@@ -20,9 +20,10 @@ from ostk.physics.coordinate.frame.provider.iau import Theory
 
 from ostk.astrodynamics.converters import coerce_to_datetime
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.trajectory import LocalOrbitalFrameFactory
+from ostk.astrodynamics.trajectory.state import CoordinateSubset
 from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianPosition
 from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianVelocity
+from ostk.astrodynamics.trajectory import StateBuilder
 from ostk.astrodynamics.flight import Profile
 
 from ostk.astrodynamics.dataframe import generate_states_from_dataframe
@@ -194,6 +195,76 @@ class TestOrbitDataframe:
         orbit_dataframe.set_index("Timestamp", inplace=True)
         return orbit_dataframe
 
+    @pytest.fixture
+    def orbit_state_with_properties(
+        self,
+        instant: Instant,
+        position: Position,
+        velocity: Velocity,
+    ) -> State:
+        state_builder = StateBuilder(
+            frame=Frame.GCRF(),
+            coordinate_subsets=[
+                CartesianPosition.default(),
+                CartesianVelocity.default(),
+                CoordinateSubset.mass(),
+                CoordinateSubset.drag_coefficient(),
+                CoordinateSubset.surface_area(),
+            ],
+        )
+
+        return state_builder.build(
+            instant=instant,
+            coordinates=[
+                *position.get_coordinates(),
+                *velocity.get_coordinates(),
+                100.0,  # mass in kg
+                2.2,  # drag coefficient
+                10.5,  # surface area in m²
+            ],
+        )
+
+    @pytest.fixture
+    def orbit_states_with_properties(
+        self, orbit_state_with_properties: State
+    ) -> list[State]:
+        return [
+            orbit_state_with_properties,
+            orbit_state_with_properties,
+            orbit_state_with_properties,
+        ]
+
+    @pytest.fixture
+    def orbit_dataframe_with_properties(self, instant: Instant) -> pd.DataFrame:
+        return pd.DataFrame(
+            [
+                {
+                    "Timestamp": coerce_to_datetime(instant),
+                    "r_GCRF_x": 1.0,
+                    "r_GCRF_y": 2.0,
+                    "r_GCRF_z": 3.0,
+                    "v_GCRF_x": 4.0,
+                    "v_GCRF_y": 5.0,
+                    "v_GCRF_z": 6.0,
+                    "mass": 100.0,
+                    "drag_coefficient": 2.2,
+                    "surface_area": 10.5,
+                },
+                {
+                    "Timestamp": coerce_to_datetime(instant + Duration.minutes(1.0)),
+                    "r_GCRF_x": 11.0,
+                    "r_GCRF_y": 12.0,
+                    "r_GCRF_z": 13.0,
+                    "v_GCRF_x": 14.0,
+                    "v_GCRF_y": 15.0,
+                    "v_GCRF_z": 16.0,
+                    "mass": 99.5,
+                    "drag_coefficient": 2.2,
+                    "surface_area": 10.5,
+                },
+            ]
+        )
+
     def test_generate_orbit_states_from_dataframe_defaults_success(
         self,
         orbit_dataframe: pd.DataFrame,
@@ -416,6 +487,63 @@ class TestOrbitDataframe:
             "w_3",
         ]
 
+    def test_generate_states_from_dataframe_with_properties_success(
+        self,
+        orbit_dataframe_with_properties: pd.DataFrame,
+    ):
+        states: list[State] = generate_states_from_dataframe(
+            dataframe=orbit_dataframe_with_properties,
+            reference_frame=Frame.GCRF(),
+        )
+
+        for state in states:
+            assert (
+                len(state.get_coordinates()) == 9
+            )  # 3 position + 3 velocity + mass + drag_coefficient + surface_area
+            assert state.has_subset(CoordinateSubset.mass())
+            assert state.has_subset(CoordinateSubset.drag_coefficient())
+            assert state.has_subset(CoordinateSubset.surface_area())
+
+    def test_generate_dataframe_from_states_with_properties_success(
+        self,
+        orbit_states_with_properties: list[State],
+    ):
+        generated_dataframe: pd.DataFrame = generate_dataframe_from_states(
+            states=orbit_states_with_properties,
+        )
+
+        assert "mass" in generated_dataframe.columns
+        assert "drag_coefficient" in generated_dataframe.columns
+        assert "surface_area" in generated_dataframe.columns
+
+        # Verify the values are correct
+        assert generated_dataframe["mass"].iloc[0] == 100.0
+        assert generated_dataframe["drag_coefficient"].iloc[0] == 2.2
+        assert generated_dataframe["surface_area"].iloc[0] == 10.5
+
+    def test_generate_dataframe_from_states_with_custom_property_columns(
+        self,
+        orbit_states_with_properties: list[State],
+    ):
+        generated_dataframe: pd.DataFrame = generate_dataframe_from_states(
+            states=orbit_states_with_properties,
+            time_column="t",
+            position_columns=["r_1", "r_2", "r_3"],
+            velocity_columns=["v_1", "v_2", "v_3"],
+            mass_column="spacecraft_mass",
+            drag_coefficient_column="cd",
+            surface_area_column="area",
+        )
+
+        assert "spacecraft_mass" in generated_dataframe.columns
+        assert "cd" in generated_dataframe.columns
+        assert "area" in generated_dataframe.columns
+
+        # Verify the values are correct
+        assert generated_dataframe["spacecraft_mass"].iloc[0] == 100.0
+        assert generated_dataframe["cd"].iloc[0] == 2.2
+        assert generated_dataframe["area"].iloc[0] == 10.5
+
 
 class TestProfileDataframe:
     @pytest.fixture
@@ -427,7 +555,10 @@ class TestProfileDataframe:
         return Instant.date_time(DateTime(2020, 1, 1, 0, 0, 0), Scale.UTC)
 
     @pytest.fixture
-    def dataframe(self, epoch: Instant) -> pd.DataFrame:
+    def dataframe(
+        self,
+        epoch: Instant,
+    ) -> pd.DataFrame:
         return pd.DataFrame(
             [
                 {
@@ -466,16 +597,78 @@ class TestProfileDataframe:
         )
 
     @pytest.fixture
-    def profile(self, dataframe: pd.DataFrame) -> Profile:
+    def profile(
+        self,
+        dataframe: pd.DataFrame,
+    ) -> Profile:
         return generate_profile_from_dataframe(
             dataframe=dataframe,
         )
 
     @pytest.fixture
-    def dataframe_indexed_timestamp(self, dataframe: pd.DataFrame) -> pd.DataFrame:
+    def dataframe_indexed_timestamp(
+        self,
+        dataframe: pd.DataFrame,
+    ) -> pd.DataFrame:
         dataframe.set_index("Timestamp", inplace=True)
         return dataframe
 
+    @pytest.fixture
+    def dataframe_with_properties(
+        self,
+        epoch: Instant,
+    ) -> pd.DataFrame:
+        return pd.DataFrame(
+            [
+                {
+                    "Timestamp": coerce_to_datetime(epoch),
+                    "r_GCRF_x": 1.0,
+                    "r_GCRF_y": 2.0,
+                    "r_GCRF_z": 3.0,
+                    "v_GCRF_x": 4.0,
+                    "v_GCRF_y": 5.0,
+                    "v_GCRF_z": 6.0,
+                    "q_B_GCRF_x": 0.0,
+                    "q_B_GCRF_y": 0.0,
+                    "q_B_GCRF_z": 0.0,
+                    "q_B_GCRF_s": 1.0,
+                    "w_B_GCRF_in_B_x": 0.0,
+                    "w_B_GCRF_in_B_y": 0.0,
+                    "w_B_GCRF_in_B_z": 0.0,
+                    "mass": 100.0,
+                    "drag_coefficient": 2.2,
+                    "surface_area": 10.5,
+                },
+                {
+                    "Timestamp": coerce_to_datetime(epoch + Duration.minutes(1.0)),
+                    "r_GCRF_x": 11.0,
+                    "r_GCRF_y": 12.0,
+                    "r_GCRF_z": 13.0,
+                    "v_GCRF_x": 14.0,
+                    "v_GCRF_y": 15.0,
+                    "v_GCRF_z": 16.0,
+                    "q_B_GCRF_x": 0.0,
+                    "q_B_GCRF_y": 0.0,
+                    "q_B_GCRF_z": 1.0,
+                    "q_B_GCRF_s": 0.0,
+                    "w_B_GCRF_in_B_x": 1.0,
+                    "w_B_GCRF_in_B_y": 1.0,
+                    "w_B_GCRF_in_B_z": 1.0,
+                    "mass": 99.5,
+                    "drag_coefficient": 2.2,
+                    "surface_area": 10.5,
+                },
+            ]
+        )
+
+    @pytest.fixture
+    def dataframe_with_properties_indexed_timestamp(
+        self,
+        dataframe_with_properties: pd.DataFrame,
+    ) -> pd.DataFrame:
+        dataframe_with_properties.set_index("Timestamp", inplace=True)
+        return dataframe_with_properties
+
     def test_generate_profile_from_dataframe_success(
         self,
         epoch: Instant,
@@ -873,3 +1066,87 @@ class TestProfileDataframe:
             "w_2",
             "w_3",
         ]
+
+    def test_generate_profile_from_dataframe_with_properties_success(
+        self,
+        epoch: Instant,
+        dataframe_with_properties: pd.DataFrame,
+    ):
+        profile: Profile = generate_profile_from_dataframe(
+            dataframe=dataframe_with_properties,
+        )
+
+        assert profile is not None
+        state = profile.get_state_at(epoch)
+
+        assert state.has_subset(CoordinateSubset.mass())
+        assert state.has_subset(CoordinateSubset.drag_coefficient())
+        assert state.has_subset(CoordinateSubset.surface_area())
+
+        # Verify extracted coordinates are correct
+        assert state.extract_coordinate(CoordinateSubset.mass())[0] == 100.0
+        assert state.extract_coordinate(CoordinateSubset.drag_coefficient())[0] == 2.2
+        assert state.extract_coordinate(CoordinateSubset.surface_area())[0] == 10.5
+
+    def test_generate_dataframe_from_profile_with_properties_success(
+        self,
+        epoch: Instant,
+        dataframe_with_properties_indexed_timestamp: pd.DataFrame,
+    ):
+        # Create a profile with properties
+        profile_with_props = generate_profile_from_dataframe(
+            dataframe=dataframe_with_properties_indexed_timestamp,
+        )
+
+        generated_dataframe: pd.DataFrame = generate_dataframe_from_profile(
+            profile=profile_with_props,
+            instants=[
+                epoch,
+                epoch + Duration.minutes(1.0),
+            ],
+        )
+
+        assert "mass" in generated_dataframe.columns
+        assert "drag_coefficient" in generated_dataframe.columns
+        assert "surface_area" in generated_dataframe.columns
+
+        # Verify the values
+        assert generated_dataframe["mass"].iloc[0] == 100.0
+        assert generated_dataframe["drag_coefficient"].iloc[0] == 2.2
+        assert generated_dataframe["surface_area"].iloc[0] == 10.5
+
+    def test_generate_dataframe_from_profile_with_custom_property_columns(
+        self,
+        epoch: Instant,
+        dataframe_with_properties_indexed_timestamp: pd.DataFrame,
+    ):
+        # Create a profile with properties
+        profile_with_props = generate_profile_from_dataframe(
+            dataframe=dataframe_with_properties_indexed_timestamp,
+        )
+
+        generated_dataframe: pd.DataFrame = generate_dataframe_from_profile(
+            profile=profile_with_props,
+            instants=[
+                epoch,
+                epoch + Duration.minutes(1.0),
+            ],
+            time_column="t",
+            position_columns=["r_1", "r_2", "r_3"],
+            velocity_columns=["v_1", "v_2", "v_3"],
+            attitude_columns=["q_1", "q_2", "q_3", "q_4"],
+            angular_velocity_columns=["w_1", "w_2", "w_3"],
+            mass_column="spacecraft_mass",
+            drag_coefficient_column="cd",
+            surface_area_column="area",
+            set_time_index=False,
+        )
+
+        assert "spacecraft_mass" in generated_dataframe.columns
+        assert "cd" in generated_dataframe.columns
+        assert "area" in generated_dataframe.columns
+
+        # Verify the values
+        assert generated_dataframe["spacecraft_mass"].iloc[0] == 100.0
+        assert generated_dataframe["cd"].iloc[0] == 2.2
+        assert generated_dataframe["area"].iloc[0] == 10.5

ostk/astrodynamics/test/trajectory/state/test_coordinate_subset.py

@@ -53,3 +53,6 @@ class TestCoordinateSubset:
 
     def test_mass_flow_rate(self):
         assert CoordinateSubset.mass_flow_rate() is not None
+
+    def test_ballistic_coefficient(self):
+        assert CoordinateSubset.ballistic_coefficient() is not None

ostk/astrodynamics/trajectory/state/__init__.pyi

@@ -110,6 +110,14 @@ class CoordinateSubset:
             
     """
     @staticmethod
+    def ballistic_coefficient() -> CoordinateSubset:
+        """
+                        Get the ballistic coefficient coordinate subset.
+        
+                        Returns:
+                            CoordinateSubset: The ballistic coefficient coordinate subset.
+        """
+    @staticmethod
     def drag_coefficient() -> CoordinateSubset:
         """
                         Get the drag coefficient coordinate subset.

ostk/astrodynamics/viewer.py

@@ -205,14 +205,14 @@ class Viewer:
                         direction=(0.0, +1.0, 0.0),
                         half_angle=Angle.degrees(1.0),
                         length=Length.meters(2.0),
-                        color="blue",
+                        color="green",
                     ),
                     ConicSensor(
                         name="z_axis",
                         direction=(0.0, 0.0, +1.0),
                         half_angle=Angle.degrees(1.0),
                         length=Length.meters(2.0),
-                        color="green",
+                        color="blue",
                     ),
                 ]
             )