From 137586e4146a92adb016a9da490d26178c32080f Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 2 Jun 2022 07:21:12 +0200 Subject: [PATCH] new directory Device/Histo --- Device/{Data => Histo}/DiffUtil.cpp | 6 +++--- Device/{Data => Histo}/DiffUtil.h | 8 ++++---- Device/{Data => Histo}/SimulationResult.cpp | 4 ++-- Device/{Data => Histo}/SimulationResult.h | 8 ++++---- Device/IO/IOFactory.cpp | 2 +- GUI/Model/Data/JobItemUtils.cpp | 2 +- GUI/Model/Model/JobQueueData.cpp | 2 +- GUI/Support/Data/JobWorker.cpp | 2 +- GUI/View/PlotComparison/FitComparisonController.cpp | 2 +- GUI/View/PlotComparison/FitComparisonViewController.cpp | 2 +- Sim/Fitting/SimDataPair.h | 2 +- Sim/Simulation/DepthProbeSimulation.cpp | 2 +- Sim/Simulation/ISimulation.cpp | 2 +- Sim/Simulation/OffspecSimulation.cpp | 2 +- Sim/Simulation/ScatteringSimulation.cpp | 2 +- Sim/Simulation/SpecularSimulation.cpp | 2 +- .../Functional/Core/Consistence/CompareTwoReferences.cpp | 2 +- Tests/Functional/Core/Consistence/ConsistenceTests.cpp | 2 +- Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp | 2 +- .../Core/CoreSpecial/FourierTransformationTest.cpp | 2 +- Tests/Functional/Core/SuitePersist/Check.cpp | 4 ++-- Tests/Functional/GUI/Check.cpp | 4 ++-- Tests/Functional/Py/Suite/Check.cpp | 4 ++-- Tests/Functional/Suite/RunTest.cpp | 2 +- Tests/Unit/GUI/Utils.cpp | 2 +- Tests/Unit/Sim/SpecularSimulationTest.cpp | 2 +- Wrap/Swig/libBornAgainDevice.i | 8 ++++---- 27 files changed, 42 insertions(+), 42 deletions(-) rename Device/{Data => Histo}/DiffUtil.cpp (97%) rename Device/{Data => Histo}/DiffUtil.h (90%) rename Device/{Data => Histo}/SimulationResult.cpp (97%) rename Device/{Data => Histo}/SimulationResult.h (93%) diff --git a/Device/Data/DiffUtil.cpp b/Device/Histo/DiffUtil.cpp similarity index 97% rename from Device/Data/DiffUtil.cpp rename to Device/Histo/DiffUtil.cpp index 20b11bcee82..f34c7d04c55 100644 --- a/Device/Data/DiffUtil.cpp +++ b/Device/Histo/DiffUtil.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Device/Data/DiffUtil.cpp +//! @file Device/Histo/DiffUtil.cpp //! @brief Implements namespace DataUtils. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Base/Axis/Bin.h" #include "Base/Axis/FixedBinAxis.h" #include "Base/Axis/Frame.h" @@ -20,7 +20,7 @@ #include "Base/Math/Numeric.h" #include "Base/Util/Assert.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/IO/IOFactory.h" #include <algorithm> #include <iostream> diff --git a/Device/Data/DiffUtil.h b/Device/Histo/DiffUtil.h similarity index 90% rename from Device/Data/DiffUtil.h rename to Device/Histo/DiffUtil.h index fb5e493a8b1..9711f8d3b21 100644 --- a/Device/Data/DiffUtil.h +++ b/Device/Histo/DiffUtil.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Device/Data/DiffUtil.h +//! @file Device/Histo/DiffUtil.h //! @brief Defines namespace DataUtils. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_DEVICE_DATA_DIFFUTIL_H -#define BORNAGAIN_DEVICE_DATA_DIFFUTIL_H +#ifndef BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H +#define BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H #include "Device/Data/Powerfield.h" #include <memory> @@ -45,4 +45,4 @@ bool filesAgree(const std::string& datFileName, const std::string& refFileName, } -#endif // BORNAGAIN_DEVICE_DATA_DIFFUTIL_H +#endif // BORNAGAIN_DEVICE_HISTO_DIFFUTIL_H diff --git a/Device/Data/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp similarity index 97% rename from Device/Data/SimulationResult.cpp rename to Device/Histo/SimulationResult.cpp index 7eac09bb880..1879c5225c9 100644 --- a/Device/Data/SimulationResult.cpp +++ b/Device/Histo/SimulationResult.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Device/Data/SimulationResult.cpp +//! @file Device/Histo/SimulationResult.cpp //! @brief Implements class SimulationResult. //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Base/Axis/IAxis.h" #include "Base/Util/Assert.h" #include "Device/Data/Powerfield.h" diff --git a/Device/Data/SimulationResult.h b/Device/Histo/SimulationResult.h similarity index 93% rename from Device/Data/SimulationResult.h rename to Device/Histo/SimulationResult.h index 37bc40918df..3e5cd6a2534 100644 --- a/Device/Data/SimulationResult.h +++ b/Device/Histo/SimulationResult.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Device/Data/SimulationResult.h +//! @file Device/Histo/SimulationResult.h //! @brief Defines class SimulationResult. //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H -#define BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H +#ifndef BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H +#define BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H #include "Base/Py/PyObject.h" #include "Device/Coord/ICoordSystem.h" @@ -82,4 +82,4 @@ private: std::string m_title; }; -#endif // BORNAGAIN_DEVICE_DATA_SIMULATIONRESULT_H +#endif // BORNAGAIN_DEVICE_HISTO_SIMULATIONRESULT_H diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp index ca3750d85f5..66bc1f08310 100644 --- a/Device/IO/IOFactory.cpp +++ b/Device/IO/IOFactory.cpp @@ -15,7 +15,7 @@ #include "Device/IO/IOFactory.h" #include "Base/Util/Assert.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/IO/DataFormatUtils.h" #include "Device/IO/ReadReflectometry.h" #include "Device/IO/ReadWriteINT.h" diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp index 0d9fc11805f..f97e3e76fe1 100644 --- a/GUI/Model/Data/JobItemUtils.cpp +++ b/GUI/Model/Data/JobItemUtils.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/Model/Data/JobItemUtils.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "GUI/Model/Data/DataItem.h" #include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Util/CoordName.h" diff --git a/GUI/Model/Model/JobQueueData.cpp b/GUI/Model/Model/JobQueueData.cpp index e88a0228cd3..a9a35975656 100644 --- a/GUI/Model/Model/JobQueueData.cpp +++ b/GUI/Model/Model/JobQueueData.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/Model/Model/JobQueueData.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Model/JobModel.h" #include "GUI/Model/ToCore/SimulationToCore.h" diff --git a/GUI/Support/Data/JobWorker.cpp b/GUI/Support/Data/JobWorker.cpp index 5e17f24085f..219627695e6 100644 --- a/GUI/Support/Data/JobWorker.cpp +++ b/GUI/Support/Data/JobWorker.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/Support/Data/JobWorker.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Sim/Simulation/ScatteringSimulation.h" #include <QDateTime> #include <memory> diff --git a/GUI/View/PlotComparison/FitComparisonController.cpp b/GUI/View/PlotComparison/FitComparisonController.cpp index ce680e7a8d5..4941159e505 100644 --- a/GUI/View/PlotComparison/FitComparisonController.cpp +++ b/GUI/View/PlotComparison/FitComparisonController.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/PlotComparison/FitComparisonController.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "GUI/Model/Data/IntensityDataItem.h" #include "GUI/Model/Data/RealDataItem.h" #include "GUI/Model/Data/SpecularDataItem.h" diff --git a/GUI/View/PlotComparison/FitComparisonViewController.cpp b/GUI/View/PlotComparison/FitComparisonViewController.cpp index 0f913c0754e..e2a4b4334a0 100644 --- a/GUI/View/PlotComparison/FitComparisonViewController.cpp +++ b/GUI/View/PlotComparison/FitComparisonViewController.cpp @@ -13,7 +13,7 @@ // ************************************************************************************************ #include "GUI/View/PlotComparison/FitComparisonViewController.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "GUI/Model/Data/Data1DViewItem.h" #include "GUI/Model/Data/DataPropertyContainer.h" #include "GUI/Model/Data/RealDataItem.h" diff --git a/Sim/Fitting/SimDataPair.h b/Sim/Fitting/SimDataPair.h index b053469073b..571b91a8d73 100644 --- a/Sim/Fitting/SimDataPair.h +++ b/Sim/Fitting/SimDataPair.h @@ -20,7 +20,7 @@ #ifndef BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H #define BORNAGAIN_SIM_FITTING_SIMDATAPAIR_H -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Sim/Fitting/FitTypes.h" class Powerfield; diff --git a/Sim/Simulation/DepthProbeSimulation.cpp b/Sim/Simulation/DepthProbeSimulation.cpp index 39882b41d06..9e60a7ef013 100644 --- a/Sim/Simulation/DepthProbeSimulation.cpp +++ b/Sim/Simulation/DepthProbeSimulation.cpp @@ -19,7 +19,7 @@ #include "Device/Beam/Beam.h" #include "Device/Beam/IFootprintFactor.h" #include "Device/Coord/CoordSystem2D.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Param/Distrib/Distributions.h" #include "Resample/Flux/IFlux.h" #include "Sim/Background/IBackground.h" diff --git a/Sim/Simulation/ISimulation.cpp b/Sim/Simulation/ISimulation.cpp index ee80ea5b721..4577d9386b3 100644 --- a/Sim/Simulation/ISimulation.cpp +++ b/Sim/Simulation/ISimulation.cpp @@ -16,7 +16,7 @@ #include "Base/Progress/ProgressHandler.h" #include "Base/Util/Assert.h" #include "Base/Util/StringUtils.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Resample/Options/SimulationOptions.h" #include "Resample/Processed/ReSample.h" #include "Sample/Multilayer/MultiLayer.h" diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp index 5884a0fb60b..786253e6dec 100644 --- a/Sim/Simulation/OffspecSimulation.cpp +++ b/Sim/Simulation/OffspecSimulation.cpp @@ -20,7 +20,7 @@ #include "Device/Beam/Beam.h" #include "Device/Coord/CoordSystem2D.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/Detector/RectangularDetector.h" #include "Device/Detector/SphericalDetector.h" #include "Param/Distrib/Distributions.h" diff --git a/Sim/Simulation/ScatteringSimulation.cpp b/Sim/Simulation/ScatteringSimulation.cpp index dec3b08e183..5b775662e95 100644 --- a/Sim/Simulation/ScatteringSimulation.cpp +++ b/Sim/Simulation/ScatteringSimulation.cpp @@ -17,7 +17,7 @@ #include "Base/Util/Assert.h" #include "Device/Coord/CoordSystem2D.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/Detector/IDetector.h" #include "Resample/Element/DiffuseElement.h" diff --git a/Sim/Simulation/SpecularSimulation.cpp b/Sim/Simulation/SpecularSimulation.cpp index fdae0bd5212..c8fa76a77ce 100644 --- a/Sim/Simulation/SpecularSimulation.cpp +++ b/Sim/Simulation/SpecularSimulation.cpp @@ -18,7 +18,7 @@ #include "Device/Beam/IFootprintFactor.h" #include "Device/Coord/CoordSystem1D.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Param/Distrib/Distributions.h" #include "Resample/Element/SpecularElement.h" #include "Resample/Processed/ReSample.h" diff --git a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp index e8e945b3b1c..850c2f83283 100644 --- a/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp +++ b/Tests/Functional/Core/Consistence/CompareTwoReferences.cpp @@ -15,7 +15,7 @@ #include "BATesting.h" #include "Base/Util/Assert.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/Data/Powerfield.h" #include "Device/IO/IOFactory.h" #include <iostream> diff --git a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp index 80a6dac0989..d5b3ca4ae22 100644 --- a/Tests/Functional/Core/Consistence/ConsistenceTests.cpp +++ b/Tests/Functional/Core/Consistence/ConsistenceTests.cpp @@ -16,7 +16,7 @@ // some other tests, coincide within reasonable numeric error margins. #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Sample/StandardSamples/CylindersAndPrismsBuilder.h" #include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h" #include "Sim/Simulation/ScatteringSimulation.h" diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp index 98e90a155d8..9578d113743 100644 --- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp +++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp @@ -15,7 +15,7 @@ #include "BATesting.h" #include "Base/Axis/FixedBinAxis.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/IO/IOFactory.h" #include "Tests/GTestWrapper/google_test.h" #include <filesystem> diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp index 8e53cf07d83..99c9b4ac4cd 100644 --- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp +++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp @@ -15,7 +15,7 @@ #include "BATesting.h" #include "Base/Util/FileSystemUtils.h" #include "Device/Data/DataUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/IO/IOFactory.h" #include "Tests/GTestWrapper/google_test.h" #include <iostream> diff --git a/Tests/Functional/Core/SuitePersist/Check.cpp b/Tests/Functional/Core/SuitePersist/Check.cpp index b86add46ecd..3124d1119e5 100644 --- a/Tests/Functional/Core/SuitePersist/Check.cpp +++ b/Tests/Functional/Core/SuitePersist/Check.cpp @@ -16,9 +16,9 @@ #include "BATesting.h" #include "Base/Util/Assert.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/IO/IOFactory.h" #include "Sim/Simulation/ISimulation.h" #include <iostream> diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp index 7b457638ffe..fa7e3095913 100644 --- a/Tests/Functional/GUI/Check.cpp +++ b/Tests/Functional/GUI/Check.cpp @@ -15,9 +15,9 @@ #include "BABuild.h" #include "BATesting.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/IO/IOFactory.h" #include "GUI/Model/Device/InstrumentCollection.h" #include "GUI/Model/FromCore/ItemizeSample.h" diff --git a/Tests/Functional/Py/Suite/Check.cpp b/Tests/Functional/Py/Suite/Check.cpp index 6bb0f752b2b..ed261dccb40 100644 --- a/Tests/Functional/Py/Suite/Check.cpp +++ b/Tests/Functional/Py/Suite/Check.cpp @@ -15,9 +15,9 @@ #include "BABuild.h" #include "BATesting.h" #include "Base/Util/FileSystemUtils.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/IO/IOFactory.h" #include "Sim/Export/ExportToPython.h" #include "Sim/Simulation/ISimulation.h" diff --git a/Tests/Functional/Suite/RunTest.cpp b/Tests/Functional/Suite/RunTest.cpp index b30166ee8a4..b3e24b20727 100644 --- a/Tests/Functional/Suite/RunTest.cpp +++ b/Tests/Functional/Suite/RunTest.cpp @@ -14,7 +14,7 @@ #include "Tests/Functional/Suite/RunTest.h" #include "Base/Axis/IAxis.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Tests/Functional/Suite/TestSuite.h" // provides F_TEST macros to be executed by gtest #include <iostream> diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp index 97ea561673d..8a5404815e0 100644 --- a/Tests/Unit/GUI/Utils.cpp +++ b/Tests/Unit/GUI/Utils.cpp @@ -14,7 +14,7 @@ #include "Tests/Unit/GUI/Utils.h" #include "Base/Axis/FixedBinAxis.h" -#include "Device/Data/DiffUtil.h" +#include "Device/Histo/DiffUtil.h" #include "Device/IO/IOFactory.h" #include "GUI/Model/Data/RealDataItem.h" #include "GUI/Model/Model/SessionModel.h" diff --git a/Tests/Unit/Sim/SpecularSimulationTest.cpp b/Tests/Unit/Sim/SpecularSimulationTest.cpp index 8f6899f207a..b887fe6bfa7 100644 --- a/Tests/Unit/Sim/SpecularSimulationTest.cpp +++ b/Tests/Unit/Sim/SpecularSimulationTest.cpp @@ -5,7 +5,7 @@ #include "Base/Math/Constants.h" #include "Device/Beam/Beam.h" #include "Device/Data/Powerfield.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/SimulationResult.h" #include "Device/Detector/IDetector.h" #include "Param/Distrib/Distributions.h" #include "Sample/Material/MaterialFactoryFuncs.h" diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i index 9e2ef71de9e..71fb240566d 100644 --- a/Wrap/Swig/libBornAgainDevice.i +++ b/Wrap/Swig/libBornAgainDevice.i @@ -28,8 +28,8 @@ #include "Device/Beam/FootprintGauss.h" #include "Device/Beam/FootprintSquare.h" #include "Device/Data/DataUtils.h" -#include "Device/Data/DiffUtil.h" -#include "Device/Data/SimulationResult.h" +#include "Device/Histo/DiffUtil.h" +#include "Device/Histo/SimulationResult.h" #include "Device/Detector/RectangularDetector.h" #include "Device/Detector/SphericalDetector.h" #include "Device/IO/IOFactory.h" @@ -57,7 +57,7 @@ %newobject DataUtils::Data::importArrayToPowerfield; %include "Device/Data/Powerfield.h" -%include "Device/Data/DiffUtil.h" +%include "Device/Histo/DiffUtil.h" %include "Device/Data/DataUtils.h" %include "Device/Beam/Beam.h" @@ -82,4 +82,4 @@ %include "Device/Data/DataUtils.h" %include "Device/IO/IOFactory.h" -%include "Device/Data/SimulationResult.h" +%include "Device/Histo/SimulationResult.h" -- GitLab