From cc1b9a9d0a3526ba3bbadb31394d874e7ada393f Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Wed, 8 Sep 2021 20:22:13 +0200 Subject: [PATCH] sim builder -> ProStd/MakeSimulations --- Tests/Functional/Core/Consistence/ConsistenceTests.cpp | 2 +- Tests/Functional/Core/Fitting/FitTests.cpp | 2 +- .../{StdTestSimulations.cpp => MakeSimulations.cpp} | 4 ++-- .../ProStd/{StdTestSimulations.h => MakeSimulations.h} | 8 ++++---- Tests/Functional/Std/StandardTests.h | 2 +- Tests/Performance/Core/Multilayer.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename Tests/Functional/ProStd/{StdTestSimulations.cpp => MakeSimulations.cpp} (99%) rename Tests/Functional/ProStd/{StdTestSimulations.h => MakeSimulations.h} (93%) diff --git a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp index 2762da04d6c..72d3c2f7ea5 100644 --- a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp +++ b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp @@ -21,7 +21,7 @@ #include "Device/Histo/SimulationResult.h" #include "Sample/StandardSamples/CylindersAndPrismsBuilder.h" #include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h" -#include "Tests/Functional/ProStd/StdTestSimulations.h" +#include "Tests/Functional/ProStd/MakeSimulations.h" #include "Tests/GTestWrapper/google_test.h" #include <string> diff --git a/Tests/Functional/Core/Fitting/FitTests.cpp b/Tests/Functional/Core/Fitting/FitTests.cpp index 72c3815b56c..dc767f48a6e 100644 --- a/Tests/Functional/Core/Fitting/FitTests.cpp +++ b/Tests/Functional/Core/Fitting/FitTests.cpp @@ -24,7 +24,7 @@ #include "Sample/Multilayer/MultiLayer.h" #include "Sample/StandardSamples/includeStandardSamples.h" #include "Tests/Functional/Core/Fitting/SimfitTestPlan.h" -#include "Tests/Functional/ProStd/StdTestSimulations.h" +#include "Tests/Functional/ProStd/MakeSimulations.h" #include "Tests/GTestWrapper/google_test.h" using mumufit::Parameter; diff --git a/Tests/Functional/ProStd/StdTestSimulations.cpp b/Tests/Functional/ProStd/MakeSimulations.cpp similarity index 99% rename from Tests/Functional/ProStd/StdTestSimulations.cpp rename to Tests/Functional/ProStd/MakeSimulations.cpp index 5e2b6b9a64d..f8fa6ffb83b 100644 --- a/Tests/Functional/ProStd/StdTestSimulations.cpp +++ b/Tests/Functional/ProStd/MakeSimulations.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Tests/Functional/ProStd/StdTestSimulations.cpp +//! @file Tests/Functional/ProStd/MakeSimulations.cpp //! @brief Implements simulation builders for standard tests. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "Tests/Functional/ProStd/StdTestSimulations.h" +#include "Tests/Functional/ProStd/MakeSimulations.h" #include "Base/Axis/FixedBinAxis.h" #include "Base/Const/Units.h" #include "Core/Background/ConstantBackground.h" diff --git a/Tests/Functional/ProStd/StdTestSimulations.h b/Tests/Functional/ProStd/MakeSimulations.h similarity index 93% rename from Tests/Functional/ProStd/StdTestSimulations.h rename to Tests/Functional/ProStd/MakeSimulations.h index f1d5177cf3f..39364dce201 100644 --- a/Tests/Functional/ProStd/StdTestSimulations.h +++ b/Tests/Functional/ProStd/MakeSimulations.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Tests/Functional/ProStd/StdTestSimulations.h +//! @file Tests/Functional/ProStd/MakeSimulations.h //! @brief Declares simulation builders for standard tests. //! //! @homepage http://www.bornagainproject.org @@ -17,8 +17,8 @@ #endif #ifndef USER_API -#ifndef BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_STDTESTSIMULATIONS_H -#define BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_STDTESTSIMULATIONS_H +#ifndef BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_MAKESIMULATIONS_H +#define BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_MAKESIMULATIONS_H #include <memory> @@ -70,5 +70,5 @@ std::unique_ptr<DepthProbeSimulation> BasicDepthProbe(const MultiLayer& sample); } // namespace test::makeSimulations -#endif // BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_STDTESTSIMULATIONS_H +#endif // BORNAGAIN_TESTS_FUNCTIONAL_PROSTD_MAKESIMULATIONS_H #endif // USER_API diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h index 5d658cb15a3..de98dca0544 100644 --- a/Tests/Functional/Std/StandardTests.h +++ b/Tests/Functional/Std/StandardTests.h @@ -27,7 +27,7 @@ #include "Sample/ComponentBuilder/FTDistribution2DComponents.h" #include "Sample/ComponentBuilder/FormFactorComponents.h" #include "Sample/StandardSamples/includeStandardSamples.h" -#include "Tests/Functional/ProStd/StdTestSimulations.h" +#include "Tests/Functional/ProStd/MakeSimulations.h" #include "Tests/GTestWrapper/google_test.h" #include <iostream> diff --git a/Tests/Performance/Core/Multilayer.cpp b/Tests/Performance/Core/Multilayer.cpp index b5f38c94ce4..b97892e111a 100644 --- a/Tests/Performance/Core/Multilayer.cpp +++ b/Tests/Performance/Core/Multilayer.cpp @@ -15,7 +15,7 @@ #include "Sample/Multilayer/MultiLayer.h" #include "Core/Simulation/SpecularSimulation.h" #include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h" -#include "Tests/Functional/ProStd/StdTestSimulations.h" +#include "Tests/Functional/ProStd/MakeSimulations.h" #include <chrono> #include <iostream> -- GitLab