diff --git a/Base/Util/ConversionUtil.cpp b/Base/Util/ConversionUtil.cpp index f7d67c63b2832de360f36933fdf1c35c63129133..e40e7b1135fcbb2b68ebe163abd6925cfbefc384 100644 --- a/Base/Util/ConversionUtil.cpp +++ b/Base/Util/ConversionUtil.cpp @@ -13,16 +13,15 @@ // ************************************************************************************************ #include "Base/Util/ConversionUtil.h" -#include "Base/Util/Assert.h" #include <cmath> #include <numbers> -/* rad */ double Conversion::Refl::qz2alpha(double lambda /* nm */, double qz /* 1/nm */) +double Convert::Refl::qz2alpha(double lambda, double qz) { - return std::asin(qz * lambda / 4.0 / std::numbers::pi); + return std::asin(qz * lambda / 4 / std::numbers::pi); } -/* nm */ double Conversion::Refl::qz2lambda(double alpha /* rad */, double qz /* 1/nm */) +double Convert::Refl::qz2lambda(double alpha, double qz) { - return 4.0 * std::numbers::pi * std::sin(alpha) / qz; + return 4 * std::numbers::pi * std::sin(alpha) / qz; } diff --git a/Base/Util/ConversionUtil.h b/Base/Util/ConversionUtil.h index 3e00da341de7c4ace4bdadd5ca7a3cbc4edf21a3..caa4f497641c00b0ab5dd3e66253470997ecb3b2 100644 --- a/Base/Util/ConversionUtil.h +++ b/Base/Util/ConversionUtil.h @@ -15,12 +15,12 @@ #ifndef BORNAGAIN_BASE_UTIL_CONVERSIONUTIL_H #define BORNAGAIN_BASE_UTIL_CONVERSIONUTIL_H -namespace Conversion::Refl { +namespace Convert::Refl { double qz2alpha(double lambda, double qz); double qz2lambda(double alpha, double qz); -} // namespace Conversion::Refl +} // namespace Convert::Refl #endif // BORNAGAIN_BASE_UTIL_CONVERSIONUTIL_H diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp index 4fdd0c41ba32fa39d6685ef0369b073d9a7d6619..5569bdcea404b194e54314df30c65e91a40b5309 100644 --- a/GUI/Model/Device/InstrumentItems.cpp +++ b/GUI/Model/Device/InstrumentItems.cpp @@ -416,7 +416,7 @@ Frame SpecularInstrumentItem::makeFrame() const if (pAxis->unit() == "1/nm") { double l = scanItem()->wavelength(); Scale ax = pAxis->transformedScale(Coordinate("alpha_i", "rad").label(), [l](double x) { - return Conversion::Refl::qz2alpha(l, x); + return Convert::Refl::qz2alpha(l, x); }); return Frame(std::move(ax.clone())); }