diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index fd4548c0772a272540a7f44781104f910675585d..d4f11ea909d71325423d35d60af995a9d15e9eb5 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -15,9 +15,9 @@
#include "Core/Fitting/SimDataPair.h"
#include "Base/Math/Numeric.h"
#include "Core/Scan/UnitConverter1D.h"
-#include "Device/Detector/UnitConverter2D.h"
#include "Core/Simulation/includeSimulations.h"
#include "Device/Data/DataUtils.h"
+#include "Device/Detector/UnitConverter2D.h"
namespace {
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index 535814835cdb2f5ece61d050936e3d310ebf48cd..58d5b9f8f6aa832ad6943dd23bffcaf869467da1 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -16,8 +16,8 @@
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
#include "Device/Beam/IFootprintFactor.h"
-#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SpecularDetector1D.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
diff --git a/Device/Detector/UnitConverter2D.cpp b/Device/Detector/UnitConverter2D.cpp
index 29f24afd5acd49b7e9725095f44d010bee2f60d3..74a6d1e96b983bb9de8768dbbf74435f98982ece 100644
--- a/Device/Detector/UnitConverter2D.cpp
+++ b/Device/Detector/UnitConverter2D.cpp
@@ -16,9 +16,9 @@
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Base/Pixel/RectangularPixel.h"
-#include "Device/Instrument/Instrument.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
+#include "Device/Instrument/Instrument.h"
#include "Device/ProDetector/RegionOfInterest.h"
#include "Device/Unit/AxisNames.h"
#include <algorithm>
@@ -49,7 +49,7 @@ size_t UnitConverter2D::dimension() const
}
void UnitConverter2D::addAxisData(std::string name, double min, double max,
- Axes::Units default_units, size_t nbins)
+ Axes::Units default_units, size_t nbins)
{
m_axis_data_table.emplace_back(AxisData{name, min, max, default_units, nbins});
}
@@ -85,8 +85,7 @@ std::vector<Axes::Units> UnitConverter2D::availableUnits() const
return {Axes::Units::NBINS, Axes::Units::RADIANS, Axes::Units::DEGREES};
}
-std::unique_ptr<IAxis> UnitConverter2D::createConvertedAxis(size_t i_axis,
- Axes::Units units) const
+std::unique_ptr<IAxis> UnitConverter2D::createConvertedAxis(size_t i_axis, Axes::Units units) const
{
const double min = calculateMin(i_axis, units);
const double max = calculateMax(i_axis, units);
@@ -162,9 +161,7 @@ Axes::Units SphericalConverter::defaultUnits() const
return Axes::Units::DEGREES;
}
-SphericalConverter::SphericalConverter(const SphericalConverter& other) : UnitConverter2D(other)
-{
-}
+SphericalConverter::SphericalConverter(const SphericalConverter& other) : UnitConverter2D(other) {}
double SphericalConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
{
@@ -247,8 +244,7 @@ RectangularConverter::RectangularConverter(const RectangularConverter& other)
{
}
-double RectangularConverter::calculateValue(size_t i_axis, Axes::Units units,
- double value) const
+double RectangularConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
{
if (units == Axes::Units::MM)
return value;
@@ -420,13 +416,11 @@ std::vector<Axes::Units> DepthProbeConverter::availableUnits() const
return result;
}
-DepthProbeConverter::DepthProbeConverter(const DepthProbeConverter& other)
- : UnitConverter2D(other)
+DepthProbeConverter::DepthProbeConverter(const DepthProbeConverter& other) : UnitConverter2D(other)
{
}
-double DepthProbeConverter::calculateValue(size_t i_axis, Axes::Units units,
- double value) const
+double DepthProbeConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
{
checkUnits(units);
if (i_axis == 1)
@@ -449,7 +443,6 @@ std::vector<std::map<Axes::Units, std::string>> DepthProbeConverter::createNameM
void DepthProbeConverter::checkUnits(Axes::Units units) const
{
const auto& available_units = availableUnits();
- if (std::find(available_units.begin(), available_units.end(), units)
- == available_units.cend())
+ if (std::find(available_units.begin(), available_units.end(), units) == available_units.cend())
throwUnitsError("DepthProbeConverter::checkUnits", available_units);
}
diff --git a/Device/Detector/UnitConverter2D.h b/Device/Detector/UnitConverter2D.h
index ccfb7080aa230e536b70cf9220f33602f477a652..eddea1de3ce0d4890d5f0e7d5123f319e5a9a78f 100644
--- a/Device/Detector/UnitConverter2D.h
+++ b/Device/Detector/UnitConverter2D.h
@@ -52,8 +52,7 @@ public:
//! Helper factory function to use in GISASSimulation. Depending on the type of detector,
//! returns either RectangularConverter or SphericalConverter.
- static std::unique_ptr<UnitConverter2D> createConverterForGISAS(
- const Instrument& instrument);
+ static std::unique_ptr<UnitConverter2D> createConverterForGISAS(const Instrument& instrument);
protected:
UnitConverter2D(const UnitConverter2D& other);
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 949999d78b25416d656071e788f7379f87376c14..bf528c585528076d525fa611e6cfa875be038452 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -181,7 +181,7 @@ void RealDataItem::initDataItem(size_t rank, const QString& tag)
const SessionItem* data_item = getItem(tag);
if (data_item != nullptr) {
if ((rank == 1 && !data_item->is<SpecularDataItem>())
- || (rank == 2 && !data_item->is<IntensityDataItem>()))
+ || (rank == 2 && !data_item->is<IntensityDataItem>()))
throw GUIHelpers::Error("Error in RealDataItem::initDataItem: trying to set data "
"incompatible with underlying data item");
} else {
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 4609c658e2bf960d4b8152a8a4825318119bd60c..2e521f4585d41db799920646e3d071110dd5111f 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -299,8 +299,8 @@ void RealDataSelectorWidget::importData2D()
m_itemTreeModel->removeItem(realDataItem);
const QString message = QString("Error while trying to read file\n\n'%1'\n\n%2")
- .arg(fileName)
- .arg(QString::fromStdString(std::string(ex.what())));
+ .arg(fileName)
+ .arg(QString::fromStdString(std::string(ex.what())));
GUIHelpers::warning("File import", message);
}
}
diff --git a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
index 00981acf6264522a20b8695f62d37c072096891a..b89bf02b3cb6adff8146d0a78ae375db5d5754cc 100644
--- a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
@@ -1,7 +1,7 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
class OffSpecularConverterTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
index 0823271f580e6b86a73825a7ecf21bbc6733a655..b17776a859386f08dad43b1eba790190d6e49e8b 100644
--- a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
@@ -1,7 +1,7 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
class SphericalConverterTest : public ::testing::Test {
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index e6669fa20fe95af2d6b9b9ed1601155e05ba0619..9f8f40f0e1714ff373351ee7b32d5172fd8b442d 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -10,7 +10,7 @@ C++ includes: Axes.h
";
-// File: structUnitConverterSimple_1_1AxisData.xml
+// File: structUnitConverter2D_1_1AxisData.xml
// File: structAxisInfo.xml
@@ -2684,38 +2684,38 @@ return default axes units
";
-// File: classUnitConverterSimple.xml
-%feature("docstring") UnitConverterSimple "
+// File: classUnitConverter2D.xml
+%feature("docstring") UnitConverter2D "
Interface for objects that provide axis translations to different units for IDetector objects
C++ includes: UnitConverter2D.h
";
-%feature("docstring") UnitConverterSimple::UnitConverterSimple "UnitConverterSimple::UnitConverterSimple(const Beam &beam)
+%feature("docstring") UnitConverter2D::UnitConverter2D "UnitConverter2D::UnitConverter2D(const Beam &beam)
";
-%feature("docstring") UnitConverterSimple::~UnitConverterSimple "UnitConverterSimple::~UnitConverterSimple() override=default
+%feature("docstring") UnitConverter2D::~UnitConverter2D "UnitConverter2D::~UnitConverter2D() override=default
";
-%feature("docstring") UnitConverterSimple::dimension "size_t UnitConverterSimple::dimension() const override
+%feature("docstring") UnitConverter2D::dimension "size_t UnitConverter2D::dimension() const override
";
-%feature("docstring") UnitConverterSimple::calculateMin "double UnitConverterSimple::calculateMin(size_t i_axis, Axes::Units units) const override
+%feature("docstring") UnitConverter2D::calculateMin "double UnitConverter2D::calculateMin(size_t i_axis, Axes::Units units) const override
";
-%feature("docstring") UnitConverterSimple::calculateMax "double UnitConverterSimple::calculateMax(size_t i_axis, Axes::Units units) const override
+%feature("docstring") UnitConverter2D::calculateMax "double UnitConverter2D::calculateMax(size_t i_axis, Axes::Units units) const override
";
-%feature("docstring") UnitConverterSimple::axisSize "size_t UnitConverterSimple::axisSize(size_t i_axis) const override
+%feature("docstring") UnitConverter2D::axisSize "size_t UnitConverter2D::axisSize(size_t i_axis) const override
";
-%feature("docstring") UnitConverterSimple::availableUnits "std::vector< Axes::Units > UnitConverterSimple::availableUnits() const override
+%feature("docstring") UnitConverter2D::availableUnits "std::vector< Axes::Units > UnitConverter2D::availableUnits() const override
Returns the list of all available units.
";
-%feature("docstring") UnitConverterSimple::createConvertedAxis "std::unique_ptr< IAxis > UnitConverterSimple::createConvertedAxis(size_t i_axis, Axes::Units units) const override
+%feature("docstring") UnitConverter2D::createConvertedAxis "std::unique_ptr< IAxis > UnitConverter2D::createConvertedAxis(size_t i_axis, Axes::Units units) const override
";