From 13f37393862e15b9a0a795f2428723cdbf669f47 Mon Sep 17 00:00:00 2001
From: meggert <eggertm@irs.uni-stuttgart.de>
Date: Fri, 19 Jan 2024 14:13:00 +0100
Subject: [PATCH] some cleanup

---
 mission/controller/acs/AcsParameters.h | 53 ++++++++++++++------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/mission/controller/acs/AcsParameters.h b/mission/controller/acs/AcsParameters.h
index f11a673b..4b5eef5b 100644
--- a/mission/controller/acs/AcsParameters.h
+++ b/mission/controller/acs/AcsParameters.h
@@ -8,6 +8,9 @@
 typedef unsigned char uint8_t;
 
 class AcsParameters : public HasParametersIF {
+ private:
+  static constexpr double DEG2RAD = M_PI / 180.;
+
  public:
   AcsParameters();
   virtual ~AcsParameters();
@@ -854,7 +857,7 @@ class AcsParameters : public HasParametersIF {
   struct PointingLawParameters {
     double zeta = 0.3;
     double om = 0.3;
-    double omMax = 1 * M_PI / 180;
+    double omMax = 1 * DEG2RAD;
     double qiMin = 0.1;
 
     double gainNullspace = 0.01;
@@ -877,15 +880,15 @@ class AcsParameters : public HasParametersIF {
     uint8_t timeElapsedMax = 10;  // rot rate calculations
 
     // Default is Stuttgart GS
-    double latitudeTgt = 48.7495 * M_PI / 180.;   // [rad] Latitude
-    double longitudeTgt = 9.10384 * M_PI / 180.;  // [rad] Longitude
-    double altitudeTgt = 500;                     // [m]
+    double latitudeTgt = 48.7495 * DEG2RAD;   // [rad] Latitude
+    double longitudeTgt = 9.10384 * DEG2RAD;  // [rad] Longitude
+    double altitudeTgt = 500;                 // [m]
 
     // For one-axis control:
     uint8_t avoidBlindStr = true;
     double blindAvoidStart = 1.5;
     double blindAvoidStop = 2.5;
-    double blindRotRate = 1 * M_PI / 180;
+    double blindRotRate = 1. * DEG2RAD;
   } targetModeControllerParameters;
 
   struct GsTargetModeControllerParameters : PointingLawParameters {
@@ -893,9 +896,9 @@ class AcsParameters : public HasParametersIF {
     uint8_t timeElapsedMax = 10;          // rot rate calculations
 
     // Default is Stuttgart GS
-    double latitudeTgt = 48.7495 * M_PI / 180.;   // [rad] Latitude
-    double longitudeTgt = 9.10384 * M_PI / 180.;  // [rad] Longitude
-    double altitudeTgt = 500;                     // [m]
+    double latitudeTgt = 48.7495 * DEG2RAD;   // [rad] Latitude
+    double longitudeTgt = 9.10384 * DEG2RAD;  // [rad] Longitude
+    double altitudeTgt = 500;                 // [m]
   } gsTargetModeControllerParameters;
 
   struct NadirModeControllerParameters : PointingLawParameters {
@@ -912,7 +915,7 @@ class AcsParameters : public HasParametersIF {
   } inertialModeControllerParameters;
 
   struct StrParameters {
-    double exclusionAngle = 20 * M_PI / 180;
+    double exclusionAngle = 20. * DEG2RAD;
     double boresightAxis[3] = {0.7593, 0.0000, -0.6508};  // geometry frame
   } strParameters;
 
@@ -926,25 +929,25 @@ class AcsParameters : public HasParametersIF {
 
   struct SunModelParameters {
     float domega = 36000.771;
-    float omega_0 = 280.46 * M_PI / 180.;  // RAAN plus argument of
-                                           // perigee
-    float m_0 = 357.5277;                  // coefficients for mean anomaly
-    float dm = 35999.049;                  // coefficients for mean anomaly
-    float e = 23.4392911 * M_PI / 180.;    // angle of earth's rotation axis
-    float e1 = 0.74508 * M_PI / 180.;
+    float omega_0 = 280.46 * DEG2RAD;  // RAAN plus argument of
+                                       // perigee
+    float m_0 = 357.5277;              // coefficients for mean anomaly
+    float dm = 35999.049;              // coefficients for mean anomaly
+    float e = 23.4392911 * DEG2RAD;    // angle of earth's rotation axis
+    float e1 = 0.74508 * DEG2RAD;
 
-    float p1 = 6892. / 3600. * M_PI / 180.;  // some parameter
-    float p2 = 72. / 3600. * M_PI / 180.;    // some parameter
+    float p1 = 6892. / 3600. * DEG2RAD;  // some parameter
+    float p2 = 72. / 3600. * DEG2RAD;    // some parameter
   } sunModelParameters;
 
   struct KalmanFilterParameters {
-    double sensorNoiseSTR = 0.1 * M_PI / 180;
-    double sensorNoiseSS = 8 * M_PI / 180;
-    double sensorNoiseMAG = 4 * M_PI / 180;
-    double sensorNoiseGYR = 0.1 * M_PI / 180;
+    double sensorNoiseStr = 0.1 * DEG2RAD;
+    double sensorNoiseSus = 8. * DEG2RAD;
+    double sensorNoiseMgm = 4. * DEG2RAD;
+    double sensorNoiseGyr = 0.1 * DEG2RAD;
 
-    double sensorNoiseArwGYR = 3 * 0.0043 * M_PI / sqrt(10) / 180;  // Angular Random Walk
-    double sensorNoiseBsGYR = 3 * M_PI / 180 / 3600;                // Bias Stability
+    double sensorNoiseGyrArw = 3. * 0.0043 / sqrt(10) * DEG2RAD;  // Angular Random Walk
+    double sensorNoiseGyrBs = 3. / 3600. * DEG2RAD;               // Bias Stability
   } kalmanFilterParameters;
 
   struct MagnetorquerParameter {
@@ -960,8 +963,8 @@ class AcsParameters : public HasParametersIF {
 
   struct DetumbleParameter {
     uint8_t detumblecounter = 75;  // 30 s
-    double omegaDetumbleStart = 2 * M_PI / 180;
-    double omegaDetumbleEnd = 1 * M_PI / 180;
+    double omegaDetumbleStart = 2 * DEG2RAD;
+    double omegaDetumbleEnd = 1 * DEG2RAD;
     double gainBdot = pow(10.0, -3.3);
     double gainFull = pow(10.0, -2.3);
     uint8_t useFullDetumbleLaw = false;