Revert "DEV: undo commits to develop"

This reverts commit 9eaabb0.

Author: MateusStano

rocketpy/prints/sensors_prints.py

@@ -74,7 +74,7 @@ def orientation(self):
         self._print_aligned("Orientation:", self.sensor.orientation)
         self._print_aligned("Normal Vector:", self.sensor.normal_vector)
         print("Rotation Matrix:")
-        for row in self.sensor.rotation_sensor_to_body:
+        for row in self.sensor.rotation_matrix:
             value = " ".join(f"{val:.2f}" for val in row)
             value = [float(val) for val in value.split()]
             self._print_aligned("", value)

rocketpy/sensors/accelerometer.py

@@ -44,7 +44,7 @@ class Accelerometer(InertialSensor):
         The cross axis sensitivity of the sensor in percentage.
     name : str
         The name of the sensor.
-    rotation_sensor_to_body : Matrix
+    rotation_matrix : Matrix
         The rotation matrix of the sensor from the sensor frame to the rocket
         frame of reference.
     normal_vector : Vector
@@ -241,9 +241,8 @@ def measure(self, time, **kwargs):
             + Vector.cross(omega, Vector.cross(omega, r))
         )
         # Transform to sensor frame
-        inertial_to_sensor = (
-            self._total_rotation_sensor_to_body
-            @ Matrix.transformation(u[6:10]).transpose
+        inertial_to_sensor = self._total_rotation_matrix @ Matrix.transformation(
+            u[6:10]
         )
         A = inertial_to_sensor @ A
 

rocketpy/sensors/gyroscope.py

@@ -44,7 +44,7 @@ class Gyroscope(InertialSensor):
         The cross axis sensitivity of the sensor in percentage.
     name : str
         The name of the sensor.
-    rotation_sensor_to_body : Matrix
+    rotation_matrix : Matrix
         The rotation matrix of the sensor from the sensor frame to the rocket
         frame of reference.
     normal_vector : Vector
@@ -222,26 +222,33 @@ def measure(self, time, **kwargs):
         u_dot = kwargs["u_dot"]
         relative_position = kwargs["relative_position"]
 
-        # Angular velocity of the rocket in the body frame
+        # Angular velocity of the rocket in the rocket frame
         omega = Vector(u[10:13])
 
         # Transform to sensor frame
-        W = self._total_rotation_sensor_to_body @ omega
+        inertial_to_sensor = self._total_rotation_matrix @ Matrix.transformation(
+            u[6:10]
+        )
+        W = inertial_to_sensor @ omega
 
         # Apply noise + bias and quantize
         W = self.apply_noise(W)
         W = self.apply_temperature_drift(W)
 
         # Apply acceleration sensitivity
         if self.acceleration_sensitivity != Vector.zeros():
-            W += self.apply_acceleration_sensitivity(omega, u_dot, relative_position)
+            W += self.apply_acceleration_sensitivity(
+                omega, u_dot, relative_position, inertial_to_sensor
+            )
 
         W = self.quantize(W)
 
         self.measurement = tuple([*W])
         self._save_data((time, *W))
 
-    def apply_acceleration_sensitivity(self, omega, u_dot, relative_position):
+    def apply_acceleration_sensitivity(
+        self, omega, u_dot, relative_position, rotation_matrix
+    ):
         """
         Apply acceleration sensitivity to the sensor measurement
 
@@ -253,6 +260,8 @@ def apply_acceleration_sensitivity(self, omega, u_dot, relative_position):
             The time derivative of the state vector
         relative_position : Vector
             The vector from the rocket's center of mass to the sensor
+        rotation_matrix : Matrix
+            The rotation matrix from the rocket frame to the sensor frame
 
         Returns
         -------
@@ -262,7 +271,7 @@ def apply_acceleration_sensitivity(self, omega, u_dot, relative_position):
         # Linear acceleration of rocket cdm in inertial frame
         inertial_acceleration = Vector(u_dot[3:6])
 
-        # Angular accel of rocket in body frame
+        # Angular velocity and accel of rocket
         omega_dot = Vector(u_dot[10:13])
 
         # Acceleration felt in sensor
@@ -272,7 +281,7 @@ def apply_acceleration_sensitivity(self, omega, u_dot, relative_position):
             + Vector.cross(omega, Vector.cross(omega, relative_position))
         )
         # Transform to sensor frame
-        A = self._total_rotation_sensor_to_body @ A
+        A = rotation_matrix @ A
 
         return self.acceleration_sensitivity & A
 

rocketpy/sensors/sensor.py

@@ -460,23 +460,23 @@ def __init__(
 
         # rotation matrix and normal vector
         if any(isinstance(row, (tuple, list)) for row in orientation):  # matrix
-            self.rotation_sensor_to_body = Matrix(orientation)
+            self.rotation_matrix = Matrix(orientation)
         elif len(orientation) == 3:  # euler angles
-            self.rotation_sensor_to_body = Matrix.transformation_euler_angles(
+            self.rotation_matrix = Matrix.transformation_euler_angles(
                 *np.deg2rad(orientation)
             ).round(12)
         else:
             raise ValueError("Invalid orientation format")
         self.normal_vector = Vector(
             [
-                self.rotation_sensor_to_body[0][2],
-                self.rotation_sensor_to_body[1][2],
-                self.rotation_sensor_to_body[2][2],
+                self.rotation_matrix[0][2],
+                self.rotation_matrix[1][2],
+                self.rotation_matrix[2][2],
             ]
         ).unit_vector
 
         # cross axis sensitivity matrix
-        cross_axis_matrix = 0.01 * Matrix(
+        _cross_axis_matrix = 0.01 * Matrix(
             [
                 [100, self.cross_axis_sensitivity, self.cross_axis_sensitivity],
                 [self.cross_axis_sensitivity, 100, self.cross_axis_sensitivity],
@@ -485,9 +485,7 @@ def __init__(
         )
 
         # compute total rotation matrix given cross axis sensitivity
-        self._total_rotation_sensor_to_body = (
-            self.rotation_sensor_to_body @ cross_axis_matrix
-        )
+        self._total_rotation_matrix = self.rotation_matrix @ _cross_axis_matrix
 
     def _vectorize_input(self, value, name):
         if isinstance(value, (int, float)):