diff --git a/Core/Instrument/SimpleUnitConverters.cpp b/Core/Instrument/SimpleUnitConverters.cpp index 9516d7326af57b87e3e16cf7be6cacf760ac5cf6..da0ba04471ec0404fbe40785fb109e02f5cba524 100644 --- a/Core/Instrument/SimpleUnitConverters.cpp +++ b/Core/Instrument/SimpleUnitConverters.cpp @@ -79,7 +79,7 @@ std::unique_ptr<IAxis> UnitConverterSimple::createConvertedAxis(size_t i_axis, { double min = calculateMin(i_axis, units); double max = calculateMax(i_axis, units); - auto axis_name = axisName(i_axis); + auto axis_name = axisName(i_axis, units); auto axis_size = axisSize(i_axis); return std::make_unique<FixedBinAxis>(axis_name, axis_size, min, max); } diff --git a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h index 8dba8c4bcd52f9145b133c808c36e1adb3b52876..52718822c9ca65a0fba20d3c02d57f6a633bfe7b 100644 --- a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h +++ b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h @@ -72,7 +72,7 @@ TEST_F(OffSpecularConverterTest, OffSpecularConverter) auto axis2 = converter.createConvertedAxis(1, AxesUnits::RADIANS); EXPECT_TRUE(dynamic_cast<FixedBinAxis*>(axis2.get())); EXPECT_EQ(axis2->size(), converter.axisSize(1)); - EXPECT_EQ(axis2->getName(), converter.axisName(1)); + EXPECT_EQ(axis2->getName(), converter.axisName(1, AxesUnits::RADIANS)); EXPECT_EQ(axis2->getMin(), converter.calculateMin(1, AxesUnits::RADIANS)); EXPECT_EQ(axis2->getMax(), converter.calculateMax(1, AxesUnits::RADIANS)); diff --git a/Tests/UnitTests/Core/Detector/RectangularConverterTest.h b/Tests/UnitTests/Core/Detector/RectangularConverterTest.h index db8ebc2447357523b2a6f4cb927a34565a602fdb..2fe6be96ffafd33922ffeb289dec87f718bcfa2d 100644 --- a/Tests/UnitTests/Core/Detector/RectangularConverterTest.h +++ b/Tests/UnitTests/Core/Detector/RectangularConverterTest.h @@ -95,7 +95,7 @@ TEST_F(RectangularConverterTest, RectangularConverter) auto axis2 = converter.createConvertedAxis(1, AxesUnits::QSPACE); EXPECT_TRUE(dynamic_cast<FixedBinAxis*>(axis2.get())); EXPECT_EQ(axis2->size(), converter.axisSize(1)); - EXPECT_EQ(axis2->getName(), converter.axisName(1)); + EXPECT_EQ(axis2->getName(), converter.axisName(1, AxesUnits::QSPACE)); EXPECT_EQ(axis2->getMin(), converter.calculateMin(1, AxesUnits::QSPACE)); EXPECT_EQ(axis2->getMax(), converter.calculateMax(1, AxesUnits::QSPACE)); diff --git a/Tests/UnitTests/Core/Detector/SphericalConverterTest.h b/Tests/UnitTests/Core/Detector/SphericalConverterTest.h index a06bfc60dca7eae798e10488381bc7c1361f91d2..10aaccb15809fc0f9b7faad81c22743d6a8f6589 100644 --- a/Tests/UnitTests/Core/Detector/SphericalConverterTest.h +++ b/Tests/UnitTests/Core/Detector/SphericalConverterTest.h @@ -77,7 +77,7 @@ TEST_F(SphericalConverterTest, SphericalConverter) auto axis2 = converter.createConvertedAxis(1, AxesUnits::QSPACE); EXPECT_TRUE(dynamic_cast<FixedBinAxis*>(axis2.get())); EXPECT_EQ(axis2->size(), converter.axisSize(1)); - EXPECT_EQ(axis2->getName(), converter.axisName(1)); + EXPECT_EQ(axis2->getName(), converter.axisName(1, AxesUnits::QSPACE)); EXPECT_EQ(axis2->getMin(), converter.calculateMin(1, AxesUnits::QSPACE)); EXPECT_EQ(axis2->getMax(), converter.calculateMax(1, AxesUnits::QSPACE));