From 7a6f1b731970ce3d2a8226186602f5cf08018933 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 28 May 2022 23:32:47 +0200
Subject: [PATCH] clang-format
---
Base/Vector/RotMatrix.cpp | 8 ++++----
Base/Vector/RotMatrix.h | 4 ++--
Device/Detector/IDetector.cpp | 2 +-
Sim/Export/SampleToPython.cpp | 7 +++----
Sim/Simulation/ISimulation2D.cpp | 2 +-
Tests/Functional/Suite/MakeSimulations.cpp | 8 ++++----
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/Base/Vector/RotMatrix.cpp b/Base/Vector/RotMatrix.cpp
index 62dc72df367..ebe5c471523 100644
--- a/Base/Vector/RotMatrix.cpp
+++ b/Base/Vector/RotMatrix.cpp
@@ -50,7 +50,7 @@ RotMatrix RotMatrix::EulerZXZ(double alpha, double beta, double gamma)
return zrot * xrot * zrot2;
}
-std::array<double,3> RotMatrix::zxzEulerAngles() const
+std::array<double, 3> RotMatrix::zxzEulerAngles() const
{
double m00 = (-1 + 2 * x * x + 2 * s * s);
double m02 = 2 * (x * z + y * s);
@@ -130,11 +130,11 @@ bool RotMatrix::isZRotation() const
std::optional<double> RotMatrix::angleAroundCoordAxis(int iAxis) const
{
- if (iAxis==0 && isXRotation())
+ if (iAxis == 0 && isXRotation())
return 2 * atan2(x, s);
- if (iAxis==1 && isYRotation())
+ if (iAxis == 1 && isYRotation())
return 2 * atan2(y, s);
- if (iAxis==2 && isZRotation())
+ if (iAxis == 2 && isZRotation())
return 2 * atan2(z, s);
return {};
}
diff --git a/Base/Vector/RotMatrix.h b/Base/Vector/RotMatrix.h
index 6d8289684b3..99152d8ae83 100644
--- a/Base/Vector/RotMatrix.h
+++ b/Base/Vector/RotMatrix.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_BASE_VECTOR_ROTMATRIX_H
#define BORNAGAIN_BASE_VECTOR_ROTMATRIX_H
-#include <heinz/Vectors3D.h>
#include <array>
+#include <heinz/Vectors3D.h>
#include <optional>
//! Rotation matrix in three dimensions.
@@ -42,7 +42,7 @@ public:
static RotMatrix EulerZXZ(double alpha, double beta, double gamma);
//! Calculates the Euler angles corresponding to the rotation
- std::array<double,3> zxzEulerAngles() const;
+ std::array<double, 3> zxzEulerAngles() const;
//! Returns the inverse transformation.
RotMatrix getInverse() const;
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index 81007289f58..fb10a00ed7d 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -328,7 +328,7 @@ IDetector::RoiOfAxis::RoiOfAxis(const IAxis& axis, double _lower, double _upper)
/* -- from IDetector2D -- */
void IDetector::setDetectorParameters(size_t n_x, double x_min, double x_max, size_t n_y,
- double y_min, double y_max)
+ double y_min, double y_max)
{
clear();
addDetAxis(FixedBinAxis(axisName(0), n_x, x_min, x_max));
diff --git a/Sim/Export/SampleToPython.cpp b/Sim/Export/SampleToPython.cpp
index 3947633e652..410fdc359fb 100644
--- a/Sim/Export/SampleToPython.cpp
+++ b/Sim/Export/SampleToPython.cpp
@@ -39,7 +39,7 @@
using Py::Fmt::indent;
-static const std::map<int, char> axisChar {{0,'X'}, {1,'Y'}, {2,'Z'}};
+static const std::map<int, char> axisChar{{0, 'X'}, {1, 'Y'}, {2, 'Z'}};
namespace {
@@ -52,7 +52,7 @@ void setRotationInformation(const IParticle* particle, std::string name, std::os
if (matrix.isIdentity())
return;
// Rotation around coordinate axis?
- for (int iAxis = 0; iAxis<3; ++iAxis) {
+ for (int iAxis = 0; iAxis < 3; ++iAxis) {
std::optional<double> angle = matrix.angleAroundCoordAxis(iAxis);
if (angle) {
result << indent() << name << "_rotation = ba.Rotation" << axisChar.at(iAxis) << "("
@@ -64,8 +64,7 @@ void setRotationInformation(const IParticle* particle, std::string name, std::os
// Generic rotation.
auto angles = matrix.zxzEulerAngles();
result << indent() << name << "_rotation = ba.RotationEuler("
- << Py::Fmt::printDegrees(angles[0]) << ", "
- << Py::Fmt::printDegrees(angles[1]) << ", "
+ << Py::Fmt::printDegrees(angles[0]) << ", " << Py::Fmt::printDegrees(angles[1]) << ", "
<< Py::Fmt::printDegrees(angles[2]) << ")\n";
result << indent() << name << ".setRotation(" << name << "_rotation)\n";
}
diff --git a/Sim/Simulation/ISimulation2D.cpp b/Sim/Simulation/ISimulation2D.cpp
index eab14613134..5ca22bb53a5 100644
--- a/Sim/Simulation/ISimulation2D.cpp
+++ b/Sim/Simulation/ISimulation2D.cpp
@@ -16,8 +16,8 @@
#include "Base/Util/Assert.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/DetectorContext.h"
-#include "Device/Detector/SphericalDetector.h"
#include "Device/Detector/IDetector.h"
+#include "Device/Detector/SphericalDetector.h"
#include "Resample/Element/DiffuseElement.h"
#include "Sim/Background/IBackground.h"
#include "Sim/Computation/DWBAComputation.h"
diff --git a/Tests/Functional/Suite/MakeSimulations.cpp b/Tests/Functional/Suite/MakeSimulations.cpp
index 95da6cd2462..dc42369ef46 100644
--- a/Tests/Functional/Suite/MakeSimulations.cpp
+++ b/Tests/Functional/Suite/MakeSimulations.cpp
@@ -217,8 +217,8 @@ test::makeSimulation::RectDetectorGeneric(const MultiLayer& sample)
{
Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
RectangularDetector detector(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
- detector.setDetectorPosition(
- R3(rdet_distance, 10.0, 5.0), rdet_width / 2., 1.0, R3(0.1, -1.0, 0.2));
+ detector.setDetectorPosition(R3(rdet_distance, 10.0, 5.0), rdet_width / 2., 1.0,
+ R3(0.1, -1.0, 0.2));
return std::make_unique<ScatteringSimulation>(beam, sample, detector);
}
@@ -338,8 +338,8 @@ std::unique_ptr<OffspecSimulation> test::makeSimulation::MiniOffspec(const Multi
const double phi_min(-0.1 * deg);
const double phi_max(0.1 * deg);
- result->detector().setDetectorParameters(
- n_phi, phi_min, phi_max, n_alpha, alpha_min, alpha_max);
+ result->detector().setDetectorParameters(n_phi, phi_min, phi_max, n_alpha, alpha_min,
+ alpha_max);
const int n_scan_points(n_alpha);
const double alpha_i_min(alpha_min);
--
GitLab