Simplification in UnitConverterTest

Tests/UnitTests/Core/Detector/UnitConverterTest.h

@@ -12,11 +12,19 @@ protected:
     double m_wavelength;
     double m_alpha_i;
     double m_phi_i;
+    double m_kiz, m_kfy, m_kfz1, m_kfz2;
 };
 
 UnitConverterTest::UnitConverterTest()
     : m_wavelength(1.0), m_alpha_i(-1.0*Units::deg), m_phi_i(0.0)
-{}
+{
+    auto k_i = vecOfLambdaAlphaPhi(m_wavelength, m_alpha_i, m_phi_i);
+    m_kiz = k_i.z();
+    double K = 2.0*M_PI/m_wavelength;
+    m_kfy = K*std::sin(5.0*Units::deg);
+    m_kfz1 = K*std::sin(-2.0*Units::deg);
+    m_kfz2 = K*std::sin(1.5);
+}
 
 UnitConverterTest::~UnitConverterTest() = default;
 
@@ -25,12 +33,6 @@ TEST_F(UnitConverterTest, SphericalConverter)
     SphericalConverter converter(100, 0.0, 5.0*Units::deg,
                                  70, -2.0*Units::deg, 1.5,
                                  m_wavelength, m_alpha_i, m_phi_i);
-    auto k_i = vecOfLambdaAlphaPhi(m_wavelength, m_alpha_i, m_phi_i);
-    double k_iz = k_i.z();
-    double K = 2.0*M_PI/m_wavelength;
-    double k_fy = K*std::sin(5.0*Units::deg);
-    double k_fz1 = K*std::sin(-2.0*Units::deg);
-    double k_fz2 = K*std::sin(1.5);
 
     EXPECT_EQ(converter.dimension(), 2u);
 
@@ -45,21 +47,21 @@ TEST_F(UnitConverterTest, SphericalConverter)
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::NBINS), 100.0);
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::RADIANS), Units::deg2rad(5.0));
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::DEGREES), 5.0);
-    EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::QYQZ), k_fy);
+    EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::QYQZ), m_kfy);
     EXPECT_THROW(converter.calculateMax(0, AxesUnits::MM), std::runtime_error);
 
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEFAULT), Units::deg2rad(-2.0));
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::NBINS), 0.0);
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::RADIANS), Units::deg2rad(-2.0));
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEGREES), -2.0);
-    EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::QYQZ), k_fz1 - k_iz);
+    EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::QYQZ), m_kfz1 - m_kiz);
     EXPECT_THROW(converter.calculateMin(1, AxesUnits::MM), std::runtime_error);
 
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::DEFAULT), 1.5);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::NBINS), 70.0);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::RADIANS), 1.5);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(1.5));
-    EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::QYQZ), k_fz2 - k_iz);
+    EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::QYQZ), m_kfz2 - m_kiz);
     EXPECT_THROW(converter.calculateMax(1, AxesUnits::MM), std::runtime_error);
 
     EXPECT_THROW(converter.calculateMin(2, AxesUnits::DEFAULT), std::runtime_error);
@@ -70,14 +72,8 @@ TEST_F(UnitConverterTest, SphericalConverterClone)
 {
     SphericalConverter converter(100, 0.0, 5.0*Units::deg,
                                  70, -2.0*Units::deg, 1.5,
-                                 1.0, -1.0*Units::deg, 0.0);
+                                 m_wavelength, m_alpha_i, m_phi_i);
     std::unique_ptr<SphericalConverter> P_clone(converter.clone());
-    auto k_i = vecOfLambdaAlphaPhi(m_wavelength, m_alpha_i, m_phi_i);
-    double k_iz = k_i.z();
-    double K = 2.0*M_PI/m_wavelength;
-    double k_fy = K*std::sin(5.0*Units::deg);
-    double k_fz1 = K*std::sin(-2.0*Units::deg);
-    double k_fz2 = K*std::sin(1.5);
 
     EXPECT_EQ(P_clone->dimension(), 2u);
 
@@ -92,21 +88,21 @@ TEST_F(UnitConverterTest, SphericalConverterClone)
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::NBINS), 100.0);
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::RADIANS), Units::deg2rad(5.0));
     EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::DEGREES), 5.0);
-    EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::QYQZ), k_fy);
+    EXPECT_DOUBLE_EQ(converter.calculateMax(0, AxesUnits::QYQZ), m_kfy);
     EXPECT_THROW(converter.calculateMax(0, AxesUnits::MM), std::runtime_error);
 
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEFAULT), Units::deg2rad(-2.0));
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::NBINS), 0.0);
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::RADIANS), Units::deg2rad(-2.0));
     EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::DEGREES), -2.0);
-    EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::QYQZ), k_fz1 - k_iz);
+    EXPECT_DOUBLE_EQ(converter.calculateMin(1, AxesUnits::QYQZ), m_kfz1 - m_kiz);
     EXPECT_THROW(converter.calculateMin(1, AxesUnits::MM), std::runtime_error);
 
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::DEFAULT), 1.5);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::NBINS), 70.0);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::RADIANS), 1.5);
     EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::DEGREES), Units::rad2deg(1.5));
-    EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::QYQZ), k_fz2 - k_iz);
+    EXPECT_DOUBLE_EQ(converter.calculateMax(1, AxesUnits::QYQZ), m_kfz2 - m_kiz);
     EXPECT_THROW(converter.calculateMax(1, AxesUnits::MM), std::runtime_error);
 
     EXPECT_THROW(P_clone->calculateMin(2, AxesUnits::DEFAULT), std::runtime_error);