Skip to content
Snippets Groups Projects
Commit ab3ac870 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

clang-format

parent e108ae03
No related branches found
No related tags found
1 merge request!324get rid of SimulationFactory, move simulation builders to test directory
Pipeline #44832 failed
......@@ -94,7 +94,6 @@ std::unique_ptr<GISASSimulation> StdSimulations::MiniZPolarizedGISAS(const Multi
}
//! Basic GISAS simulation with the detector phi[0,2], theta[0,2].
std::unique_ptr<GISASSimulation> StdSimulations::BasicGISAS(const MultiLayer& sample)
......@@ -163,7 +162,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::GISASWithMasks(const MultiLayer
//! GISAS simulation with detector resolution.
std::unique_ptr<GISASSimulation> StdSimulations::MiniGISASDetectorResolution(const MultiLayer& sample)
std::unique_ptr<GISASSimulation>
StdSimulations::MiniGISASDetectorResolution(const MultiLayer& sample)
{
std::unique_ptr<GISASSimulation> result = MiniGISAS(sample);
ResolutionFunction2DGaussian resfunc(0.0025, 0.0025);
......@@ -223,7 +223,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToSample(const
//! GISAS simulation with the rectangular detector perpendicular to the direct beam.
std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToDirectBeam(const MultiLayer& sample)
std::unique_ptr<GISASSimulation>
StdSimulations::RectDetectorPerpToDirectBeam(const MultiLayer& sample)
{
Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
......@@ -233,7 +234,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToDirectBeam(co
//! GISAS simulation with the rectangular detector perpendicular to the reflected beam.
std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeam(const MultiLayer& sample)
std::unique_ptr<GISASSimulation>
StdSimulations::RectDetectorPerpToReflectedBeam(const MultiLayer& sample)
{
Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
......@@ -244,7 +246,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeam
//! GISAS simulation with the rectangular detector perpendicular to the reflected beam when
//! the coordinates of direct beam are known.
std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeamDpos(const MultiLayer& sample)
std::unique_ptr<GISASSimulation>
StdSimulations::RectDetectorPerpToReflectedBeamDpos(const MultiLayer& sample)
{
Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
......
......@@ -34,7 +34,8 @@ public:
protected:
virtual std::unique_ptr<FitObjective> createFitObjective() const;
// virtual std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters& params) const;
// virtual std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters& params)
// const;
//! Creates sample for given set of fit parameters.
virtual std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters&) const
......
......@@ -201,8 +201,8 @@ StdTestSimulations::SpecularDivergentBeam(const MultiLayer& sample)
return result;
}
std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithRelativeResolution(
const MultiLayer& sample)
std::unique_ptr<SpecularSimulation>
StdTestSimulations::TOFRWithRelativeResolution(const MultiLayer& sample)
{
FixedBinAxis qs("axis", 500, 0.0, 1.0);
QzScan q_scan(qs);
......@@ -215,8 +215,8 @@ std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithRelativeResoluti
return result;
}
std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithPointwiseResolution(
const MultiLayer& sample)
std::unique_ptr<SpecularSimulation>
StdTestSimulations::TOFRWithPointwiseResolution(const MultiLayer& sample)
{
FixedBinAxis qs("axis", 500, 0.0, 1.0);
QzScan q_scan(qs);
......
......@@ -19,8 +19,8 @@
#ifndef BORNAGAIN_TESTS_FUNCTIONAL_STD_STANDARDTESTS_H
#define BORNAGAIN_TESTS_FUNCTIONAL_STD_STANDARDTESTS_H
#include "Core/Examples/StandardSimulations.h"
#include "Core/Background/ConstantBackground.h"
#include "Core/Examples/StandardSimulations.h"
#include "Core/Simulation/DepthProbeSimulation.h"
#include "Core/Simulation/GISASSimulation.h"
#include "Core/Simulation/OffSpecularSimulation.h"
......@@ -473,8 +473,7 @@ TEST_F(Std, SphericalDetWithRoi)
{
std::unique_ptr<const MultiLayer> sample(CylindersAndPrismsBuilder().buildSample());
auto sim = StdSimulations::SphericalDetWithRoi(*sample);
EXPECT_TRUE(
run("SphericalDetWithRoi", *sim, 1e-10));
EXPECT_TRUE(run("SphericalDetWithRoi", *sim, 1e-10));
}
TEST_F(Std, RectDetWithRoi)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment