BUG: add correct effective rail

Author: MateusStano

rocketpy/simulation/flight.py

@@ -1171,6 +1171,37 @@ def __init_equations_of_motion(self):
         if self.equations_of_motion == "solid_propulsion":
             self.u_dot_generalized = self.u_dot
 
+    @cached_property
+    def effective_1rl(self):
+        """Original rail length minus the distance measured from nozzle exit
+        to the upper rail button. It assumes the nozzle to be aligned with
+        the beginning of the rail."""
+        nozzle = self.rocket.nozzle_position
+        try:
+            rail_buttons = self.rocket.rail_buttons[0]
+            upper_r_button = (
+                rail_buttons.component.buttons_distance * self.rocket._csys
+                + rail_buttons.position
+            )
+        except IndexError:  # No rail buttons defined
+            upper_r_button = nozzle
+        effective_1rl = self.rail_length - abs(nozzle - upper_r_button)
+        return effective_1rl
+
+    @cached_property
+    def effective_2rl(self):
+        """Original rail length minus the distance measured from nozzle exit
+        to the lower rail button. It assumes the nozzle to be aligned with
+        the beginning of the rail."""
+        nozzle = self.rocket.nozzle_position
+        try:
+            rail_buttons = self.rocket.rail_buttons[0]
+            lower_r_button = rail_buttons.position
+        except IndexError:  # No rail buttons defined
+            lower_r_button = nozzle
+        effective_2rl = self.rail_length - abs(nozzle - lower_r_button)
+        return effective_2rl
+
     @cached_property
     def frontal_surface_wind(self):
         # Surface wind magnitude in the frontal direction at the rail's elevation
@@ -2542,41 +2573,6 @@ def static_margin(self):
         """Static margin of the rocket."""
         return self.rocket.static_margin
 
-    # Rail Button Forces
-    @cached_property
-    def effective_1rl(self):
-        """Original rail length minus the distance measured from nozzle exit
-        to the upper rail button. It assumes the nozzle to be aligned with
-        the beginning of the rail."""
-        nozzle = (
-            self.rocket.nozzle_position - self.rocket.center_of_dry_mass_position
-        ) * self.rocket._csys  # Kinda works for single nozzle
-        try:
-            rail_buttons = self.rocket.rail_buttons[0]
-            upper_r_button = (
-                rail_buttons.component.buttons_distance + rail_buttons.position
-            )
-        except IndexError:  # No rail buttons defined
-            upper_r_button = nozzle
-        effective_1rl = self.rail_length - abs(nozzle - upper_r_button)
-        return effective_1rl
-
-    @cached_property
-    def effective_2rl(self):
-        """Original rail length minus the distance measured from nozzle exit
-        to the lower rail button. It assumes the nozzle to be aligned with
-        the beginning of the rail."""
-        nozzle = (
-            self.rocket.nozzle_position - self.rocket.center_of_dry_mass_position
-        ) * self.rocket._csys
-        try:
-            rail_buttons = self.rocket.rail_buttons[0]
-            lower_r_button = rail_buttons.position
-        except IndexError:  # No rail buttons defined
-            lower_r_button = nozzle
-        effective_2rl = self.rail_length - abs(nozzle - lower_r_button)
-        return effective_2rl
-
     @cached_property
     def frontal_surface_wind(self):
         """Surface wind speed in m/s aligned with the launch rail."""