rocketpy 1.4.1__tar.gz → 1.4.2__tar.gz

{rocketpy-1.4.1/rocketpy.egg-info → rocketpy-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rocketpy
-Version: 1.4.1
+Version: 1.4.2
 Summary: Advanced 6-DOF trajectory simulation for High-Power Rocketry.
 Author-email: Giovani Hidalgo Ceotto <ghceotto@gmail.com>
 Project-URL: homepage, https://rocketpy.org/

{rocketpy-1.4.1 → rocketpy-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rocketpy"
-version = "1.4.1"
+version = "1.4.2"
 description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
 dynamic = ["dependencies"]
 readme = "README.md"

{rocketpy-1.4.1 → rocketpy-1.4.2}/rocketpy/rocket/aero_surface/rail_buttons.py

@@ -17,7 +17,13 @@ class RailButtons(AeroSurface):
         relative to one of the other principal axis.
     """
 
-    def __init__(self, buttons_distance, angular_position=45, name="Rail Buttons"):
+    def __init__(
+        self,
+        buttons_distance,
+        angular_position=45,
+        name="Rail Buttons",
+        rocket_radius=None,
+    ):
         """Initializes RailButtons Class.
 
         Parameters
@@ -30,6 +36,10 @@ class RailButtons(AeroSurface):
             relative to one of the other principal axis.
         name : string, optional
             Name of the rail buttons. Default is "Rail Buttons".
+        rocket_radius : int, float, optional
+            Radius of the rocket at the location of the rail buttons in meters.
+            If not provided, it will be calculated when the RailButtons object
+            is added to a Rocket object.
 
         Returns
         -------
@@ -40,7 +50,7 @@ class RailButtons(AeroSurface):
         self.buttons_distance = buttons_distance
         self.angular_position = angular_position
         self.name = name
-
+        self.rocket_radius = rocket_radius
         self.evaluate_lift_coefficient()
         self.evaluate_center_of_pressure()
 

{rocketpy-1.4.1 → rocketpy-1.4.2}/rocketpy/rocket/rocket.py

@@ -947,6 +947,7 @@ class Rocket:
             the root chord which is highest in the rocket coordinate system.
             For Tail type, position is relative to the point belonging to the
             tail which is highest in the rocket coordinate system.
+            For RailButtons type, position is relative to the lower rail button.
 
         See Also
         --------
@@ -956,11 +957,16 @@ class Rocket:
         -------
         None
         """
-        try:
-            for surface, position in zip(surfaces, positions):
+        if not isinstance(surfaces, list):
+            surfaces = [surfaces]
+            positions = [positions]
+
+        for surface, position in zip(surfaces, positions):
+            if isinstance(surface, RailButtons):
+                surface.rocket_radius = surface.rocket_radius or self.radius
+                self.rail_buttons.add(surface, position)
+            else:
                 self.aerodynamic_surfaces.add(surface, position)
-        except TypeError:
-            self.aerodynamic_surfaces.add(surfaces, positions)
 
         self.evaluate_center_of_pressure()
         self.evaluate_stability_margin()
@@ -1512,6 +1518,7 @@ class Rocket:
         rail_buttons = RailButtons(
             buttons_distance=buttons_distance, angular_position=angular_position
         )
+        rail_buttons.rocket_radius = rail_buttons.rocket_radius or self.radius
         self.rail_buttons.add(rail_buttons, lower_button_position)
         return rail_buttons
 

{rocketpy-1.4.1 → rocketpy-1.4.2}/rocketpy/simulation/flight.py

@@ -3498,6 +3498,7 @@ class Flight:  # pylint: disable=too-many-public-methods
                 try:
                     # Try to access the node and merge if it exists
                     tmp_dict[time].parachutes += node.parachutes
+                    tmp_dict[time]._controllers += node._controllers
                     tmp_dict[time].callbacks += node.callbacks
                 except KeyError:
                     # If the node does not exist, add it to the dictionary

{rocketpy-1.4.1 → rocketpy-1.4.2/rocketpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rocketpy
-Version: 1.4.1
+Version: 1.4.2
 Summary: Advanced 6-DOF trajectory simulation for High-Power Rocketry.
 Author-email: Giovani Hidalgo Ceotto <ghceotto@gmail.com>
 Project-URL: homepage, https://rocketpy.org/