diff --git a/Core/Export/PyFmt2.cpp b/Core/Export/PyFmt2.cpp
index 44f27daba1d8d0882f613b738cb765d4e5833b60..67d8c641e7077c6e06b7f5beb99172ce4919fbcb 100644
--- a/Core/Export/PyFmt2.cpp
+++ b/Core/Export/PyFmt2.cpp
@@ -18,6 +18,7 @@
#include "Base/Utils/Algorithms.h"
#include "Base/Utils/PyFmt.h"
#include "Base/Utils/StringUtils.h"
+#include "Core/Export/PyFmtLimits.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
@@ -28,7 +29,6 @@
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/ParameterDistribution.h"
#include "Param/Distrib/RangedDistributions.h"
-#include "Core/Export/PyFmtLimits.h"
#include <iomanip>
namespace pyfmt2 {
@@ -144,5 +144,4 @@ std::string printRangedDistribution(const IRangedDistribution& distr) {
return result.str();
}
-
} // namespace pyfmt2
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 65e17a02c3c601d49a140946db40e7a89f1a4898..1d5d7d150a2fb76b293ab7f887b4d4dc3033b96f 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -16,8 +16,8 @@
#include "Base/Utils/PyFmt.h"
#include "Base/Vector/Transform3D.h"
#include "Core/Export/INodeUtils.h"
-#include "Core/Export/SampleLabelHandler.h"
#include "Core/Export/PyFmt2.h"
+#include "Core/Export/SampleLabelHandler.h"
#include "Param/Varia/ParameterUtils.h"
#include "Sample/Aggregate/InterferenceFunctions.h"
#include "Sample/Aggregate/ParticleLayout.h"
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index c96927127e063ccdc558d719843c5f3d2a5940fc..64b6b3ada6849319f115e6035d87764fdd5ba408 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -18,6 +18,8 @@
#include "Core/Computation/ConstantBackground.h"
#include "Core/Computation/PoissonNoiseBackground.h"
#include "Core/Export/INodeUtils.h"
+#include "Core/Export/PyFmt2.h"
+#include "Core/Export/PyFmtLimits.h"
#include "Core/Export/SampleToPython.h"
#include "Core/Scan/AngularSpecScan.h"
#include "Core/Scan/QSpecScan.h"
@@ -29,14 +31,11 @@
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/RegionOfInterest.h"
#include "Device/Detector/SphericalDetector.h"
-#include "Core/Export/PyFmt2.h"
-#include "Core/Scan/AngularSpecScan.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Param/Varia/ParameterUtils.h"
-#include "Core/Export/PyFmtLimits.h"
#include <iomanip>
using pyfmt::indent;
@@ -75,16 +74,16 @@ std::string defineScanResolution(const ScanResolution& scan) {
std::ostringstream result;
result << pyfmt2::printRangedDistribution(*scan.distribution()) << "\n"
<< pyfmt::indent() << "resolution = "
- << "ba." << scan.name()
- << "(distribution, " << pyfmt::printDouble(scan.delta()) << ")";
+ << "ba." << scan.name() << "(distribution, " << pyfmt::printDouble(scan.delta()) << ")";
return result.str();
}
std::string defineAngularSpecScan(const AngularSpecScan& scan) {
std::ostringstream result;
- result << "\n" << pyfmt::indent() << "# Defining specular scan:\n"
- << pyfmt::indent() << "axis = "
- << scan.coordinateAxis()->pyString("rad", 17 /*TODO*/) << "\n"
+ result << "\n"
+ << pyfmt::indent() << "# Defining specular scan:\n"
+ << pyfmt::indent() << "axis = " << scan.coordinateAxis()->pyString("rad", 17 /*TODO*/)
+ << "\n"
<< pyfmt::indent() << "scan = "
<< "ba.AngularSpecScan(" << pyfmt::printDouble(scan.wavelength()) << ", axis)\n";
@@ -446,12 +445,12 @@ std::string defineGetSimulation(const ISimulation* simulation) {
const std::string defineMain =
"if __name__ == '__main__':\n"
- " result = run_simulation()\n"
- " import sys\n"
- " if len(sys.argv)>=2:\n"
- " ba.IntensityDataIOFactory.writeSimulationResult(result, sys.argv[1])\n"
- " else:\n"
- " ba.plot_simulation_result(result, cmap='jet', aspect='auto')\n";
+ " result = run_simulation()\n"
+ " import sys\n"
+ " if len(sys.argv)>=2:\n"
+ " ba.IntensityDataIOFactory.writeSimulationResult(result, sys.argv[1])\n"
+ " else:\n"
+ " ba.plot_simulation_result(result, cmap='jet', aspect='auto')\n";
} // namespace
diff --git a/Core/Scan/QSpecScan.h b/Core/Scan/QSpecScan.h
index 2fbfb669483c8907f97ee27c27e44daebd3e2dd3..0f6289e17232516707c9ccc268eeac66aa05ed7e 100644
--- a/Core/Scan/QSpecScan.h
+++ b/Core/Scan/QSpecScan.h
@@ -39,7 +39,7 @@ public:
~QSpecScan() override;
QSpecScan* clone() const override;
- const ScanResolution * resolution() const { return m_resolution.get(); }
+ const ScanResolution* resolution() const { return m_resolution.get(); }
#ifndef SWIG
//! Generates simulation elements for specular simulations
diff --git a/Device/Resolution/ScanResolution.cpp b/Device/Resolution/ScanResolution.cpp
index 0224d43f3573d1a6f65274df7962de86f2f47343..bf5e224e01b25e082ebfa6c23cf830c7a22ad09e 100644
--- a/Device/Resolution/ScanResolution.cpp
+++ b/Device/Resolution/ScanResolution.cpp
@@ -71,7 +71,8 @@ private:
class ScanVectorRelativeResolution : public ScanResolution {
public:
- ScanVectorRelativeResolution(const IRangedDistribution& distr, const std::vector<double>& reldev)
+ ScanVectorRelativeResolution(const IRangedDistribution& distr,
+ const std::vector<double>& reldev)
: ScanResolution(distr), m_reldev(reldev) {
checkIfEmpty(m_reldev);
}
@@ -97,7 +98,8 @@ private:
class ScanVectorAbsoluteResolution : public ScanResolution {
public:
- ScanVectorAbsoluteResolution(const IRangedDistribution& distr, const std::vector<double>& stddev)
+ ScanVectorAbsoluteResolution(const IRangedDistribution& distr,
+ const std::vector<double>& stddev)
: ScanResolution(distr), m_stddev(stddev) {
checkIfEmpty(m_stddev);
}
diff --git a/Param/Distrib/RangedDistributions.cpp b/Param/Distrib/RangedDistributions.cpp
index 3ecb2ef78427aec47411bca8d31f6b2fe0f1b41d..cc134c3f8bc2c656b7ac5cb1bf78fb989de92499 100644
--- a/Param/Distrib/RangedDistributions.cpp
+++ b/Param/Distrib/RangedDistributions.cpp
@@ -37,13 +37,13 @@ IRangedDistribution::IRangedDistribution()
}
IRangedDistribution::IRangedDistribution(size_t n_samples, double sigma_factor,
- const RealLimits& limits)
+ const RealLimits& limits)
: m_n_samples(n_samples), m_sigma_factor(sigma_factor), m_limits(limits) {
checkInitialization();
}
IRangedDistribution::IRangedDistribution(size_t n_samples, double sigma_factor, double min,
- double max)
+ double max)
: m_n_samples(n_samples)
, m_sigma_factor(sigma_factor)
, m_limits(RealLimits::limited(min, max)) {
@@ -52,7 +52,8 @@ IRangedDistribution::IRangedDistribution(size_t n_samples, double sigma_factor,
IRangedDistribution::~IRangedDistribution() = default;
-std::vector<ParameterSample> IRangedDistribution::generateSamples(double mean, double stddev) const {
+std::vector<ParameterSample> IRangedDistribution::generateSamples(double mean,
+ double stddev) const {
auto generator = distribution(mean, stddev);
if (!generator->isDelta())
return generator->equidistantSamples(m_n_samples, m_sigma_factor, m_limits);
@@ -66,7 +67,7 @@ std::vector<ParameterSample> IRangedDistribution::generateSamples(double mean, d
std::vector<std::vector<ParameterSample>>
IRangedDistribution::generateSamples(const std::vector<double>& mean,
- const std::vector<double>& stddev) const {
+ const std::vector<double>& stddev) const {
if (mean.size() != stddev.size())
throw std::runtime_error("Error in IRangedDistribution::generateSamples: mean and variance "
"vectors shall be of the same size");
@@ -81,7 +82,7 @@ IRangedDistribution::generateSamples(const std::vector<double>& mean,
}
std::unique_ptr<IDistribution1D> IRangedDistribution::distribution(double mean,
- double stddev) const {
+ double stddev) const {
if (stddev < 0.0)
throw std::runtime_error(
"Error in IRangedDistribution::distribution: standard deviation is less than zero");
diff --git a/Param/Distrib/RangedDistributions.h b/Param/Distrib/RangedDistributions.h
index a5f8ffb57e77f91b4b5061d5c820a7edbbb89654..1224d9fc9c75c784e7abbcac1418dd13475537e4 100644
--- a/Param/Distrib/RangedDistributions.h
+++ b/Param/Distrib/RangedDistributions.h
@@ -37,7 +37,7 @@ class IRangedDistribution : public ICloneable {
public:
IRangedDistribution();
IRangedDistribution(size_t n_samples, double sigma_factor,
- const RealLimits& limits = RealLimits::limitless());
+ const RealLimits& limits = RealLimits::limitless());
//! Initializes Ranged distribution with given number of samples, sigma factor
//! (range in standard deviations to take into account during sample generation)
//! and limits (either RealLimits object or just min and max limits).
diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
index 13e2632f2f131f39af1f197104469945dbb51afe..71b7fc2f2367d1690e986359ff1a25996eb41622 100644
--- a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
+++ b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp
@@ -3,9 +3,9 @@
#include "Base/Const/Units.h"
#include "Base/Utils/PyFmt.h"
#include "Core/Export/PyFmt2.h"
+#include "Core/Export/PyFmtLimits.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Distrib/ParameterDistribution.h"
-#include "Core/Export/PyFmtLimits.h"
#include "Tests/GTestWrapper/google_test.h"
class PythonFormattingTest : public ::testing::Test {};