From 808e8db0fe7dab674410afd925420812ebf2728f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 May 2022 07:45:45 +0200
Subject: [PATCH] clang-format
---
Base/Axis/Frame.cpp | 2 +-
Device/Coord/AxisNames.cpp | 15 +++++--------
Device/Coord/AxisNames.h | 12 ++++------
Device/Coord/CoordSystem1D.cpp | 18 +++++----------
Device/Coord/CoordSystem1D.h | 3 +--
Device/Coord/CoordSystem2D.cpp | 7 +++---
Device/Coord/CoordSystem2D.h | 6 ++---
Device/Coord/ICoordSystem.h | 6 ++---
Device/Data/Powerfield.h | 2 +-
Device/Detector/IDetector2D.cpp | 4 ++--
Device/Histo/SimulationResult.h | 3 +--
Device/Mask/DetectorMask.cpp | 22 ++++++++++++++-----
GUI/Model/Data/JobItemUtils.cpp | 3 +--
GUI/Model/Device/InstrumentItems.cpp | 3 +--
GUI/Support/IO/ImportDataInfo.cpp | 5 ++---
GUI/Util/CoordName.cpp | 16 +++++++-------
GUI/View/Common/ItemComboWidget.cpp | 2 +-
GUI/View/Fit/FitParameterDelegate.cpp | 2 +-
GUI/View/Fit/FitParameterWidget.cpp | 2 +-
GUI/View/Instrument/DistributionEditor.cpp | 2 +-
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
Tests/Unit/Device/DepthProbeConverterTest.cpp | 6 ++---
Tests/Unit/Device/DetectorMaskTest.cpp | 2 +-
Tests/Unit/Device/Histogram2DTest.cpp | 2 +-
Tests/Unit/Device/PowerfieldTest.cpp | 2 +-
Tests/Unit/Sim/CoordSystem1DTest.cpp | 20 +++++++----------
26 files changed, 75 insertions(+), 94 deletions(-)
diff --git a/Base/Axis/Frame.cpp b/Base/Axis/Frame.cpp
index d3e64115c0c..a0fed6c0047 100644
--- a/Base/Axis/Frame.cpp
+++ b/Base/Axis/Frame.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "Base/Axis/Frame.h"
-#include "Base/Axis/IAxis.h"
#include "Base/Axis/Bin.h"
+#include "Base/Axis/IAxis.h"
#include "Base/Util/Assert.h"
Frame::Frame(const std::vector<IAxis*>& axes)
diff --git a/Device/Coord/AxisNames.cpp b/Device/Coord/AxisNames.cpp
index b8a2f080865..c1b86808b4e 100644
--- a/Device/Coord/AxisNames.cpp
+++ b/Device/Coord/AxisNames.cpp
@@ -52,17 +52,14 @@ BA_DEVICE_API_ const std::map<Coords, std::string> offSpecularAxis1 = {
{Coords::RADIANS, "alpha_f [rad]"},
{Coords::DEGREES, "alpha_f [deg]"}};
-BA_DEVICE_API_ const std::map<Coords, std::string> specAxis = {
- {Coords::NBINS, "X [nbins]"},
- {Coords::RADIANS, "alpha_i [rad]"},
- {Coords::DEGREES, "alpha_i [deg]"},
- {Coords::QSPACE, "Q [1/nm]"},
- {Coords::RQ4, "Q [1/nm]"}};
+BA_DEVICE_API_ const std::map<Coords, std::string> specAxis = {{Coords::NBINS, "X [nbins]"},
+ {Coords::RADIANS, "alpha_i [rad]"},
+ {Coords::DEGREES, "alpha_i [deg]"},
+ {Coords::QSPACE, "Q [1/nm]"},
+ {Coords::RQ4, "Q [1/nm]"}};
BA_DEVICE_API_ const std::map<Coords, std::string> specAxisQ = {
- {Coords::NBINS, "X [nbins]"},
- {Coords::QSPACE, "Q [1/nm]"},
- {Coords::RQ4, "Q [1/nm]"}};
+ {Coords::NBINS, "X [nbins]"}, {Coords::QSPACE, "Q [1/nm]"}, {Coords::RQ4, "Q [1/nm]"}};
// corner case: axis corresponding to the position
// across sample is accepts only bins and nanometers,
diff --git a/Device/Coord/AxisNames.h b/Device/Coord/AxisNames.h
index 8d5228a89c8..70659c1cc9e 100644
--- a/Device/Coord/AxisNames.h
+++ b/Device/Coord/AxisNames.h
@@ -25,14 +25,10 @@
#include <map>
#include <string>
-const std::map<Coords, const char*> axisUnitLabel = {{Coords::UNDEFINED, "undefined"},
- {Coords::NBINS, "bin"},
- {Coords::RADIANS, "rad"},
- {Coords::DEGREES, "deg"},
- {Coords::MM, "mm"},
- {Coords::QSPACE, "1/nm"},
- {Coords::QXQY, "1/nm"},
- {Coords::RQ4, "nm^-4?"}};
+const std::map<Coords, const char*> axisUnitLabel = {
+ {Coords::UNDEFINED, "undefined"}, {Coords::NBINS, "bin"}, {Coords::RADIANS, "rad"},
+ {Coords::DEGREES, "deg"}, {Coords::MM, "mm"}, {Coords::QSPACE, "1/nm"},
+ {Coords::QXQY, "1/nm"}, {Coords::RQ4, "nm^-4?"}};
//! Contains const maps that give the right axis names for different detector types and units
//! @ingroup detector
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index 2a06825029f..b61851f71f2 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -60,8 +60,7 @@ double backTransform(double value, Coords coords, double wavelength)
std::string angularAxisName(const Coords units)
{
const auto& name_map = DataUtils::AxisNames::specAxis;
- const auto& it =
- name_map.find(units == Coords::UNDEFINED ? Coords::DEGREES : units);
+ const auto& it = name_map.find(units == Coords::UNDEFINED ? Coords::DEGREES : units);
ASSERT(it != name_map.cend());
return it->second;
}
@@ -116,8 +115,7 @@ double CoordSystem1D::calculateMax(size_t i_axis, Coords units) const
return translator(coordinate_axis->binCenter(coordinate_axis->size() - 1));
}
-std::unique_ptr<const IAxis> CoordSystem1D::createConvertedAxis(size_t i_axis,
- Coords units) const
+std::unique_ptr<const IAxis> CoordSystem1D::createConvertedAxis(size_t i_axis, Coords units) const
{
ASSERT(i_axis == 0);
units = substituteDefaultUnits(units);
@@ -177,18 +175,15 @@ AngularReflectometryCoordinates* AngularReflectometryCoordinates::clone() const
std::vector<Coords> AngularReflectometryCoordinates::availableUnits() const
{
- return {Coords::NBINS, Coords::RADIANS, Coords::DEGREES, Coords::QSPACE,
- Coords::RQ4};
+ return {Coords::NBINS, Coords::RADIANS, Coords::DEGREES, Coords::QSPACE, Coords::RQ4};
}
-std::vector<std::map<Coords, std::string>>
-AngularReflectometryCoordinates::createNameMaps() const
+std::vector<std::map<Coords, std::string>> AngularReflectometryCoordinates::createNameMaps() const
{
return {DataUtils::AxisNames::specAxis};
}
-std::function<double(double)>
-AngularReflectometryCoordinates::getTraslatorTo(Coords units) const
+std::function<double(double)> AngularReflectometryCoordinates::getTraslatorTo(Coords units) const
{
switch (units) {
case Coords::RADIANS:
@@ -241,8 +236,7 @@ WavenumberReflectometryCoordinates::createNameMaps() const
}
//! Returns translating functional (inv. nm --> desired units)
-std::function<double(double)>
-WavenumberReflectometryCoordinates::getTraslatorTo(Coords units) const
+std::function<double(double)> WavenumberReflectometryCoordinates::getTraslatorTo(Coords units) const
{
switch (units) {
case Coords::QSPACE:
diff --git a/Device/Coord/CoordSystem1D.h b/Device/Coord/CoordSystem1D.h
index b20f06c60d7..ac9885c84b2 100644
--- a/Device/Coord/CoordSystem1D.h
+++ b/Device/Coord/CoordSystem1D.h
@@ -50,8 +50,7 @@ public:
double calculateMax(size_t i_axis, Coords units) const override;
//! Creates axis in converted units.
- std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis,
- Coords units) const override;
+ std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis, Coords units) const override;
//! Creates Powerfield array in converter units.
std::unique_ptr<Powerfield<double>> createConvertedData(const Powerfield<double>& data,
diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp
index 30c96df171c..467366d6097 100644
--- a/Device/Coord/CoordSystem2D.cpp
+++ b/Device/Coord/CoordSystem2D.cpp
@@ -59,8 +59,8 @@ CoordSystem2D::CoordSystem2D(const CoordSystem2D& other)
{
}
-void CoordSystem2D::addAxisData(std::string name, double min, double max,
- Coords default_units, size_t nbins)
+void CoordSystem2D::addAxisData(std::string name, double min, double max, Coords default_units,
+ size_t nbins)
{
m_axes.emplace_back(AxisData{name, min, max, default_units, nbins});
}
@@ -96,8 +96,7 @@ std::vector<Coords> CoordSystem2D::availableUnits() const
return {Coords::NBINS, Coords::RADIANS, Coords::DEGREES};
}
-std::unique_ptr<const IAxis> CoordSystem2D::createConvertedAxis(size_t i_axis,
- Coords units) const
+std::unique_ptr<const IAxis> CoordSystem2D::createConvertedAxis(size_t i_axis, Coords units) const
{
const double min = calculateMin(i_axis, units);
const double max = calculateMax(i_axis, units);
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index fe7657ea380..591a7b90ebc 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -44,8 +44,7 @@ public:
//! Further units may be added by child classes.
std::vector<Coords> availableUnits() const override;
- std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis,
- Coords units) const override;
+ std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis, Coords units) const override;
//! Adds a copy of the given axis to the axis system.
//! Order of adding defines position of axis (x-axis, y-axis, ...)
@@ -54,8 +53,7 @@ public:
protected:
CoordSystem2D(const CoordSystem2D& other);
- void addAxisData(std::string name, double min, double max, Coords default_units,
- size_t nbins);
+ void addAxisData(std::string name, double min, double max, Coords default_units, size_t nbins);
#ifndef SWIG
struct AxisData {
diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h
index 2f2d0633c49..c603ac769c2 100644
--- a/Device/Coord/ICoordSystem.h
+++ b/Device/Coord/ICoordSystem.h
@@ -58,8 +58,7 @@ public:
virtual std::vector<Coords> availableUnits() const = 0;
virtual Coords defaultUnits() const = 0;
- virtual std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis,
- Coords units) const = 0;
+ virtual std::unique_ptr<const IAxis> createConvertedAxis(size_t i_axis, Coords units) const = 0;
//! Creates Powerfield array in converter units.
virtual std::unique_ptr<Powerfield<double>> createConvertedData(const Powerfield<double>& data,
@@ -67,8 +66,7 @@ public:
protected:
Coords substituteDefaultUnits(Coords units) const;
- [[noreturn]] void throwUnitsError(std::string method,
- std::vector<Coords> available) const;
+ [[noreturn]] void throwUnitsError(std::string method, std::vector<Coords> available) const;
private:
virtual std::vector<std::map<Coords, std::string>> createNameMaps() const = 0;
diff --git a/Device/Data/Powerfield.h b/Device/Data/Powerfield.h
index 210a1277c89..05442698b5f 100644
--- a/Device/Data/Powerfield.h
+++ b/Device/Data/Powerfield.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_DEVICE_DATA_POWERFIELD_H
#define BORNAGAIN_DEVICE_DATA_POWERFIELD_H
-#include "Base/Axis/Frame.h"
#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/Frame.h"
#include "Base/Py/PyObject.h"
#include "Base/Types/OwningVector.h"
#include "Base/Util/Assert.h"
diff --git a/Device/Detector/IDetector2D.cpp b/Device/Detector/IDetector2D.cpp
index b307ceecf69..ba4322135ce 100644
--- a/Device/Detector/IDetector2D.cpp
+++ b/Device/Detector/IDetector2D.cpp
@@ -13,14 +13,14 @@
// ************************************************************************************************
#include "Device/Detector/IDetector2D.h"
-#include "Base/Const/Units.h"
#include "Base/Axis/IAxis.h"
+#include "Base/Const/Units.h"
+#include "Base/Util/Assert.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/DetectorContext.h"
#include "Device/Mask/DetectorMask.h"
#include "Device/Mask/InfinitePlane.h"
#include "Resample/Element/DiffuseElement.h"
-#include "Base/Util/Assert.h"
namespace {
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index f29c0b023f4..798b15dde72 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -81,8 +81,7 @@ public:
//! Returns axis coordinates as a numpy array. With no parameters given
//! Returns coordinates of x-axis in default units.
- std::vector<double> convertedBinCenters(size_t i_axis,
- Coords units = Coords::UNDEFINED) const;
+ std::vector<double> convertedBinCenters(size_t i_axis, Coords units = Coords::UNDEFINED) const;
void setTitle(const std::string& title) { m_title = title; }
std::string title() { return m_title; }
diff --git a/Device/Mask/DetectorMask.cpp b/Device/Mask/DetectorMask.cpp
index bb7fc695613..0b1cbf241b8 100644
--- a/Device/Mask/DetectorMask.cpp
+++ b/Device/Mask/DetectorMask.cpp
@@ -13,15 +13,25 @@
// ************************************************************************************************
#include "Device/Mask/DetectorMask.h"
-#include "Base/Axis/IAxis.h"
#include "Base/Axis/Bin.h"
+#include "Base/Axis/IAxis.h"
+#include "Device/Data/Powerfield.h"
#include "Device/Histo/Histogram2D.h"
#include "Device/Mask/IShape2D.h"
-#include "Device/Data/Powerfield.h"
-MaskPattern::MaskPattern(IShape2D* shape_, bool doMask_) : shape(shape_), doMask(doMask_) {}
-MaskPattern::~MaskPattern() { delete shape; }
-MaskPattern* MaskPattern::clone() const { return new MaskPattern(shape->clone(), doMask); }
+MaskPattern::MaskPattern(IShape2D* shape_, bool doMask_)
+ : shape(shape_)
+ , doMask(doMask_)
+{
+}
+MaskPattern::~MaskPattern()
+{
+ delete shape;
+}
+MaskPattern* MaskPattern::clone() const
+{
+ return new MaskPattern(shape->clone(), doMask);
+}
DetectorMask::DetectorMask()
@@ -38,7 +48,7 @@ DetectorMask::DetectorMask(const IAxis& xAxis, const IAxis& yAxis)
m_masked->addAxis(xAxis);
m_masked->addAxis(yAxis);
-// m_masked.reset(new Powerfield<bool>(xAxis, yAxis));
+ // m_masked.reset(new Powerfield<bool>(xAxis, yAxis));
process_masks();
}
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index a7749a497f8..f2c89764a76 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -48,8 +48,7 @@ void GUI::Model::JobItemUtils::updateDataAxes(DataItem* intensityItem,
if (!intensityItem->getPowerfield())
return;
- Coords requested_units =
- GUI::Util::CoordName::coordFromName(intensityItem->selectedCoords());
+ Coords requested_units = GUI::Util::CoordName::coordFromName(intensityItem->selectedCoords());
auto* const converter = instrumentItem->createCoordSystem();
auto newData = converter->createPowerfield(requested_units);
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index dc3b4894216..da9ff421b03 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -227,8 +227,7 @@ ICoordSystem* SpecularInstrumentItem::createCoordSystem() const
if (auto* pointwise_axis = dynamic_cast<PointwiseAxisItem*>(axis_item)) {
if (!pointwise_axis->axis()) // workaround for loading project
return nullptr;
- Coords native_units =
- GUI::Util::CoordName::coordFromName(pointwise_axis->getUnitsLabel());
+ Coords native_units = GUI::Util::CoordName::coordFromName(pointwise_axis->getUnitsLabel());
return new AngularReflectometryCoordinates(instrument->beam().wavelength(),
*pointwise_axis->axis(), native_units);
}
diff --git a/GUI/Support/IO/ImportDataInfo.cpp b/GUI/Support/IO/ImportDataInfo.cpp
index 20f2c0d8374..d5ec7988814 100644
--- a/GUI/Support/IO/ImportDataInfo.cpp
+++ b/GUI/Support/IO/ImportDataInfo.cpp
@@ -32,7 +32,7 @@ std::vector<Coords> specularUnits()
// map: data rank --> available units
std::map<size_t, std::vector<Coords>> available_units = {{1u, specularUnits()},
- {2u, {Coords::NBINS}}};
+ {2u, {Coords::NBINS}}};
} // namespace
@@ -43,8 +43,7 @@ ImportDataInfo::ImportDataInfo(ImportDataInfo&& other)
}
ImportDataInfo::ImportDataInfo(std::unique_ptr<Powerfield<double>> data, Coords units)
- : m_data(units == Coords::NBINS && data ? GUI::Util::IO::binifyAxes(*data)
- : std::move(data))
+ : m_data(units == Coords::NBINS && data ? GUI::Util::IO::binifyAxes(*data) : std::move(data))
, m_coords(units)
{
checkValidity();
diff --git a/GUI/Util/CoordName.cpp b/GUI/Util/CoordName.cpp
index 5ea9e78af45..58ffe9d8b09 100644
--- a/GUI/Util/CoordName.cpp
+++ b/GUI/Util/CoordName.cpp
@@ -18,16 +18,16 @@
namespace {
const std::map<QString, Coords> units_from_names{{"nbins", Coords::NBINS},
- {"Radians", Coords::RADIANS},
- {"Degrees", Coords::DEGREES},
- {"mm", Coords::MM},
- {"q-space", Coords::QSPACE}};
+ {"Radians", Coords::RADIANS},
+ {"Degrees", Coords::DEGREES},
+ {"mm", Coords::MM},
+ {"q-space", Coords::QSPACE}};
const std::map<Coords, QString> names_from_coords{{Coords::NBINS, "nbins"},
- {Coords::RADIANS, "Radians"},
- {Coords::MM, "mm"},
- {Coords::QSPACE, "q-space"},
- {Coords::DEGREES, "Degrees"}};
+ {Coords::RADIANS, "Radians"},
+ {Coords::MM, "mm"},
+ {Coords::QSPACE, "q-space"},
+ {Coords::DEGREES, "Degrees"}};
} // namespace
diff --git a/GUI/View/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
index 0f55501477d..7ae926256c7 100644
--- a/GUI/View/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Common/ItemComboWidget.h"
-#include "GUI/View/Common/ItemComboToolbar.h"
#include "Base/Util/Assert.h"
+#include "GUI/View/Common/ItemComboToolbar.h"
#include <QStackedWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/FitParameterDelegate.cpp b/GUI/View/Fit/FitParameterDelegate.cpp
index 1d99420d04b..b3fd44b44f5 100644
--- a/GUI/View/Fit/FitParameterDelegate.cpp
+++ b/GUI/View/Fit/FitParameterDelegate.cpp
@@ -14,8 +14,8 @@
#include "GUI/View/Fit/FitParameterDelegate.h"
#include "GUI/Model/BaseItem/SessionItem.h"
-#include "GUI/View/PropertyEditor/CustomEditors.h"
#include "GUI/View/Common/CustomEventFilters.h"
+#include "GUI/View/PropertyEditor/CustomEditors.h"
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include <QApplication>
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 54dc98c06de..e2cf72009da 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -22,10 +22,10 @@
#include "GUI/Model/Model/FitParameterHelper.h"
#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Model/JobModel.h"
+#include "GUI/View/Common/CustomEventFilters.h"
#include "GUI/View/Fit/FitParameterDelegate.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/View/Info/OverlayLabelController.h"
-#include "GUI/View/Common/CustomEventFilters.h"
#include "GUI/View/Tool/mainwindow_constants.h"
#include <QAction>
#include <QMenu>
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 0b758882e11..d9cfdcd76f2 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -19,8 +19,8 @@
#include "GUI/Support/XML/Backup.h"
#include "GUI/Support/XML/Streamer.h"
#include "GUI/View/Common/DoubleSpinBox.h"
-#include "GUI/View/Instrument/DistributionPlot.h"
#include "GUI/View/Common/ScientificSpinBox.h"
+#include "GUI/View/Instrument/DistributionPlot.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include "GUI/View/Tool/WidgetUtils.h"
#include <QComboBox>
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index 0c93c7770dd..e6948faed10 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Util/ComboProperty.h"
-#include "GUI/View/PropertyEditor/CustomEditors.h"
#include "GUI/View/Common/ScientificSpinBox.h"
+#include "GUI/View/PropertyEditor/CustomEditors.h"
#include <QModelIndex>
#include <QSpinBox>
diff --git a/Tests/Unit/Device/DepthProbeConverterTest.cpp b/Tests/Unit/Device/DepthProbeConverterTest.cpp
index d6bd47bdb24..16546b8ce50 100644
--- a/Tests/Unit/Device/DepthProbeConverterTest.cpp
+++ b/Tests/Unit/Device/DepthProbeConverterTest.cpp
@@ -37,8 +37,7 @@ void DepthProbeCoordinatesTest::checkMainFunctionality(const DepthProbeCoordinat
2.8647889757e+1 * 1e-10);
EXPECT_NEAR(test_object.calculateMin(0, Coords::DEGREES), 2.8647889757e+1,
2.8647889757e+1 * 1e-10);
- EXPECT_NEAR(test_object.calculateMin(0, Coords::QSPACE), 6.0246390001,
- 6.0246390001 * 1e-10);
+ EXPECT_NEAR(test_object.calculateMin(0, Coords::QSPACE), 6.0246390001, 6.0246390001 * 1e-10);
EXPECT_EQ(test_object.calculateMin(0, Coords::RADIANS), m_alpha_start);
EXPECT_EQ(test_object.calculateMin(0, Coords::NBINS), 0.0);
@@ -76,8 +75,7 @@ void DepthProbeCoordinatesTest::checkAlphaAxis(Coords units,
EXPECT_EQ(axis->upperBound(), test_object.calculateMax(0, units));
}
-void DepthProbeCoordinatesTest::checkZAxis(Coords units,
- const DepthProbeCoordinates& test_object)
+void DepthProbeCoordinatesTest::checkZAxis(Coords units, const DepthProbeCoordinates& test_object)
{
auto axis = test_object.createConvertedAxis(1, units);
EXPECT_TRUE(dynamic_cast<const FixedBinAxis*>(axis.get()));
diff --git a/Tests/Unit/Device/DetectorMaskTest.cpp b/Tests/Unit/Device/DetectorMaskTest.cpp
index ba05a903bb2..dd261fd646c 100644
--- a/Tests/Unit/Device/DetectorMaskTest.cpp
+++ b/Tests/Unit/Device/DetectorMaskTest.cpp
@@ -1,8 +1,8 @@
#include "Device/Mask/DetectorMask.h"
+#include "Device/Data/Powerfield.h"
#include "Device/Detector/SphericalDetector.h"
#include "Device/Mask/Polygon.h"
#include "Tests/GTestWrapper/google_test.h"
-#include "Device/Data/Powerfield.h"
#include <memory>
class DetectorMaskTest : public ::testing::Test {
diff --git a/Tests/Unit/Device/Histogram2DTest.cpp b/Tests/Unit/Device/Histogram2DTest.cpp
index 2ddf0672dda..124718ff284 100644
--- a/Tests/Unit/Device/Histogram2DTest.cpp
+++ b/Tests/Unit/Device/Histogram2DTest.cpp
@@ -1,6 +1,6 @@
#include "Device/Histo/Histogram2D.h"
-#include "Device/Histo/Histogram1D.h"
#include "Base/Axis/Bin.h"
+#include "Device/Histo/Histogram1D.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Tests/Unit/Device/PowerfieldTest.cpp b/Tests/Unit/Device/PowerfieldTest.cpp
index e34862734f7..82ea2c91b54 100644
--- a/Tests/Unit/Device/PowerfieldTest.cpp
+++ b/Tests/Unit/Device/PowerfieldTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Axis/VariableBinAxis.h"
#include "Base/Axis/Bin.h"
+#include "Base/Axis/VariableBinAxis.h"
#include "Device/Data/DataUtils.h"
#include "Tests/GTestWrapper/google_test.h"
#include <algorithm>
diff --git a/Tests/Unit/Sim/CoordSystem1DTest.cpp b/Tests/Unit/Sim/CoordSystem1DTest.cpp
index f45cb3e5960..f6ba41c9038 100644
--- a/Tests/Unit/Sim/CoordSystem1DTest.cpp
+++ b/Tests/Unit/Sim/CoordSystem1DTest.cpp
@@ -37,8 +37,7 @@ void CoordSystem1DTest::checkConventionalConverter(const CoordSystem1D& test_obj
EXPECT_NEAR(test_object.calculateMin(0, Coords::UNDEFINED), Units::rad2deg(expected_min),
Units::rad2deg(expected_min) * 1e-10);
EXPECT_NEAR(test_object.calculateMin(0, Coords::NBINS), 0.0, 1e-10);
- EXPECT_NEAR(test_object.calculateMin(0, Coords::RADIANS), expected_min,
- expected_min * 1e-10);
+ EXPECT_NEAR(test_object.calculateMin(0, Coords::RADIANS), expected_min, expected_min * 1e-10);
EXPECT_NEAR(test_object.calculateMin(0, Coords::DEGREES), Units::rad2deg(expected_min),
Units::rad2deg(expected_min) * 1e-10);
EXPECT_NEAR(test_object.calculateMin(0, Coords::QSPACE), getQ(expected_min),
@@ -49,10 +48,9 @@ void CoordSystem1DTest::checkConventionalConverter(const CoordSystem1D& test_obj
double expected_max = m_axis.binCenters().back();
EXPECT_NEAR(test_object.calculateMax(0, Coords::UNDEFINED), Units::rad2deg(expected_max),
Units::rad2deg(expected_max) * 1e-10);
- EXPECT_NEAR(test_object.calculateMax(0, Coords::NBINS),
- static_cast<double>(m_axis.size()), 1e-10);
- EXPECT_NEAR(test_object.calculateMax(0, Coords::RADIANS), expected_max,
- expected_max * 1e-10);
+ EXPECT_NEAR(test_object.calculateMax(0, Coords::NBINS), static_cast<double>(m_axis.size()),
+ 1e-10);
+ EXPECT_NEAR(test_object.calculateMax(0, Coords::RADIANS), expected_max, expected_max * 1e-10);
EXPECT_NEAR(test_object.calculateMax(0, Coords::DEGREES), Units::rad2deg(expected_max),
Units::rad2deg(expected_max) * 1e-10);
EXPECT_NEAR(test_object.calculateMax(0, Coords::QSPACE), getQ(expected_max),
@@ -122,8 +120,8 @@ void CoordSystem1DTest::checkQSpecConverter(const CoordSystem1D& test_object)
double expected_max = m_q_axis.binCenters().back();
EXPECT_EQ(test_object.calculateMax(0, Coords::UNDEFINED), expected_max);
- EXPECT_NEAR(test_object.calculateMax(0, Coords::NBINS),
- static_cast<double>(m_q_axis.size()), 1e-10);
+ EXPECT_NEAR(test_object.calculateMax(0, Coords::NBINS), static_cast<double>(m_q_axis.size()),
+ 1e-10);
EXPECT_EQ(test_object.calculateMax(0, Coords::QSPACE), expected_max);
EXPECT_EQ(test_object.calculateMax(0, Coords::RQ4), expected_max);
@@ -233,8 +231,7 @@ TEST_F(CoordSystem1DTest, NonDefaultUnitsInInput)
{
PointwiseAxis axis("x", std::vector<double>{0.0, 0.5, 1.0});
- EXPECT_FAILED_ASSERT(
- AngularReflectometryCoordinates(m_beam.wavelength(), axis, Coords::NBINS));
+ EXPECT_FAILED_ASSERT(AngularReflectometryCoordinates(m_beam.wavelength(), axis, Coords::NBINS));
AngularReflectometryCoordinates converter(m_beam.wavelength(), axis, Coords::DEGREES);
auto axis_deg_output = converter.createConvertedAxis(0, Coords::DEGREES);
@@ -253,6 +250,5 @@ TEST_F(CoordSystem1DTest, NonDefaultUnitsInInput)
EXPECT_DOUBLE_EQ(axis[1], (*axis_rad_output)[1]);
EXPECT_DOUBLE_EQ(axis[2], (*axis_rad_output)[2]);
- EXPECT_FAILED_ASSERT(
- AngularReflectometryCoordinates(m_beam.wavelength(), q_axis, Coords::RQ4));
+ EXPECT_FAILED_ASSERT(AngularReflectometryCoordinates(m_beam.wavelength(), q_axis, Coords::RQ4));
}
--
GitLab