From ffbc0c9c98098f841fb6da044a7a188bfbe42774 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:51 +0100
Subject: [PATCH 01/32] rename GUI/View/Layout/AppConfig.cpp -> GUI/View/Base/
---
GUI/View/{Layout => Base}/AppConfig.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename GUI/View/{Layout => Base}/AppConfig.cpp (99%)
diff --git a/GUI/View/Layout/AppConfig.cpp b/GUI/View/Base/AppConfig.cpp
similarity index 99%
rename from GUI/View/Layout/AppConfig.cpp
rename to GUI/View/Base/AppConfig.cpp
index bc83ccc8543..422d26ec895 100644
--- a/GUI/View/Layout/AppConfig.cpp
+++ b/GUI/View/Base/AppConfig.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/AppConfig.cpp
+//! @file GUI/View/Base/AppConfig.cpp
//! @brief Implements class AppConfig.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From db8c11e212b6470ee1faef1e56673111824a643c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:52 +0100
Subject: [PATCH 02/32] rename GUI/View/Layout/AppConfig.h -> GUI/View/Base/
---
App/main.cpp | 2 +-
GUI/View/Base/AppConfig.cpp | 2 +-
GUI/View/{Layout => Base}/AppConfig.h | 8 ++++----
GUI/View/Canvas/SavePlotAssistant.cpp | 2 +-
GUI/View/Loader/ComponentRW.cpp | 2 +-
GUI/View/Loader/DataLoader.cpp | 2 +-
GUI/View/Loader/ProjectionsSaver.cpp | 2 +-
GUI/View/Loader/PythonScriptWidget.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 2 +-
GUI/View/Main/MainWindow.cpp | 2 +-
GUI/View/Manager/NewProjectDialog.cpp | 2 +-
GUI/View/Manager/ProjectManager.cpp | 2 +-
GUI/View/Manager/PyImportAssistant.cpp | 2 +-
GUI/View/Plotter/ColorMap.cpp | 2 +-
GUI/View/Realspace/RealspaceWidget.cpp | 2 +-
GUI/View/Sample/SampleForm.cpp | 2 +-
GUI/View/Setup/AxesPanel.cpp | 2 +-
GUI/View/Views/InstrumentView.cpp | 2 +-
GUI/View/Views/SimulationView.cpp | 2 +-
19 files changed, 22 insertions(+), 22 deletions(-)
rename GUI/View/{Layout => Base}/AppConfig.h (90%)
diff --git a/App/main.cpp b/App/main.cpp
index 4445f715426..22e161cc1f3 100644
--- a/App/main.cpp
+++ b/App/main.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Main/MainWindow.h"
#include "config_build.h"
#include <QApplication>
diff --git a/GUI/View/Base/AppConfig.cpp b/GUI/View/Base/AppConfig.cpp
index 422d26ec895..a76217787b7 100644
--- a/GUI/View/Base/AppConfig.cpp
+++ b/GUI/View/Base/AppConfig.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/Support/Data/ComboProperty.h"
#include "GUI/Support/Style/QCP_Util.h"
#include <QApplication>
diff --git a/GUI/View/Layout/AppConfig.h b/GUI/View/Base/AppConfig.h
similarity index 90%
rename from GUI/View/Layout/AppConfig.h
rename to GUI/View/Base/AppConfig.h
index af75521c61d..89478120a51 100644
--- a/GUI/View/Layout/AppConfig.h
+++ b/GUI/View/Base/AppConfig.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/AppConfig.h
+//! @file GUI/View/Base/AppConfig.h
//! @brief Defines class AppConfig.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
-#define BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
+#ifndef BORNAGAIN_GUI_VIEW_BASE_APPCONFIG_H
+#define BORNAGAIN_GUI_VIEW_BASE_APPCONFIG_H
#include "Wrap/WinDllMacros.h"
#include <QObject>
@@ -57,4 +57,4 @@ private:
BA_GUI_API_ extern std::unique_ptr<AppConfig> gApp; //!< global pointer to _the_ instance
-#endif // BORNAGAIN_GUI_VIEW_LAYOUT_APPCONFIG_H
+#endif // BORNAGAIN_GUI_VIEW_BASE_APPCONFIG_H
diff --git a/GUI/View/Canvas/SavePlotAssistant.cpp b/GUI/View/Canvas/SavePlotAssistant.cpp
index 2365e021570..54c31f5f4b9 100644
--- a/GUI/View/Canvas/SavePlotAssistant.cpp
+++ b/GUI/View/Canvas/SavePlotAssistant.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Canvas/SavePlotAssistant.h"
#include "Base/Util/Assert.h"
#include "Device/IO/IOFactory.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Plotter/ColorMap.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QFile>
diff --git a/GUI/View/Loader/ComponentRW.cpp b/GUI/View/Loader/ComponentRW.cpp
index e2f4ea4517e..502b977c036 100644
--- a/GUI/View/Loader/ComponentRW.cpp
+++ b/GUI/View/Loader/ComponentRW.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Loader/ComponentRW.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentXML.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QMessageBox>
diff --git a/GUI/View/Loader/DataLoader.cpp b/GUI/View/Loader/DataLoader.cpp
index f4e8d613ada..91a7215a478 100644
--- a/GUI/View/Loader/DataLoader.cpp
+++ b/GUI/View/Loader/DataLoader.cpp
@@ -20,8 +20,8 @@
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Files/DatafileItem.h"
#include "GUI/Support/Util/Path.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Loader/ImportDialogs.h"
#include <QFileDialog>
#include <QFileInfo>
diff --git a/GUI/View/Loader/ProjectionsSaver.cpp b/GUI/View/Loader/ProjectionsSaver.cpp
index 8fbe7363e7e..3213f03df60 100644
--- a/GUI/View/Loader/ProjectionsSaver.cpp
+++ b/GUI/View/Loader/ProjectionsSaver.cpp
@@ -19,7 +19,7 @@
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Mask/MasksSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Widget/FileDialog.h"
#include <QFile>
#include <QString>
diff --git a/GUI/View/Loader/PythonScriptWidget.cpp b/GUI/View/Loader/PythonScriptWidget.cpp
index ff6f872004c..69d3a94b885 100644
--- a/GUI/View/Loader/PythonScriptWidget.cpp
+++ b/GUI/View/Loader/PythonScriptWidget.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/Loader/PythonScriptWidget.h"
#include "GUI/Model/ToCore/SimulationToCore.h"
#include "GUI/Support/Style/Style.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Widget/StyledToolbar.h"
#include "GUI/View/Widget/WidgetSettings.h"
#include "Sim/Export/ExportToPython.h"
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 0e0b41c7ca0..1fa055f988c 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/SysUtil.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Manager/ProjectManager.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index b5f2b2a2f30..2183f619859 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Main/ActionManager.h"
#include "GUI/View/Main/CentralWidget.h"
diff --git a/GUI/View/Manager/NewProjectDialog.cpp b/GUI/View/Manager/NewProjectDialog.cpp
index 0dbd8eca22f..c6bfa7e0d67 100644
--- a/GUI/View/Manager/NewProjectDialog.cpp
+++ b/GUI/View/Manager/NewProjectDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Manager/NewProjectDialog.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtil.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QPushButton>
diff --git a/GUI/View/Manager/ProjectManager.cpp b/GUI/View/Manager/ProjectManager.cpp
index 7f2ca3e6b9d..24fb84d6394 100644
--- a/GUI/View/Manager/ProjectManager.cpp
+++ b/GUI/View/Manager/ProjectManager.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/Project/AutosaveController.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtil.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Manager/NewProjectDialog.h"
#include <QApplication>
#include <QDateTime>
diff --git a/GUI/View/Manager/PyImportAssistant.cpp b/GUI/View/Manager/PyImportAssistant.cpp
index 4576c0683ed..598a7f5574f 100644
--- a/GUI/View/Manager/PyImportAssistant.cpp
+++ b/GUI/View/Manager/PyImportAssistant.cpp
@@ -23,10 +23,10 @@
#include "GUI/Model/Project/ProjectUtil.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/Support/Util/String.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/ComboSelectorDialog.h"
#include "GUI/View/Info/DetailedMessageBox.h"
#include "GUI/View/Info/MessageBox.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "PyCore/Embed/PyInterpreter.h" // listOfFunctions
#include "PyCore/Sample/ImportMultiLayer.h" // createMultiLayerFromPython
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/GUI/View/Plotter/ColorMap.cpp b/GUI/View/Plotter/ColorMap.cpp
index 53ca5b152f6..975791b7b1e 100644
--- a/GUI/View/Plotter/ColorMap.cpp
+++ b/GUI/View/Plotter/ColorMap.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Style/QCP_Util.h"
#include "GUI/Support/Style/Style.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include <qcustomplot.h>
namespace {
diff --git a/GUI/View/Realspace/RealspaceWidget.cpp b/GUI/View/Realspace/RealspaceWidget.cpp
index 5461c6a6f5e..219c5a15505 100644
--- a/GUI/View/Realspace/RealspaceWidget.cpp
+++ b/GUI/View/Realspace/RealspaceWidget.cpp
@@ -16,8 +16,8 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Sample/SampleItem.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Realspace/RealspaceBuilder.h"
#include "GUI/View/Widget/FileDialog.h"
#include "Img3D/Model/Model.h"
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index dc8b853517c..6ab30715724 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Vec.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SamplesSet.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Layout/LayoutUtil.h"
#include "GUI/View/Sample/CompoundForm.h"
#include "GUI/View/Sample/CoreAndShellForm.h"
diff --git a/GUI/View/Setup/AxesPanel.cpp b/GUI/View/Setup/AxesPanel.cpp
index d77087d0879..079d6a0b4d2 100644
--- a/GUI/View/Setup/AxesPanel.cpp
+++ b/GUI/View/Setup/AxesPanel.cpp
@@ -21,7 +21,7 @@
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Data/ComboProperty.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Numeric/ComboUtil.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Widget/GroupBoxes.h"
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index 903337a8efe..0f786ecdd24 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -17,11 +17,11 @@
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
#include "GUI/View/Instrument/OffspecInstrumentEditor.h"
#include "GUI/View/Instrument/Scatter2DInstrumentEditor.h"
#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
-#include "GUI/View/Layout/AppConfig.h"
#include "GUI/View/Loader/ComponentRW.h"
#include "GUI/View/Modelview/SetView.h"
#include "GUI/View/Setup/FrameActions.h"
diff --git a/GUI/View/Views/SimulationView.cpp b/GUI/View/Views/SimulationView.cpp
index a77dcd8ad8b..27cabe8b7e7 100644
--- a/GUI/View/Views/SimulationView.cpp
+++ b/GUI/View/Views/SimulationView.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Sample/SampleValidator.h"
#include "GUI/Model/Sample/SamplesSet.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
-#include "GUI/View/Layout/AppConfig.h"
+#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Loader/PythonScriptWidget.h"
#include "GUI/View/Widget/GroupBoxes.h"
#include <QButtonGroup>
--
GitLab
From ee349355d9b71122a57480792140c96f11084316 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:53 +0100
Subject: [PATCH 03/32] rename GUI/View/Layout/CustomEventFilters.cpp ->
GUI/View/Base/
---
GUI/View/{Layout => Base}/CustomEventFilters.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename GUI/View/{Layout => Base}/CustomEventFilters.cpp (99%)
diff --git a/GUI/View/Layout/CustomEventFilters.cpp b/GUI/View/Base/CustomEventFilters.cpp
similarity index 99%
rename from GUI/View/Layout/CustomEventFilters.cpp
rename to GUI/View/Base/CustomEventFilters.cpp
index 28313cb1953..88b68c12423 100644
--- a/GUI/View/Layout/CustomEventFilters.cpp
+++ b/GUI/View/Base/CustomEventFilters.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/CustomEventFilters.cpp
+//! @file GUI/View/Base/CustomEventFilters.cpp
//! @brief Defines classes releted to event filtering.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 1d8eb9c27b764c9854ed19d98bd918892e44bc19 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:53 +0100
Subject: [PATCH 04/32] rename GUI/View/Layout/CustomEventFilters.h ->
GUI/View/Base/
---
GUI/View/Base/CustomEventFilters.cpp | 2 +-
GUI/View/{Layout => Base}/CustomEventFilters.h | 8 ++++----
GUI/View/Main/AboutDialog.cpp | 2 +-
GUI/View/Numeric/ComboUtil.h | 2 +-
GUI/View/Numeric/NumWidgetUtil.cpp | 2 +-
GUI/View/ParEdit/CustomEditors.cpp | 2 +-
GUI/View/ParEdit/FitParameterDelegate.cpp | 2 +-
GUI/View/Sample/InterferenceForm.cpp | 2 +-
GUI/View/Sample/SelectionContainerForm.h | 2 +-
GUI/View/Tuning/FitParameterWidget.cpp | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
rename GUI/View/{Layout => Base}/CustomEventFilters.h (92%)
diff --git a/GUI/View/Base/CustomEventFilters.cpp b/GUI/View/Base/CustomEventFilters.cpp
index 88b68c12423..0f49eca1f5f 100644
--- a/GUI/View/Base/CustomEventFilters.cpp
+++ b/GUI/View/Base/CustomEventFilters.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "Base/Util/Assert.h"
#include <QApplication>
#include <QComboBox>
diff --git a/GUI/View/Layout/CustomEventFilters.h b/GUI/View/Base/CustomEventFilters.h
similarity index 92%
rename from GUI/View/Layout/CustomEventFilters.h
rename to GUI/View/Base/CustomEventFilters.h
index ba64353fe60..efa18534935 100644
--- a/GUI/View/Layout/CustomEventFilters.h
+++ b/GUI/View/Base/CustomEventFilters.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/CustomEventFilters.h
+//! @file GUI/View/Base/CustomEventFilters.h
//! @brief Defines classes releted to event filtering.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_CUSTOMEVENTFILTERS_H
-#define BORNAGAIN_GUI_VIEW_LAYOUT_CUSTOMEVENTFILTERS_H
+#ifndef BORNAGAIN_GUI_VIEW_BASE_CUSTOMEVENTFILTERS_H
+#define BORNAGAIN_GUI_VIEW_BASE_CUSTOMEVENTFILTERS_H
#include <QObject>
@@ -108,4 +108,4 @@ protected:
QWidget* m_parent;
};
-#endif // BORNAGAIN_GUI_VIEW_LAYOUT_CUSTOMEVENTFILTERS_H
+#endif // BORNAGAIN_GUI_VIEW_BASE_CUSTOMEVENTFILTERS_H
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 7cc2a9f32b6..e62dfaf82c2 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/Support/Style/Style.h"
#include "GUI/Support/Util/Path.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include <QDate>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/Numeric/ComboUtil.h b/GUI/View/Numeric/ComboUtil.h
index f83c252b2cd..1dabafa414e 100644
--- a/GUI/View/Numeric/ComboUtil.h
+++ b/GUI/View/Numeric/ComboUtil.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEW_NUMERIC_COMBOUTIL_H
#include "GUI/Model/Descriptor/PolyItem.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include <QComboBox>
class ComboProperty;
diff --git a/GUI/View/Numeric/NumWidgetUtil.cpp b/GUI/View/Numeric/NumWidgetUtil.cpp
index 9b699f1649a..fcfb255fb14 100644
--- a/GUI/View/Numeric/NumWidgetUtil.cpp
+++ b/GUI/View/Numeric/NumWidgetUtil.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include <QLabel>
#include <QLineEdit>
diff --git a/GUI/View/ParEdit/CustomEditors.cpp b/GUI/View/ParEdit/CustomEditors.cpp
index 77d59694f41..03a7ecc5fec 100644
--- a/GUI/View/ParEdit/CustomEditors.cpp
+++ b/GUI/View/ParEdit/CustomEditors.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "Fit/Param/RealLimits.h"
#include "GUI/Support/Data/ComboProperty.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include <QBoxLayout>
#include <cmath>
diff --git a/GUI/View/ParEdit/FitParameterDelegate.cpp b/GUI/View/ParEdit/FitParameterDelegate.cpp
index 13e7fb487f0..d0732b0e93d 100644
--- a/GUI/View/ParEdit/FitParameterDelegate.cpp
+++ b/GUI/View/ParEdit/FitParameterDelegate.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Tune/FitParameterItem.h"
#include "GUI/Support/Data/ComboProperty.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include "GUI/View/ParEdit/CustomEditors.h"
#include <QApplication>
diff --git a/GUI/View/Sample/InterferenceForm.cpp b/GUI/View/Sample/InterferenceForm.cpp
index 64b41a863f0..301de9e0194 100644
--- a/GUI/View/Sample/InterferenceForm.cpp
+++ b/GUI/View/Sample/InterferenceForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/LatticeTypeSelectionForm.h"
diff --git a/GUI/View/Sample/SelectionContainerForm.h b/GUI/View/Sample/SelectionContainerForm.h
index 5a419f9d787..4be7a54de19 100644
--- a/GUI/View/Sample/SelectionContainerForm.h
+++ b/GUI/View/Sample/SelectionContainerForm.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_VIEW_SAMPLE_SELECTIONCONTAINERFORM_H
#include "GUI/Model/Descriptor/PolyItem.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Sample/LayerEditorUtil.h"
#include "GUI/View/Sample/SampleEditorController.h"
#include <QComboBox>
diff --git a/GUI/View/Tuning/FitParameterWidget.cpp b/GUI/View/Tuning/FitParameterWidget.cpp
index 7b39c3f09eb..337a4ffcdf9 100644
--- a/GUI/View/Tuning/FitParameterWidget.cpp
+++ b/GUI/View/Tuning/FitParameterWidget.cpp
@@ -21,8 +21,8 @@
#include "GUI/Model/Tune/FitParameterContainerItem.h"
#include "GUI/Model/Tune/FitSuiteItem.h"
#include "GUI/Support/Data/JobStatus.h"
+#include "GUI/View/Base/CustomEventFilters.h"
#include "GUI/View/Info/OverlayLabelController.h"
-#include "GUI/View/Layout/CustomEventFilters.h"
#include "GUI/View/ParEdit/FitParameterDelegate.h"
#include "GUI/View/Tuning/FitparQModel.h"
#include "GUI/View/Tuning/ParameterTuningWidget.h"
--
GitLab
From 46648b06e916e2698ea9a9e36dded9a655ea8360 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:54 +0100
Subject: [PATCH 05/32] rename GUI/View/Layout/LayoutUtil.cpp -> GUI/View/Base/
---
GUI/View/{Layout => Base}/LayoutUtil.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename GUI/View/{Layout => Base}/LayoutUtil.cpp (95%)
diff --git a/GUI/View/Layout/LayoutUtil.cpp b/GUI/View/Base/LayoutUtil.cpp
similarity index 95%
rename from GUI/View/Layout/LayoutUtil.cpp
rename to GUI/View/Base/LayoutUtil.cpp
index 77dbc769331..d5dd8ced3b8 100644
--- a/GUI/View/Layout/LayoutUtil.cpp
+++ b/GUI/View/Base/LayoutUtil.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/LayoutUtil.cpp
+//! @file GUI/View/Base/LayoutUtil.cpp
//! @brief Implements namespace LayoutUtils.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 221c82ce58605b3752bb2d9fa5dcd5ed16920e41 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:54 +0100
Subject: [PATCH 06/32] rename GUI/View/Layout/LayoutUtil.h -> GUI/View/Base/
---
GUI/View/Base/LayoutUtil.cpp | 2 +-
GUI/View/{Layout => Base}/LayoutUtil.h | 8 ++++----
GUI/View/FitControl/MinimizerEditor.cpp | 2 +-
GUI/View/Sample/MaterialInplaceForm.cpp | 2 +-
GUI/View/Sample/SampleForm.cpp | 2 +-
GUI/View/Sample/SelectionContainerForm.cpp | 2 +-
GUI/View/Setup/AxisPanel.cpp | 2 +-
GUI/View/Setup/MasksPanel.cpp | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
rename GUI/View/{Layout => Base}/LayoutUtil.h (80%)
diff --git a/GUI/View/Base/LayoutUtil.cpp b/GUI/View/Base/LayoutUtil.cpp
index d5dd8ced3b8..a5f079541a6 100644
--- a/GUI/View/Base/LayoutUtil.cpp
+++ b/GUI/View/Base/LayoutUtil.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include <QLayoutItem>
#include <QWidget>
diff --git a/GUI/View/Layout/LayoutUtil.h b/GUI/View/Base/LayoutUtil.h
similarity index 80%
rename from GUI/View/Layout/LayoutUtil.h
rename to GUI/View/Base/LayoutUtil.h
index c3f7788aadf..42da0c4e32f 100644
--- a/GUI/View/Layout/LayoutUtil.h
+++ b/GUI/View/Base/LayoutUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/LayoutUtil.h
+//! @file GUI/View/Base/LayoutUtil.h
//! @brief Defines namespace GUI::Util::Layout.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
-#define BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
+#ifndef BORNAGAIN_GUI_VIEW_BASE_LAYOUTUTIL_H
+#define BORNAGAIN_GUI_VIEW_BASE_LAYOUTUTIL_H
#include <QLayout>
@@ -24,4 +24,4 @@ void clearLayout(QLayout* layout, bool deleteWidgets = true);
} // namespace GUI::Util::Layout
-#endif // BORNAGAIN_GUI_VIEW_LAYOUT_LAYOUTUTIL_H
+#endif // BORNAGAIN_GUI_VIEW_BASE_LAYOUTUTIL_H
diff --git a/GUI/View/FitControl/MinimizerEditor.cpp b/GUI/View/FitControl/MinimizerEditor.cpp
index 7dd3f3aeec0..d61087bb9e4 100644
--- a/GUI/View/FitControl/MinimizerEditor.cpp
+++ b/GUI/View/FitControl/MinimizerEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Mini/MinimizerItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Tune/FitSuiteItem.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Numeric/ComboUtil.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include <QSpinBox>
diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp
index 2025a5b5b62..5b8a9fbc53f 100644
--- a/GUI/View/Sample/MaterialInplaceForm.cpp
+++ b/GUI/View/Sample/MaterialInplaceForm.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/XML/Backup.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Material/MaterialEditorDialog.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Sample/LayerEditorUtil.h"
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index 6ab30715724..0b0972372aa 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SamplesSet.h"
#include "GUI/View/Base/AppConfig.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Sample/CompoundForm.h"
#include "GUI/View/Sample/CoreAndShellForm.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
diff --git a/GUI/View/Sample/SelectionContainerForm.cpp b/GUI/View/Sample/SelectionContainerForm.cpp
index 364cc977bd2..5a9b202ae93 100644
--- a/GUI/View/Sample/SelectionContainerForm.cpp
+++ b/GUI/View/Sample/SelectionContainerForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Sample/ProfileItems.h"
#include "GUI/Model/Sample/RotationItems.h"
#include "GUI/Model/Sample/RoughnessItems.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
ISelectionContainerForm::ISelectionContainerForm(QWidget* parent, SampleEditorController* ec)
: QWidget(parent)
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index 19e6719dcea..65d5fcea9e3 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -24,7 +24,7 @@
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Data/ComboProperty.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Widget/GroupBoxes.h"
diff --git a/GUI/View/Setup/MasksPanel.cpp b/GUI/View/Setup/MasksPanel.cpp
index f4fa36c070d..fb7a717c243 100644
--- a/GUI/View/Setup/MasksPanel.cpp
+++ b/GUI/View/Setup/MasksPanel.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Mask/MasksQModel.h"
#include "GUI/Model/Mask/MasksSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Layout/LayoutUtil.h"
+#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Widget/GroupBoxes.h"
#include <QCheckBox>
--
GitLab
From ccf9e8ba46b40d9eaa4465cb09353a1c22409b8f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:27:55 +0100
Subject: [PATCH 07/32] rename GUI/View/Layout/mainwindow_constants.h ->
GUI/View/Base/
---
GUI/View/{Layout => Base}/mainwindow_constants.h | 8 ++++----
GUI/View/Fit/FitActivityPanel.cpp | 2 +-
GUI/View/Fit/FitSessionWidget.cpp | 2 +-
GUI/View/FitControl/FitEditor.cpp | 2 +-
GUI/View/FitMessage/JobMessagePanel.cpp | 2 +-
GUI/View/Job/JobEditor.cpp | 2 +-
GUI/View/Job/JobsPanel.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 2 +-
GUI/View/Main/MainWindow.cpp | 2 +-
GUI/View/Setup/DataToolbar.cpp | 2 +-
GUI/View/Tuning/JobRealTimeWidget.cpp | 2 +-
GUI/View/Tuning/ParameterTuningWidget.cpp | 2 +-
GUI/View/Views/SampleView.cpp | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
rename GUI/View/{Layout => Base}/mainwindow_constants.h (91%)
diff --git a/GUI/View/Layout/mainwindow_constants.h b/GUI/View/Base/mainwindow_constants.h
similarity index 91%
rename from GUI/View/Layout/mainwindow_constants.h
rename to GUI/View/Base/mainwindow_constants.h
index 6c5f2d8dfab..9ca02059c16 100644
--- a/GUI/View/Layout/mainwindow_constants.h
+++ b/GUI/View/Base/mainwindow_constants.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Layout/mainwindow_constants.h
+//! @file GUI/View/Base/mainwindow_constants.h
//! @brief Defines namespace GUI::Style.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H
-#define BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H
+#ifndef BORNAGAIN_GUI_VIEW_BASE_MAINWINDOW_CONSTANTS_H
+#define BORNAGAIN_GUI_VIEW_BASE_MAINWINDOW_CONSTANTS_H
#include <QString>
@@ -67,4 +67,4 @@ const int toolbar_icon_size = 32;
} // namespace GUI::Style
-#endif // BORNAGAIN_GUI_VIEW_LAYOUT_MAINWINDOW_CONSTANTS_H
+#endif // BORNAGAIN_GUI_VIEW_BASE_MAINWINDOW_CONSTANTS_H
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 3184b9c7a2f..045490dce74 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -15,11 +15,11 @@
#include "GUI/View/Fit/FitActivityPanel.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/View/Fit/FitSessionWidget.h"
#include "GUI/View/FitControl/FitEditor.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Tuning/JobRealTimeWidget.h"
#include "GUI/View/Tuning/ParameterTuningWidget.h"
#include <QSettings>
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index c8dc11a53a9..86c5bb5126a 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/Fit/FitSessionWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/FitControl/FitEditor.h"
#include "GUI/View/FitControl/MinimizerEditor.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/Tuning/FitParameterWidget.h"
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/View/FitControl/FitEditor.cpp b/GUI/View/FitControl/FitEditor.cpp
index 6b36d5dbb27..00bb268c197 100644
--- a/GUI/View/FitControl/FitEditor.cpp
+++ b/GUI/View/FitControl/FitEditor.cpp
@@ -20,8 +20,8 @@
#include "GUI/Model/Tune/FitSuiteItem.h"
#include "GUI/Support/Data/JobStatus.h"
#include "GUI/Support/Style/Style.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include <QHBoxLayout>
namespace {
diff --git a/GUI/View/FitMessage/JobMessagePanel.cpp b/GUI/View/FitMessage/JobMessagePanel.cpp
index 7db26e0c4e4..4cd3fdc967c 100644
--- a/GUI/View/FitMessage/JobMessagePanel.cpp
+++ b/GUI/View/FitMessage/JobMessagePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/FitMessage/JobMessagePanel.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include <QScrollBar>
#include <QSettings>
diff --git a/GUI/View/Job/JobEditor.cpp b/GUI/View/Job/JobEditor.cpp
index ab8acc01c68..89f6f97a65b 100644
--- a/GUI/View/Job/JobEditor.cpp
+++ b/GUI/View/Job/JobEditor.cpp
@@ -16,8 +16,8 @@
#include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Support/Data/JobStatus.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Job/JobparQModel.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include <QHeaderView>
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/View/Job/JobsPanel.cpp b/GUI/View/Job/JobsPanel.cpp
index 4f2e114dcee..084fa2e2d46 100644
--- a/GUI/View/Job/JobsPanel.cpp
+++ b/GUI/View/Job/JobsPanel.cpp
@@ -14,9 +14,9 @@
#include "GUI/View/Job/JobsPanel.h"
#include "Base/Util/Assert.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Job/JobEditor.h"
#include "GUI/View/Job/JobsListing.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 1fa055f988c..cd7112566c5 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Base/AppConfig.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Manager/ProjectManager.h"
#include "GUI/View/Views/InstrumentView.h"
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 2183f619859..80b8dfcb1c9 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Base/AppConfig.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Main/ActionManager.h"
#include "GUI/View/Main/CentralWidget.h"
#include "GUI/View/Manager/ProjectManager.h"
diff --git a/GUI/View/Setup/DataToolbar.cpp b/GUI/View/Setup/DataToolbar.cpp
index 81f368fa5ee..7941c0f55c6 100644
--- a/GUI/View/Setup/DataToolbar.cpp
+++ b/GUI/View/Setup/DataToolbar.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Setup/DataToolbar.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Setup/FrameActions.h"
#include <QLabel>
#include <QToolButton>
diff --git a/GUI/View/Tuning/JobRealTimeWidget.cpp b/GUI/View/Tuning/JobRealTimeWidget.cpp
index d49a4926773..261c64c22ed 100644
--- a/GUI/View/Tuning/JobRealTimeWidget.cpp
+++ b/GUI/View/Tuning/JobRealTimeWidget.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Support/Data/JobStatus.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Tuning/ParameterTuningStackPresenter.h"
#include "GUI/View/Tuning/ParameterTuningWidget.h"
#include <QSettings>
diff --git a/GUI/View/Tuning/ParameterTuningWidget.cpp b/GUI/View/Tuning/ParameterTuningWidget.cpp
index c5da194c705..b6613c2e540 100644
--- a/GUI/View/Tuning/ParameterTuningWidget.cpp
+++ b/GUI/View/Tuning/ParameterTuningWidget.cpp
@@ -21,8 +21,8 @@
#include "GUI/Model/Par/ParameterTreeItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Data/JobStatus.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
#include "GUI/View/ParEdit/ParameterTuningDelegate.h"
#include "GUI/View/Tuning/ParameterBackupWidget.h"
#include "GUI/View/Tuning/PartunerQModel.h"
diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/Views/SampleView.cpp
index 89311358e14..954a3e02e29 100644
--- a/GUI/View/Views/SampleView.cpp
+++ b/GUI/View/Views/SampleView.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SamplesSet.h"
-#include "GUI/View/Layout/mainwindow_constants.h"
+#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Manager/PyImportAssistant.h"
#include "GUI/View/Modelview/SetView.h"
#include "GUI/View/Realspace/RealspacePanel.h"
--
GitLab
From 0724e1b1ae66d7586fa80aeeaa701578849b4852 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:01 +0100
Subject: [PATCH 08/32] rename GUI/View/Tool/ActionFactory.cpp ->
GUI/View/Base/
---
GUI/View/{Tool => Base}/ActionFactory.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename GUI/View/{Tool => Base}/ActionFactory.cpp (97%)
diff --git a/GUI/View/Tool/ActionFactory.cpp b/GUI/View/Base/ActionFactory.cpp
similarity index 97%
rename from GUI/View/Tool/ActionFactory.cpp
rename to GUI/View/Base/ActionFactory.cpp
index b8e47eaa575..ef5ae2377ae 100644
--- a/GUI/View/Tool/ActionFactory.cpp
+++ b/GUI/View/Base/ActionFactory.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Tool/ActionFactory.cpp
+//! @file GUI/View/Base/ActionFactory.cpp
//! @brief Implements class ActionFactory.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From cb3097f80c31c3aeb362c7ccd46559dcc6631aa5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:02 +0100
Subject: [PATCH 09/32] rename GUI/View/Tool/ActionFactory.h -> GUI/View/Base/
---
GUI/View/Base/ActionFactory.cpp | 2 +-
GUI/View/{Tool => Base}/ActionFactory.h | 8 ++++----
GUI/View/Sample/CompoundForm.cpp | 2 +-
GUI/View/Sample/CoreAndShellForm.cpp | 2 +-
GUI/View/Sample/LayerForm.cpp | 2 +-
GUI/View/Sample/MesocrystalForm.cpp | 2 +-
GUI/View/Sample/ParticleForm.cpp | 2 +-
GUI/View/Sample/ParticleLayoutForm.cpp | 2 +-
GUI/View/Sample/SampleForm.cpp | 2 +-
GUI/View/Tuning/ParameterBackupWidget.cpp | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
rename GUI/View/{Tool => Base}/ActionFactory.h (89%)
diff --git a/GUI/View/Base/ActionFactory.cpp b/GUI/View/Base/ActionFactory.cpp
index ef5ae2377ae..49be3a51e94 100644
--- a/GUI/View/Base/ActionFactory.cpp
+++ b/GUI/View/Base/ActionFactory.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Tool/ActionFactory.h"
+#include "GUI/View/Base/ActionFactory.h"
QAction* ActionFactory::createRemoveAction(QObject* parent, const QString& what,
std::function<void()> slot)
diff --git a/GUI/View/Tool/ActionFactory.h b/GUI/View/Base/ActionFactory.h
similarity index 89%
rename from GUI/View/Tool/ActionFactory.h
rename to GUI/View/Base/ActionFactory.h
index 5980884af38..2041c186d92 100644
--- a/GUI/View/Tool/ActionFactory.h
+++ b/GUI/View/Base/ActionFactory.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Tool/ActionFactory.h
+//! @file GUI/View/Base/ActionFactory.h
//! @brief Defines class ActionFactory.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_ACTIONFACTORY_H
-#define BORNAGAIN_GUI_VIEW_TOOL_ACTIONFACTORY_H
+#ifndef BORNAGAIN_GUI_VIEW_BASE_ACTIONFACTORY_H
+#define BORNAGAIN_GUI_VIEW_BASE_ACTIONFACTORY_H
#include <QAction>
#include <QObject>
@@ -45,4 +45,4 @@ QAction* createShowInRealspaceAction(QObject* parent, const QString& what,
} // namespace ActionFactory
-#endif // BORNAGAIN_GUI_VIEW_TOOL_ACTIONFACTORY_H
+#endif // BORNAGAIN_GUI_VIEW_BASE_ACTIONFACTORY_H
diff --git a/GUI/View/Sample/CompoundForm.cpp b/GUI/View/Sample/CompoundForm.cpp
index 2d2a8f41ed9..e51bb2b7e33 100644
--- a/GUI/View/Sample/CompoundForm.cpp
+++ b/GUI/View/Sample/CompoundForm.cpp
@@ -15,9 +15,9 @@
#include "GUI/View/Sample/CompoundForm.h"
#include "Base/Util/Vec.h"
#include "GUI/Model/Sample/CompoundItem.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/LayerEditorUtil.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/View/Sample/CoreAndShellForm.cpp b/GUI/View/Sample/CoreAndShellForm.cpp
index 9d59714980d..407e6bc6adf 100644
--- a/GUI/View/Sample/CoreAndShellForm.cpp
+++ b/GUI/View/Sample/CoreAndShellForm.cpp
@@ -18,10 +18,10 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/FormfactorsCatalog.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/MaterialInplaceForm.h"
#include "GUI/View/Sample/SampleEditorController.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include <QAction>
namespace {
diff --git a/GUI/View/Sample/LayerForm.cpp b/GUI/View/Sample/LayerForm.cpp
index a1605c5ec12..e67a380eb4f 100644
--- a/GUI/View/Sample/LayerForm.cpp
+++ b/GUI/View/Sample/LayerForm.cpp
@@ -20,11 +20,11 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Style/PredefinedColors.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/MaterialInplaceForm.h"
#include "GUI/View/Sample/ParticleLayoutForm.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include "GUI/View/Widget/WidgetMoverButton.h"
#include <QLineEdit>
#include <QMenu>
diff --git a/GUI/View/Sample/MesocrystalForm.cpp b/GUI/View/Sample/MesocrystalForm.cpp
index 6bb8206a966..a3c93f177fa 100644
--- a/GUI/View/Sample/MesocrystalForm.cpp
+++ b/GUI/View/Sample/MesocrystalForm.cpp
@@ -17,8 +17,8 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/MesocrystalItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include <QAction>
MesocrystalForm::MesocrystalForm(QWidget* parent, MesocrystalItem* mesocrystalItem,
diff --git a/GUI/View/Sample/ParticleForm.cpp b/GUI/View/Sample/ParticleForm.cpp
index 7d217c26ebd..9ec5a7e7c9d 100644
--- a/GUI/View/Sample/ParticleForm.cpp
+++ b/GUI/View/Sample/ParticleForm.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/FormfactorsCatalog.h"
#include "GUI/Model/Sample/ParticleItem.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/MaterialInplaceForm.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include <QAction>
namespace {
diff --git a/GUI/View/Sample/ParticleLayoutForm.cpp b/GUI/View/Sample/ParticleLayoutForm.cpp
index 689d992f0fb..c1f9ea165b9 100644
--- a/GUI/View/Sample/ParticleLayoutForm.cpp
+++ b/GUI/View/Sample/ParticleLayoutForm.cpp
@@ -19,13 +19,13 @@
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Sample/HeinzFormLayout.h"
#include "GUI/View/Sample/InterferenceForm.h"
#include "GUI/View/Sample/LayerEditorUtil.h"
#include "GUI/View/Sample/LayerForm.h"
#include "GUI/View/Sample/SampleEditorController.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include <QAction>
#include <QPushButton>
diff --git a/GUI/View/Sample/SampleForm.cpp b/GUI/View/Sample/SampleForm.cpp
index 0b0972372aa..1ef822e959c 100644
--- a/GUI/View/Sample/SampleForm.cpp
+++ b/GUI/View/Sample/SampleForm.cpp
@@ -16,6 +16,7 @@
#include "Base/Util/Vec.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/SamplesSet.h"
+#include "GUI/View/Base/ActionFactory.h"
#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Base/LayoutUtil.h"
#include "GUI/View/Sample/CompoundForm.h"
@@ -26,7 +27,6 @@
#include "GUI/View/Sample/ParticleForm.h"
#include "GUI/View/Sample/ParticleLayoutForm.h"
#include "GUI/View/Sample/SampleEditorController.h"
-#include "GUI/View/Tool/ActionFactory.h"
#include "GUI/View/Widget/GroupBoxes.h"
#include <QBoxLayout>
#include <QLabel>
diff --git a/GUI/View/Tuning/ParameterBackupWidget.cpp b/GUI/View/Tuning/ParameterBackupWidget.cpp
index e0c3f8e704c..cd20c22dd39 100644
--- a/GUI/View/Tuning/ParameterBackupWidget.cpp
+++ b/GUI/View/Tuning/ParameterBackupWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Tuning/ParameterBackupWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Par/ParameterTreeItems.h"
-#include "GUI/View/Tool/ActionFactory.h"
+#include "GUI/View/Base/ActionFactory.h"
#include <QBoxLayout>
#include <QDateTime>
#include <QDialog>
--
GitLab
From 8ba791417d622984d746bc8f3cba08bb6c3bb0c5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:52 +0100
Subject: [PATCH 10/32] rename Base/Types/CloneableVector.h -> Base/Type
---
Base/Axis/Frame.h | 2 +-
Base/{Types => Type}/CloneableVector.h | 8 ++++----
Sample/Aggregate/ParticleLayout.h | 2 +-
Sim/Scan/BeamScan.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
rename Base/{Types => Type}/CloneableVector.h (91%)
diff --git a/Base/Axis/Frame.h b/Base/Axis/Frame.h
index faccd4292c7..a458b90cdc1 100644
--- a/Base/Axis/Frame.h
+++ b/Base/Axis/Frame.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_BASE_AXIS_FRAME_H
#define BORNAGAIN_BASE_AXIS_FRAME_H
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
#include <string>
using std::size_t;
diff --git a/Base/Types/CloneableVector.h b/Base/Type/CloneableVector.h
similarity index 91%
rename from Base/Types/CloneableVector.h
rename to Base/Type/CloneableVector.h
index a4373b75669..203d8e4b97e 100644
--- a/Base/Types/CloneableVector.h
+++ b/Base/Type/CloneableVector.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/CloneableVector.h
+//! @file Base/Type/CloneableVector.h
//! @brief Defines and implements templated class CloneableVector.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
-#define BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
+#ifndef BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
+#define BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
#include "Base/Types/OwningVector.h"
@@ -58,4 +58,4 @@ public:
CloneableVector& operator=(CloneableVector&& other) = default;
};
-#endif // BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
+#endif // BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
diff --git a/Sample/Aggregate/ParticleLayout.h b/Sample/Aggregate/ParticleLayout.h
index d8ab2a7a2b4..2f723e6a8d8 100644
--- a/Sample/Aggregate/ParticleLayout.h
+++ b/Sample/Aggregate/ParticleLayout.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
#define BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
#include "Sample/Scattering/ISampleNode.h"
#include <memory>
diff --git a/Sim/Scan/BeamScan.h b/Sim/Scan/BeamScan.h
index 2a5cc1b72f2..2d776aaaf4b 100644
--- a/Sim/Scan/BeamScan.h
+++ b/Sim/Scan/BeamScan.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_SIM_SCAN_BEAMSCAN_H
#include "Base/Const/Units.h"
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
#include "Base/Types/ICloneable.h"
#include "Device/Beam/Beam.h"
#include "Param/Node/INode.h"
--
GitLab
From a2195a0fd3aac6a968623eefc7117050507320eb Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:53 +0100
Subject: [PATCH 11/32] rename Base/Types/ICloneable.h -> Base/Type
---
Base/{Types => Type}/ICloneable.h | 8 ++++----
Device/Beam/Beam.h | 2 +-
Device/Beam/IFootprint.h | 2 +-
Device/Detector/IDetector.h | 2 +-
Device/Mask/IShape2D.h | 2 +-
Device/Resolution/IDetectorResolution.h | 2 +-
Device/Resolution/IResolutionFunction2D.h | 2 +-
Param/Distrib/Distributions.h | 2 +-
Resample/Particle/IReParticle.h | 2 +-
Sample/Aggregate/IInterference.h | 2 +-
Sample/Correlations/IPeakShape.h | 2 +-
Sample/Correlations/Profiles1D.h | 2 +-
Sample/Correlations/Profiles2D.h | 2 +-
Sample/Lattice/Lattice2D.h | 2 +-
Sample/Scattering/ISampleNode.h | 2 +-
Sample/Scattering/Rotations.h | 2 +-
Sim/Background/IBackground.h | 2 +-
Sim/Fitting/ObjectiveMetric.h | 2 +-
Sim/Residual/IChiSquaredModule.h | 2 +-
Sim/Scan/BeamScan.h | 2 +-
Wrap/Swig/libBornAgainBase.i | 4 ++--
21 files changed, 25 insertions(+), 25 deletions(-)
rename Base/{Types => Type}/ICloneable.h (86%)
diff --git a/Base/Types/ICloneable.h b/Base/Type/ICloneable.h
similarity index 86%
rename from Base/Types/ICloneable.h
rename to Base/Type/ICloneable.h
index 16decbcbac1..ccee5ab429d 100644
--- a/Base/Types/ICloneable.h
+++ b/Base/Type/ICloneable.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/ICloneable.h
+//! @file Base/Type/ICloneable.h
//! @brief Defines and implements the standard mix-in ICloneable.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_BASE_TYPES_ICLONEABLE_H
-#define BORNAGAIN_BASE_TYPES_ICLONEABLE_H
+#ifndef BORNAGAIN_BASE_TYPE_ICLONEABLE_H
+#define BORNAGAIN_BASE_TYPE_ICLONEABLE_H
//! Interface for polymorphic classes that should not be copied, except by explicit cloning.
//!
@@ -31,4 +31,4 @@ public:
virtual void transferToCPP() {} //!< Used for Python overriding of clone (see swig/tweaks.py)
};
-#endif // BORNAGAIN_BASE_TYPES_ICLONEABLE_H
+#endif // BORNAGAIN_BASE_TYPE_ICLONEABLE_H
diff --git a/Device/Beam/Beam.h b/Device/Beam/Beam.h
index cade97caaf9..9f4c72c372f 100644
--- a/Device/Beam/Beam.h
+++ b/Device/Beam/Beam.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_BEAM_BEAM_H
#define BORNAGAIN_DEVICE_BEAM_BEAM_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <heinz/Vectors3D.h>
diff --git a/Device/Beam/IFootprint.h b/Device/Beam/IFootprint.h
index 5d0c4f3e7fc..98e8076423e 100644
--- a/Device/Beam/IFootprint.h
+++ b/Device/Beam/IFootprint.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_BEAM_IFOOTPRINT_H
#define BORNAGAIN_DEVICE_BEAM_IFOOTPRINT_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
//! Abstract base for classes that calculate the beam footprint factor
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 55e385085c4..961d063656b 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_DETECTOR_IDETECTOR_H
#define BORNAGAIN_DEVICE_DETECTOR_IDETECTOR_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Device/Pol/PolFilter.h"
class Beam;
diff --git a/Device/Mask/IShape2D.h b/Device/Mask/IShape2D.h
index d4a7c25031a..4841903f776 100644
--- a/Device/Mask/IShape2D.h
+++ b/Device/Mask/IShape2D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_MASK_ISHAPE2D_H
#define BORNAGAIN_DEVICE_MASK_ISHAPE2D_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include <iostream>
class Bin1D;
diff --git a/Device/Resolution/IDetectorResolution.h b/Device/Resolution/IDetectorResolution.h
index 9cf69bd8ef8..71315646e7b 100644
--- a/Device/Resolution/IDetectorResolution.h
+++ b/Device/Resolution/IDetectorResolution.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_RESOLUTION_IDETECTORRESOLUTION_H
#define BORNAGAIN_DEVICE_RESOLUTION_IDETECTORRESOLUTION_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
class Datafield;
diff --git a/Device/Resolution/IResolutionFunction2D.h b/Device/Resolution/IResolutionFunction2D.h
index 6d00c0a4665..fa18f1ffa48 100644
--- a/Device/Resolution/IResolutionFunction2D.h
+++ b/Device/Resolution/IResolutionFunction2D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_DEVICE_RESOLUTION_IRESOLUTIONFUNCTION2D_H
#define BORNAGAIN_DEVICE_RESOLUTION_IRESOLUTIONFUNCTION2D_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
//! Interface providing two-dimensional resolution function.
diff --git a/Param/Distrib/Distributions.h b/Param/Distrib/Distributions.h
index 228e4629230..39adc546abe 100644
--- a/Param/Distrib/Distributions.h
+++ b/Param/Distrib/Distributions.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONS_H
#define BORNAGAIN_PARAM_DISTRIB_DISTRIBUTIONS_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <vector>
diff --git a/Resample/Particle/IReParticle.h b/Resample/Particle/IReParticle.h
index 76b7c33b983..77fb85ea1a0 100644
--- a/Resample/Particle/IReParticle.h
+++ b/Resample/Particle/IReParticle.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_PARTICLE_IREPARTICLE_H
#define BORNAGAIN_RESAMPLE_PARTICLE_IREPARTICLE_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include <heinz/Complex.h>
#include <heinz/Vectors3D.h>
#include <memory>
diff --git a/Sample/Aggregate/IInterference.h b/Sample/Aggregate/IInterference.h
index 2364b2e7c06..4b2ea0c4c1f 100644
--- a/Sample/Aggregate/IInterference.h
+++ b/Sample/Aggregate/IInterference.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCE_H
#define BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCE_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <heinz/Vectors3D.h>
diff --git a/Sample/Correlations/IPeakShape.h b/Sample/Correlations/IPeakShape.h
index 410b460465f..77c4626e366 100644
--- a/Sample/Correlations/IPeakShape.h
+++ b/Sample/Correlations/IPeakShape.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
#define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <heinz/Vectors3D.h>
diff --git a/Sample/Correlations/Profiles1D.h b/Sample/Correlations/Profiles1D.h
index 7eaebd69a96..8bac253daaa 100644
--- a/Sample/Correlations/Profiles1D.h
+++ b/Sample/Correlations/Profiles1D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES1D_H
#define BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES1D_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#ifndef SWIG
diff --git a/Sample/Correlations/Profiles2D.h b/Sample/Correlations/Profiles2D.h
index 8b7219b3778..89431d5ad31 100644
--- a/Sample/Correlations/Profiles2D.h
+++ b/Sample/Correlations/Profiles2D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES2D_H
#define BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES2D_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <numbers>
diff --git a/Sample/Lattice/Lattice2D.h b/Sample/Lattice/Lattice2D.h
index 7edbd33eb21..968dc018a40 100644
--- a/Sample/Lattice/Lattice2D.h
+++ b/Sample/Lattice/Lattice2D.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICE2D_H
#define BORNAGAIN_SAMPLE_LATTICE_LATTICE2D_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
//! A two-dimensional Bravais lattice.
diff --git a/Sample/Scattering/ISampleNode.h b/Sample/Scattering/ISampleNode.h
index bd61c3f3dc7..5baff143109 100644
--- a/Sample/Scattering/ISampleNode.h
+++ b/Sample/Scattering/ISampleNode.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_SCATTERING_ISAMPLENODE_H
#define BORNAGAIN_SAMPLE_SCATTERING_ISAMPLENODE_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
#include <vector>
diff --git a/Sample/Scattering/Rotations.h b/Sample/Scattering/Rotations.h
index d9aef670388..fe4925d4e97 100644
--- a/Sample/Scattering/Rotations.h
+++ b/Sample/Scattering/Rotations.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
#define BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Base/Vector/RotMatrix.h"
#include "Param/Node/INode.h"
#include <heinz/Vectors3D.h>
diff --git a/Sim/Background/IBackground.h b/Sim/Background/IBackground.h
index 90fb87450a1..74ed85adcdf 100644
--- a/Sim/Background/IBackground.h
+++ b/Sim/Background/IBackground.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SIM_BACKGROUND_IBACKGROUND_H
#define BORNAGAIN_SIM_BACKGROUND_IBACKGROUND_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
//! Abstract base class for background noise, to be added to simulated scattering.
diff --git a/Sim/Fitting/ObjectiveMetric.h b/Sim/Fitting/ObjectiveMetric.h
index 09bacd01347..93990d2036b 100644
--- a/Sim/Fitting/ObjectiveMetric.h
+++ b/Sim/Fitting/ObjectiveMetric.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_SIM_FITTING_OBJECTIVEMETRIC_H
#define BORNAGAIN_SIM_FITTING_OBJECTIVEMETRIC_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include <functional>
#include <memory>
#include <vector>
diff --git a/Sim/Residual/IChiSquaredModule.h b/Sim/Residual/IChiSquaredModule.h
index b9cc995c15c..c01c1327c98 100644
--- a/Sim/Residual/IChiSquaredModule.h
+++ b/Sim/Residual/IChiSquaredModule.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SIM_RESIDUAL_ICHISQUAREDMODULE_H
#define BORNAGAIN_SIM_RESIDUAL_ICHISQUAREDMODULE_H
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include <memory>
class IIntensityFunction;
diff --git a/Sim/Scan/BeamScan.h b/Sim/Scan/BeamScan.h
index 2d776aaaf4b..ba6f88d53b5 100644
--- a/Sim/Scan/BeamScan.h
+++ b/Sim/Scan/BeamScan.h
@@ -17,7 +17,7 @@
#include "Base/Const/Units.h"
#include "Base/Type/CloneableVector.h"
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Device/Beam/Beam.h"
#include "Param/Node/INode.h"
#include <cstddef>
diff --git a/Wrap/Swig/libBornAgainBase.i b/Wrap/Swig/libBornAgainBase.i
index 513389162d4..695799257d0 100644
--- a/Wrap/Swig/libBornAgainBase.i
+++ b/Wrap/Swig/libBornAgainBase.i
@@ -23,13 +23,13 @@
#include "Base/Axis/MakeScale.h"
#include "Base/Const/Units.h"
#include "Base/Math/Numeric.h"
-#include "Base/Types/ICloneable.h"
+#include "Base/Type/ICloneable.h"
#include "Base/Types/Span.h"
#include "Base/Vector/RotMatrix.h"
%}
%include "heinz/Complex.h"
-%include "Base/Types/ICloneable.h"
+%include "Base/Type/ICloneable.h"
%include "Base/Types/Span.h"
%include "Base/Const/Units.h"
--
GitLab
From 6e5aa8f62718553928fd271e784bb3345a55ccfd Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:54 +0100
Subject: [PATCH 12/32] rename Base/Types/OwningVector.h -> Base/Type
---
Base/Type/CloneableVector.h | 2 +-
Base/{Types => Type}/OwningVector.h | 8 ++++----
Base/Types/VectorWC.h | 2 +-
Device/Mask/MaskStack.h | 2 +-
GUI/Model/Mask/MaskItems.h | 2 +-
GUI/Model/Mask/PointItem.h | 2 +-
GUI/Model/Par/ParameterTreeItems.h | 2 +-
GUI/Model/Sample/CompoundItem.h | 2 +-
GUI/Model/Sample/LayerItem.h | 2 +-
GUI/Model/Sample/ParticleLayoutItem.h | 2 +-
GUI/Model/Sample/SampleItem.h | 2 +-
GUI/Model/Tune/FitParameterItem.h | 2 +-
GUI/Model/Type/SetWithModel.h | 2 +-
Img3D/Build/Particle3DContainer.h | 2 +-
Img3D/Model/Model.h | 2 +-
Resample/Coherence/CoheringSubparticles.h | 2 +-
Resample/Flux/IFlux.h | 2 +-
Resample/Interparticle/IInterparticleStrategy.h | 2 +-
Resample/Particle/ReCompound.h | 2 +-
Resample/Processed/ReLayout.h | 2 +-
Resample/Processed/ReSample.h | 2 +-
Resample/Processed/Slicer.h | 2 +-
Sample/Multilayer/Layer.h | 2 +-
Sample/Multilayer/MultiLayer.h | 2 +-
Sample/Particle/IParticle.h | 2 +-
Sim/Simulation/OffspecSimulation.h | 2 +-
Sim/Simulation/ScatteringSimulation.h | 2 +-
27 files changed, 30 insertions(+), 30 deletions(-)
rename Base/{Types => Type}/OwningVector.h (96%)
diff --git a/Base/Type/CloneableVector.h b/Base/Type/CloneableVector.h
index 203d8e4b97e..07716a65a37 100644
--- a/Base/Type/CloneableVector.h
+++ b/Base/Type/CloneableVector.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
#define BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
//! A vector of unique pointers to objects that are cloneable.
//!
diff --git a/Base/Types/OwningVector.h b/Base/Type/OwningVector.h
similarity index 96%
rename from Base/Types/OwningVector.h
rename to Base/Type/OwningVector.h
index f70d8870fd1..8b056c73140 100644
--- a/Base/Types/OwningVector.h
+++ b/Base/Type/OwningVector.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/OwningVector.h
+//! @file Base/Type/OwningVector.h
//! @brief Defines and implements templated class OwningVector.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
-#define BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
+#ifndef BORNAGAIN_BASE_TYPE_OWNINGVECTOR_H
+#define BORNAGAIN_BASE_TYPE_OWNINGVECTOR_H
#include "Base/Util/Assert.h"
#include <algorithm>
@@ -151,4 +151,4 @@ protected:
std::vector<T*> m_v;
};
-#endif // BORNAGAIN_BASE_TYPES_OWNINGVECTOR_H
+#endif // BORNAGAIN_BASE_TYPE_OWNINGVECTOR_H
diff --git a/Base/Types/VectorWC.h b/Base/Types/VectorWC.h
index 7ed52a9bb78..3828e552040 100644
--- a/Base/Types/VectorWC.h
+++ b/Base/Types/VectorWC.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_BASE_TYPES_VECTORWC_H
#define BORNAGAIN_BASE_TYPES_VECTORWC_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Base/Util/Assert.h"
//! An OwningVector with a current index.
diff --git a/Device/Mask/MaskStack.h b/Device/Mask/MaskStack.h
index a24f39ff924..2286fed42f9 100644
--- a/Device/Mask/MaskStack.h
+++ b/Device/Mask/MaskStack.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_DEVICE_MASK_MASKSTACK_H
#define BORNAGAIN_DEVICE_MASK_MASKSTACK_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include <memory>
class Frame;
diff --git a/GUI/Model/Mask/MaskItems.h b/GUI/Model/Mask/MaskItems.h
index b3f1264f619..a3419ba4053 100644
--- a/GUI/Model/Mask/MaskItems.h
+++ b/GUI/Model/Mask/MaskItems.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
#define BORNAGAIN_GUI_MODEL_MASK_MASKITEMS_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Mask/OverlayItem.h"
diff --git a/GUI/Model/Mask/PointItem.h b/GUI/Model/Mask/PointItem.h
index 4ce8c7ac356..29a5fdd4cad 100644
--- a/GUI/Model/Mask/PointItem.h
+++ b/GUI/Model/Mask/PointItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_MASK_POINTITEM_H
#define BORNAGAIN_GUI_MODEL_MASK_POINTITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/PolyItem.h"
#include "GUI/Model/Mask/OverlayItem.h"
diff --git a/GUI/Model/Par/ParameterTreeItems.h b/GUI/Model/Par/ParameterTreeItems.h
index e4de9ddc9b7..1313f0fe01b 100644
--- a/GUI/Model/Par/ParameterTreeItems.h
+++ b/GUI/Model/Par/ParameterTreeItems.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_PAR_PARAMETERTREEITEMS_H
#define BORNAGAIN_GUI_MODEL_PAR_PARAMETERTREEITEMS_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Par/ParameterBackup.h"
#include <QColor>
diff --git a/GUI/Model/Sample/CompoundItem.h b/GUI/Model/Sample/CompoundItem.h
index 43b7c47c0e3..1d3ef63e09a 100644
--- a/GUI/Model/Sample/CompoundItem.h
+++ b/GUI/Model/Sample/CompoundItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_COMPOUNDITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Sample/ItemWithParticles.h"
#include "Sample/Particle/Compound.h"
#include <memory>
diff --git a/GUI/Model/Sample/LayerItem.h b/GUI/Model/Sample/LayerItem.h
index ac1e294eeae..1f144499146 100644
--- a/GUI/Model/Sample/LayerItem.h
+++ b/GUI/Model/Sample/LayerItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/PolyItem.h"
#include "GUI/Model/Sample/Item3D.h"
#include "GUI/Model/Sample/ItemWithMaterial.h"
diff --git a/GUI/Model/Sample/ParticleLayoutItem.h b/GUI/Model/Sample/ParticleLayoutItem.h
index 29e15738f84..8e53888eb9b 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.h
+++ b/GUI/Model/Sample/ParticleLayoutItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_PARTICLELAYOUTITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/Descriptor/PolyItem.h"
#include "GUI/Model/Sample/InterferenceItemCatalog.h"
diff --git a/GUI/Model/Sample/SampleItem.h b/GUI/Model/Sample/SampleItem.h
index 4ad7e39cae0..eb99f9d96b5 100644
--- a/GUI/Model/Sample/SampleItem.h
+++ b/GUI/Model/Sample/SampleItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEITEM_H
#define BORNAGAIN_GUI_MODEL_SAMPLE_SAMPLEITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/Model/Material/MaterialsSet.h"
#include "GUI/Model/Sample/Item3D.h"
diff --git a/GUI/Model/Tune/FitParameterItem.h b/GUI/Model/Tune/FitParameterItem.h
index 13bf79eb732..ee0a91822f3 100644
--- a/GUI/Model/Tune/FitParameterItem.h
+++ b/GUI/Model/Tune/FitParameterItem.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_TUNE_FITPARAMETERITEM_H
#define BORNAGAIN_GUI_MODEL_TUNE_FITPARAMETERITEM_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Fit/Param/AttLimits.h"
#include "GUI/Support/Data/ComboProperty.h"
diff --git a/GUI/Model/Type/SetWithModel.h b/GUI/Model/Type/SetWithModel.h
index cc71463d2f3..2e93979d981 100644
--- a/GUI/Model/Type/SetWithModel.h
+++ b/GUI/Model/Type/SetWithModel.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_GUI_MODEL_TYPE_SETWITHMODEL_H
#define BORNAGAIN_GUI_MODEL_TYPE_SETWITHMODEL_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Type/ModelForSet.h"
#include <QObject>
diff --git a/Img3D/Build/Particle3DContainer.h b/Img3D/Build/Particle3DContainer.h
index 42e6f675ab7..f71cb2f1a06 100644
--- a/Img3D/Build/Particle3DContainer.h
+++ b/Img3D/Build/Particle3DContainer.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_IMG3D_BUILD_PARTICLE3DCONTAINER_H
#define BORNAGAIN_IMG3D_BUILD_PARTICLE3DCONTAINER_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include <memory>
namespace Img3D {
diff --git a/Img3D/Model/Model.h b/Img3D/Model/Model.h
index 70d3dbc4a17..06c35f2d2be 100644
--- a/Img3D/Model/Model.h
+++ b/Img3D/Model/Model.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_IMG3D_MODEL_MODEL_H
#define BORNAGAIN_IMG3D_MODEL_MODEL_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Img3D/Model/Particles.h"
#include "Img3D/Type/CameraParams.h"
#include <QObject>
diff --git a/Resample/Coherence/CoheringSubparticles.h b/Resample/Coherence/CoheringSubparticles.h
index 4dc91786d3c..34723f275ed 100644
--- a/Resample/Coherence/CoheringSubparticles.h
+++ b/Resample/Coherence/CoheringSubparticles.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_COHERENCE_COHERINGSUBPARTICLES_H
#define BORNAGAIN_RESAMPLE_COHERENCE_COHERINGSUBPARTICLES_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include <heinz/Complex.h>
class DiffuseElement;
diff --git a/Resample/Flux/IFlux.h b/Resample/Flux/IFlux.h
index bf28d2c2062..120398bb15a 100644
--- a/Resample/Flux/IFlux.h
+++ b/Resample/Flux/IFlux.h
@@ -19,7 +19,7 @@
#define BORNAGAIN_RESAMPLE_FLUX_IFLUX_H
#include "Base/Spin/Spinor.h"
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
//! Interface to access reflection/transmission coefficients.
//! Realized by ScalarFlux and MatrixFlux.
diff --git a/Resample/Interparticle/IInterparticleStrategy.h b/Resample/Interparticle/IInterparticleStrategy.h
index 5f66591d46d..4e8f2ae081e 100644
--- a/Resample/Interparticle/IInterparticleStrategy.h
+++ b/Resample/Interparticle/IInterparticleStrategy.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_INTERPARTICLE_IINTERPARTICLESTRATEGY_H
#define BORNAGAIN_RESAMPLE_INTERPARTICLE_IINTERPARTICLESTRATEGY_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Resample/Options/SimulationOptions.h"
#include <heinz/Complex.h>
#include <memory>
diff --git a/Resample/Particle/ReCompound.h b/Resample/Particle/ReCompound.h
index 7c9914e3255..7bc843b2554 100644
--- a/Resample/Particle/ReCompound.h
+++ b/Resample/Particle/ReCompound.h
@@ -19,7 +19,7 @@
#define BORNAGAIN_RESAMPLE_PARTICLE_RECOMPOUND_H
#include "Base/Spin/SpinMatrix.h"
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Resample/Particle/IReParticle.h"
#include <vector>
diff --git a/Resample/Processed/ReLayout.h b/Resample/Processed/ReLayout.h
index 6851d13deb6..8b4329d84ef 100644
--- a/Resample/Processed/ReLayout.h
+++ b/Resample/Processed/ReLayout.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_PROCESSED_RELAYOUT_H
#define BORNAGAIN_RESAMPLE_PROCESSED_RELAYOUT_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include <memory>
class CoheringSubparticles;
diff --git a/Resample/Processed/ReSample.h b/Resample/Processed/ReSample.h
index f0be50801f2..b5a41b18d35 100644
--- a/Resample/Processed/ReSample.h
+++ b/Resample/Processed/ReSample.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_PROCESSED_RESAMPLE_H
#define BORNAGAIN_RESAMPLE_PROCESSED_RESAMPLE_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Resample/Slice/SliceStack.h"
#include <heinz/Vectors3D.h>
diff --git a/Resample/Processed/Slicer.h b/Resample/Processed/Slicer.h
index a64286feeb7..4b61d24b8b1 100644
--- a/Resample/Processed/Slicer.h
+++ b/Resample/Processed/Slicer.h
@@ -19,7 +19,7 @@
#ifndef BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
#define BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Resample/Options/SimulationOptions.h"
class IParticle;
diff --git a/Sample/Multilayer/Layer.h b/Sample/Multilayer/Layer.h
index e036b6a9d7f..37d82ee89b8 100644
--- a/Sample/Multilayer/Layer.h
+++ b/Sample/Multilayer/Layer.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
#define BORNAGAIN_SAMPLE_MULTILAYER_LAYER_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Sample/Material/Material.h"
#include "Sample/Scattering/ISampleNode.h"
diff --git a/Sample/Multilayer/MultiLayer.h b/Sample/Multilayer/MultiLayer.h
index 3f4f7a35a8b..dc45693590c 100644
--- a/Sample/Multilayer/MultiLayer.h
+++ b/Sample/Multilayer/MultiLayer.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Sample/Multilayer/RoughnessModels.h"
#include "Sample/Scattering/ISampleNode.h"
#include <functional>
diff --git a/Sample/Particle/IParticle.h b/Sample/Particle/IParticle.h
index 43a15179221..e1692186d0a 100644
--- a/Sample/Particle/IParticle.h
+++ b/Sample/Particle/IParticle.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
#define BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Sample/Scattering/ISampleNode.h"
#include <heinz/Vectors3D.h>
#include <memory>
diff --git a/Sim/Simulation/OffspecSimulation.h b/Sim/Simulation/OffspecSimulation.h
index 9e0319139ec..fb87d3ef57b 100644
--- a/Sim/Simulation/OffspecSimulation.h
+++ b/Sim/Simulation/OffspecSimulation.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SIM_SIMULATION_OFFSPECSIMULATION_H
#define BORNAGAIN_SIM_SIMULATION_OFFSPECSIMULATION_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Sim/Simulation/ISimulation.h"
class Datafield;
diff --git a/Sim/Simulation/ScatteringSimulation.h b/Sim/Simulation/ScatteringSimulation.h
index f0d2c760b63..e8dd0ffc942 100644
--- a/Sim/Simulation/ScatteringSimulation.h
+++ b/Sim/Simulation/ScatteringSimulation.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SIM_SIMULATION_SCATTERINGSIMULATION_H
#define BORNAGAIN_SIM_SIMULATION_SCATTERINGSIMULATION_H
-#include "Base/Types/OwningVector.h"
+#include "Base/Type/OwningVector.h"
#include "Sim/Simulation/ISimulation.h"
class Beam;
--
GitLab
From c5e425de2d4a60c76d4363c411b7e75d8f61b7e5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:54 +0100
Subject: [PATCH 13/32] rename Base/Types/Span.cpp -> Base/Type
---
Base/{Types => Type}/Span.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Base/{Types => Type}/Span.cpp (96%)
diff --git a/Base/Types/Span.cpp b/Base/Type/Span.cpp
similarity index 96%
rename from Base/Types/Span.cpp
rename to Base/Type/Span.cpp
index 4cff7bc0a5c..d0b6917c8d3 100644
--- a/Base/Types/Span.cpp
+++ b/Base/Type/Span.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/Span.cpp
+//! @file Base/Type/Span.cpp
//! @brief Defines class Span.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 366a3c722c6dc529d8c28b02e80b4b440a208a6d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:55 +0100
Subject: [PATCH 14/32] rename Base/Types/Span.h -> Base/Type
---
Base/Type/Span.cpp | 2 +-
Base/{Types => Type}/Span.h | 8 ++++----
Resample/Particle/ReCompound.cpp | 2 +-
Resample/Particle/ReMesocrystal.cpp | 2 +-
Resample/Particle/ReParticle.cpp | 2 +-
Resample/Processed/ReSample.cpp | 2 +-
Resample/Processed/Slicer.cpp | 2 +-
Resample/Slice/ZLimits.h | 2 +-
Sample/HardParticle/IFormFactorPolyhedron.cpp | 2 +-
Sample/HardParticle/Sphere.cpp | 2 +-
Sample/Particle/Compound.cpp | 2 +-
Sample/Particle/CoreAndShell.cpp | 2 +-
Sample/Particle/IFormFactor.cpp | 2 +-
Sample/Particle/Mesocrystal.cpp | 2 +-
Sample/Particle/Particle.cpp | 2 +-
Sample/Particle/PolyhedralUtil.cpp | 2 +-
Tests/Unit/Sample/FormFactorBasicTest.cpp | 2 +-
Wrap/Swig/libBornAgainBase.i | 4 ++--
Wrap/Swig/libBornAgainSample.i | 2 +-
19 files changed, 23 insertions(+), 23 deletions(-)
rename Base/{Types => Type}/Span.h (90%)
diff --git a/Base/Type/Span.cpp b/Base/Type/Span.cpp
index d0b6917c8d3..908a1b9a2eb 100644
--- a/Base/Type/Span.cpp
+++ b/Base/Type/Span.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
Span::Span(double low, double hig)
diff --git a/Base/Types/Span.h b/Base/Type/Span.h
similarity index 90%
rename from Base/Types/Span.h
rename to Base/Type/Span.h
index 922d891a13e..4cc1461812c 100644
--- a/Base/Types/Span.h
+++ b/Base/Type/Span.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/Span.h
+//! @file Base/Type/Span.h
//! @brief Defines class Span.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_BASE_TYPES_SPAN_H
-#define BORNAGAIN_BASE_TYPES_SPAN_H
+#ifndef BORNAGAIN_BASE_TYPE_SPAN_H
+#define BORNAGAIN_BASE_TYPE_SPAN_H
#include <utility>
@@ -47,4 +47,4 @@ private:
double m_hig;
};
-#endif // BORNAGAIN_BASE_TYPES_SPAN_H
+#endif // BORNAGAIN_BASE_TYPE_SPAN_H
diff --git a/Resample/Particle/ReCompound.cpp b/Resample/Particle/ReCompound.cpp
index aadf57c1449..c4c3ab26695 100644
--- a/Resample/Particle/ReCompound.cpp
+++ b/Resample/Particle/ReCompound.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Resample/Particle/ReCompound.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/WavevectorInfo.h" // debug
diff --git a/Resample/Particle/ReMesocrystal.cpp b/Resample/Particle/ReMesocrystal.cpp
index 9de1156f57e..9f1d67b5466 100644
--- a/Resample/Particle/ReMesocrystal.cpp
+++ b/Resample/Particle/ReMesocrystal.cpp
@@ -15,7 +15,7 @@
#include "Resample/Particle/ReMesocrystal.h"
#include "Base/Math/Numeric.h"
#include "Base/Spin/SpinMatrix.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Vector/WavevectorInfo.h"
#include "Resample/Particle/ReParticle.h"
#include <numbers>
diff --git a/Resample/Particle/ReParticle.cpp b/Resample/Particle/ReParticle.cpp
index d765c170900..960b7ad5ecc 100644
--- a/Resample/Particle/ReParticle.cpp
+++ b/Resample/Particle/ReParticle.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Resample/Particle/ReParticle.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/WavevectorInfo.h" // debug
#include "Sample/Material/Material.h"
diff --git a/Resample/Processed/ReSample.cpp b/Resample/Processed/ReSample.cpp
index a6be39ca434..8060bfd49f6 100644
--- a/Resample/Processed/ReSample.cpp
+++ b/Resample/Processed/ReSample.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Resample/Processed/ReSample.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Resample/Coherence/CoheringSubparticles.h"
#include "Resample/Flux/IFlux.h"
diff --git a/Resample/Processed/Slicer.cpp b/Resample/Processed/Slicer.cpp
index f7c37bdb838..326cda479eb 100644
--- a/Resample/Processed/Slicer.cpp
+++ b/Resample/Processed/Slicer.cpp
@@ -14,7 +14,7 @@
#include "Resample/Processed/Slicer.h"
#include "Base/Math/Functions.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/RotMatrix.h"
#include "Resample/Particle/ReCompound.h"
diff --git a/Resample/Slice/ZLimits.h b/Resample/Slice/ZLimits.h
index 19c23a79f96..458fb928996 100644
--- a/Resample/Slice/ZLimits.h
+++ b/Resample/Slice/ZLimits.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_SLICE_ZLIMITS_H
#define BORNAGAIN_RESAMPLE_SLICE_ZLIMITS_H
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include <cmath>
#include <iostream>
#include <limits>
diff --git a/Sample/HardParticle/IFormFactorPolyhedron.cpp b/Sample/HardParticle/IFormFactorPolyhedron.cpp
index e2641fe7ff4..56784b1e1b4 100644
--- a/Sample/HardParticle/IFormFactorPolyhedron.cpp
+++ b/Sample/HardParticle/IFormFactorPolyhedron.cpp
@@ -17,7 +17,7 @@
//! "Form factor (Fourier shape transform) of polygon and polyhedron."
#include "Sample/HardParticle/IFormFactorPolyhedron.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Sample/Particle/PolyhedralUtil.h"
#include <ff/Polyhedron.h>
diff --git a/Sample/HardParticle/Sphere.cpp b/Sample/HardParticle/Sphere.cpp
index b57fa14b7ed..4d4ac98d6bb 100644
--- a/Sample/HardParticle/Sphere.cpp
+++ b/Sample/HardParticle/Sphere.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/HardParticle/Sphere.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Sample/HardParticle/TruncatedSphere.h"
#include "Sample/LibFF/SomeFormFactors.h"
diff --git a/Sample/Particle/Compound.cpp b/Sample/Particle/Compound.cpp
index bb7465ce9e4..aeeee831247 100644
--- a/Sample/Particle/Compound.cpp
+++ b/Sample/Particle/Compound.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/Compound.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/Sample/Particle/CoreAndShell.cpp b/Sample/Particle/CoreAndShell.cpp
index 120733f8568..0f479e4853a 100644
--- a/Sample/Particle/CoreAndShell.cpp
+++ b/Sample/Particle/CoreAndShell.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/CoreAndShell.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/Sample/Particle/IFormFactor.cpp b/Sample/Particle/IFormFactor.cpp
index 158a6d9426e..c66526bebef 100644
--- a/Sample/Particle/IFormFactor.cpp
+++ b/Sample/Particle/IFormFactor.cpp
@@ -14,7 +14,7 @@
#include "Sample/Particle/IFormFactor.h"
#include "Base/Py/PyFmt.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Util/StringUtil.h"
#include "Base/Vector/WavevectorInfo.h"
diff --git a/Sample/Particle/Mesocrystal.cpp b/Sample/Particle/Mesocrystal.cpp
index 01e0dae4a21..86d6d5eb5cb 100644
--- a/Sample/Particle/Mesocrystal.cpp
+++ b/Sample/Particle/Mesocrystal.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/Mesocrystal.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Sample/Lattice/Lattice3D.h"
#include "Sample/Particle/Crystal.h"
diff --git a/Sample/Particle/Particle.cpp b/Sample/Particle/Particle.cpp
index 6d9b77bc3e5..d2a87172811 100644
--- a/Sample/Particle/Particle.cpp
+++ b/Sample/Particle/Particle.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/Particle.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/RotMatrix.h"
#include "Sample/Particle/IFormFactor.h"
diff --git a/Sample/Particle/PolyhedralUtil.cpp b/Sample/Particle/PolyhedralUtil.cpp
index ed0836ce722..b4fdf8e0302 100644
--- a/Sample/Particle/PolyhedralUtil.cpp
+++ b/Sample/Particle/PolyhedralUtil.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Particle/PolyhedralUtil.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/RotMatrix.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/Tests/Unit/Sample/FormFactorBasicTest.cpp b/Tests/Unit/Sample/FormFactorBasicTest.cpp
index fe051a4a7a0..1b1886bf36c 100644
--- a/Tests/Unit/Sample/FormFactorBasicTest.cpp
+++ b/Tests/Unit/Sample/FormFactorBasicTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Sample/HardParticle/HardParticles.h"
#include "Sample/Scattering/Rotations.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Wrap/Swig/libBornAgainBase.i b/Wrap/Swig/libBornAgainBase.i
index 695799257d0..6ebbebd519f 100644
--- a/Wrap/Swig/libBornAgainBase.i
+++ b/Wrap/Swig/libBornAgainBase.i
@@ -24,13 +24,13 @@
#include "Base/Const/Units.h"
#include "Base/Math/Numeric.h"
#include "Base/Type/ICloneable.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Vector/RotMatrix.h"
%}
%include "heinz/Complex.h"
%include "Base/Type/ICloneable.h"
-%include "Base/Types/Span.h"
+%include "Base/Type/Span.h"
%include "Base/Const/Units.h"
%include "Base/Math/Numeric.h"
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index 504ec37bf6c..a44e9ee0deb 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -26,7 +26,7 @@
%{
#include "Base/Axis/Frame.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Vector/RotMatrix.h"
#include "Param/Distrib/ParameterDistribution.h"
#include "Sample/Aggregate/Interference1DLattice.h"
--
GitLab
From dc9f23b66a77d484e8f697a6bd7a87db295d6b06 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:28:55 +0100
Subject: [PATCH 15/32] rename Base/Types/VectorWC.h -> Base/Type
---
Base/{Types => Type}/VectorWC.h | 8 ++++----
GUI/Model/Job/JobsSet.h | 2 +-
GUI/Model/Material/MaterialsSet.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename Base/{Types => Type}/VectorWC.h (93%)
diff --git a/Base/Types/VectorWC.h b/Base/Type/VectorWC.h
similarity index 93%
rename from Base/Types/VectorWC.h
rename to Base/Type/VectorWC.h
index 3828e552040..acb1b7bd2be 100644
--- a/Base/Types/VectorWC.h
+++ b/Base/Type/VectorWC.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Types/VectorWC.h
+//! @file Base/Type/VectorWC.h
//! @brief Defines and implements templated class VectorWC.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_TYPES_VECTORWC_H
-#define BORNAGAIN_BASE_TYPES_VECTORWC_H
+#ifndef BORNAGAIN_BASE_TYPE_VECTORWC_H
+#define BORNAGAIN_BASE_TYPE_VECTORWC_H
#include "Base/Type/OwningVector.h"
#include "Base/Util/Assert.h"
@@ -95,4 +95,4 @@ private:
size_t m_current_index = -1;
};
-#endif // BORNAGAIN_BASE_TYPES_VECTORWC_H
+#endif // BORNAGAIN_BASE_TYPE_VECTORWC_H
diff --git a/GUI/Model/Job/JobsSet.h b/GUI/Model/Job/JobsSet.h
index f69e1b22586..7234cb15abb 100644
--- a/GUI/Model/Job/JobsSet.h
+++ b/GUI/Model/Job/JobsSet.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBSSET_H
#define BORNAGAIN_GUI_MODEL_JOB_JOBSSET_H
-#include "Base/Types/VectorWC.h"
+#include "Base/Type/VectorWC.h"
#include "GUI/Model/Files/DatafilesCleaner.h"
#include "GUI/Model/Job/JobItem.h"
#include <QObject>
diff --git a/GUI/Model/Material/MaterialsSet.h b/GUI/Model/Material/MaterialsSet.h
index 66e9adc6e2b..c9abcc606ff 100644
--- a/GUI/Model/Material/MaterialsSet.h
+++ b/GUI/Model/Material/MaterialsSet.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALSSET_H
#define BORNAGAIN_GUI_MODEL_MATERIAL_MATERIALSSET_H
-#include "Base/Types/VectorWC.h"
+#include "Base/Type/VectorWC.h"
#include <QMap>
#include <QObject>
#include <QVector>
--
GitLab
From 770381a97d04086fb341b3a549961e7586ad4d6f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:08 +0100
Subject: [PATCH 16/32] rename Sample/Correlations/IDistribution1DSampler.cpp
-> Sample/Correlation
---
Sample/{Correlations => Correlation}/IDistribution1DSampler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Sample/{Correlations => Correlation}/IDistribution1DSampler.cpp (98%)
diff --git a/Sample/Correlations/IDistribution1DSampler.cpp b/Sample/Correlation/IDistribution1DSampler.cpp
similarity index 98%
rename from Sample/Correlations/IDistribution1DSampler.cpp
rename to Sample/Correlation/IDistribution1DSampler.cpp
index 0d2f1347e15..172e075d574 100644
--- a/Sample/Correlations/IDistribution1DSampler.cpp
+++ b/Sample/Correlation/IDistribution1DSampler.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IDistribution1DSampler.cpp
+//! @file Sample/Correlation/IDistribution1DSampler.cpp
//! @brief Defines class interface IProfile1D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 4b6c844ef71fe5a458b914145c29b59c85613fc6 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:08 +0100
Subject: [PATCH 17/32] rename Sample/Correlations/IDistribution1DSampler.h ->
Sample/Correlation
---
Sample/Correlation/IDistribution1DSampler.cpp | 2 +-
.../IDistribution1DSampler.h | 8 ++++----
Sample/Correlations/Profiles1D.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename Sample/{Correlations => Correlation}/IDistribution1DSampler.h (89%)
diff --git a/Sample/Correlation/IDistribution1DSampler.cpp b/Sample/Correlation/IDistribution1DSampler.cpp
index 172e075d574..272b2e7b1fa 100644
--- a/Sample/Correlation/IDistribution1DSampler.cpp
+++ b/Sample/Correlation/IDistribution1DSampler.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Correlations/IDistribution1DSampler.h"
+#include "Sample/Correlation/IDistribution1DSampler.h"
#include <numbers>
#include <random>
diff --git a/Sample/Correlations/IDistribution1DSampler.h b/Sample/Correlation/IDistribution1DSampler.h
similarity index 89%
rename from Sample/Correlations/IDistribution1DSampler.h
rename to Sample/Correlation/IDistribution1DSampler.h
index 4a6232bafea..caf185b8704 100644
--- a/Sample/Correlations/IDistribution1DSampler.h
+++ b/Sample/Correlation/IDistribution1DSampler.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IDistribution1DSampler.h
+//! @file Sample/Correlation/IDistribution1DSampler.h
//! @brief Defines class interface IProfile1D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
-#define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION1DSAMPLER_H
+#define BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION1DSAMPLER_H
class IDistribution1DSampler {
public:
@@ -88,4 +88,4 @@ private:
double m_omega;
};
-#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION1DSAMPLER_H
+#endif // BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION1DSAMPLER_H
diff --git a/Sample/Correlations/Profiles1D.h b/Sample/Correlations/Profiles1D.h
index 8bac253daaa..10d26504a46 100644
--- a/Sample/Correlations/Profiles1D.h
+++ b/Sample/Correlations/Profiles1D.h
@@ -19,7 +19,7 @@
#include "Param/Node/INode.h"
#ifndef SWIG
-#include "Sample/Correlations/IDistribution1DSampler.h"
+#include "Sample/Correlation/IDistribution1DSampler.h"
#endif // SWIG
--
GitLab
From 63b3a4a41166f7a6c3eb491edd009d3758a4cafa Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:09 +0100
Subject: [PATCH 18/32] rename Sample/Correlations/IDistribution2DSampler.cpp
-> Sample/Correlation
---
Sample/{Correlations => Correlation}/IDistribution2DSampler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Sample/{Correlations => Correlation}/IDistribution2DSampler.cpp (99%)
diff --git a/Sample/Correlations/IDistribution2DSampler.cpp b/Sample/Correlation/IDistribution2DSampler.cpp
similarity index 99%
rename from Sample/Correlations/IDistribution2DSampler.cpp
rename to Sample/Correlation/IDistribution2DSampler.cpp
index c846b7d8e48..0ecfca9f911 100644
--- a/Sample/Correlations/IDistribution2DSampler.cpp
+++ b/Sample/Correlation/IDistribution2DSampler.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IDistribution2DSampler.cpp
+//! @file Sample/Correlation/IDistribution2DSampler.cpp
//! @brief Defines class interface IProfile1D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 2991df173bda2f4c32bdac4aa2f34f2deb254c3f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:09 +0100
Subject: [PATCH 19/32] rename Sample/Correlations/IDistribution2DSampler.h ->
Sample/Correlation
---
Sample/Correlation/IDistribution2DSampler.cpp | 2 +-
.../IDistribution2DSampler.h | 8 ++++----
Sample/Correlations/Profiles2D.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename Sample/{Correlations => Correlation}/IDistribution2DSampler.h (89%)
diff --git a/Sample/Correlation/IDistribution2DSampler.cpp b/Sample/Correlation/IDistribution2DSampler.cpp
index 0ecfca9f911..dc91bc40642 100644
--- a/Sample/Correlation/IDistribution2DSampler.cpp
+++ b/Sample/Correlation/IDistribution2DSampler.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Correlations/IDistribution2DSampler.h"
+#include "Sample/Correlation/IDistribution2DSampler.h"
#include <numbers>
#include <random>
diff --git a/Sample/Correlations/IDistribution2DSampler.h b/Sample/Correlation/IDistribution2DSampler.h
similarity index 89%
rename from Sample/Correlations/IDistribution2DSampler.h
rename to Sample/Correlation/IDistribution2DSampler.h
index 16664e98f7d..386dd8afcd8 100644
--- a/Sample/Correlations/IDistribution2DSampler.h
+++ b/Sample/Correlation/IDistribution2DSampler.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IDistribution2DSampler.h
+//! @file Sample/Correlation/IDistribution2DSampler.h
//! @brief Defines class interface IProfile1D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
-#define BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION2DSAMPLER_H
+#define BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION2DSAMPLER_H
#include <utility>
@@ -80,4 +80,4 @@ private:
double m_omega_x, m_omega_y;
};
-#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IDISTRIBUTION2DSAMPLER_H
+#endif // BORNAGAIN_SAMPLE_CORRELATION_IDISTRIBUTION2DSAMPLER_H
diff --git a/Sample/Correlations/Profiles2D.h b/Sample/Correlations/Profiles2D.h
index 89431d5ad31..b4d4cb9158e 100644
--- a/Sample/Correlations/Profiles2D.h
+++ b/Sample/Correlations/Profiles2D.h
@@ -20,7 +20,7 @@
#include <numbers>
#ifndef SWIG
-#include "Sample/Correlations/IDistribution2DSampler.h"
+#include "Sample/Correlation/IDistribution2DSampler.h"
#endif // SWIG
using std::numbers::pi;
--
GitLab
From ad10f601ac8ca8411abdd668a4aeba7044576d34 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:10 +0100
Subject: [PATCH 20/32] rename Sample/Correlations/IPeakShape.cpp ->
Sample/Correlation
---
Sample/{Correlations => Correlation}/IPeakShape.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Sample/{Correlations => Correlation}/IPeakShape.cpp (99%)
diff --git a/Sample/Correlations/IPeakShape.cpp b/Sample/Correlation/IPeakShape.cpp
similarity index 99%
rename from Sample/Correlations/IPeakShape.cpp
rename to Sample/Correlation/IPeakShape.cpp
index 8b3586337d5..b38185a31ad 100644
--- a/Sample/Correlations/IPeakShape.cpp
+++ b/Sample/Correlation/IPeakShape.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IPeakShape.cpp
+//! @file Sample/Correlation/IPeakShape.cpp
//! @brief Implements the interface IPeakShape and subclasses.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 7450204cb822b5189b73bd5b39cf4e6fd35a2e12 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:10 +0100
Subject: [PATCH 21/32] rename Sample/Correlations/IPeakShape.h ->
Sample/Correlation
---
Sample/Correlation/IPeakShape.cpp | 2 +-
Sample/{Correlations => Correlation}/IPeakShape.h | 8 ++++----
Wrap/Swig/libBornAgainSample.i | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
rename Sample/{Correlations => Correlation}/IPeakShape.h (96%)
diff --git a/Sample/Correlation/IPeakShape.cpp b/Sample/Correlation/IPeakShape.cpp
index b38185a31ad..d66194dfb07 100644
--- a/Sample/Correlation/IPeakShape.cpp
+++ b/Sample/Correlation/IPeakShape.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Correlations/IPeakShape.h"
+#include "Sample/Correlation/IPeakShape.h"
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
#include <limits>
diff --git a/Sample/Correlations/IPeakShape.h b/Sample/Correlation/IPeakShape.h
similarity index 96%
rename from Sample/Correlations/IPeakShape.h
rename to Sample/Correlation/IPeakShape.h
index 77c4626e366..8be11d19358 100644
--- a/Sample/Correlations/IPeakShape.h
+++ b/Sample/Correlation/IPeakShape.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/IPeakShape.h
+//! @file Sample/Correlation/IPeakShape.h
//! @brief Defines the interface IPeakShape and subclasses.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
-#define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATION_IPEAKSHAPE_H
+#define BORNAGAIN_SAMPLE_CORRELATION_IPEAKSHAPE_H
#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
@@ -184,4 +184,4 @@ private:
double m_kappa;
};
-#endif // BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
+#endif // BORNAGAIN_SAMPLE_CORRELATION_IPEAKSHAPE_H
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index a44e9ee0deb..aa8a5d1c09e 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -38,7 +38,7 @@
#include "Sample/Aggregate/InterferenceNone.h"
#include "Sample/Aggregate/InterferenceRadialParacrystal.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/IPeakShape.h"
+#include "Sample/Correlation/IPeakShape.h"
#include "Sample/HardParticle/HardParticles.h"
#include "Sample/Lattice/Lattice3D.h"
#include "Sample/Lattice/BakeLattice.h"
@@ -83,7 +83,7 @@
%include "Sample/Correlations/Profiles1D.h"
%include "Sample/Correlations/Profiles2D.h"
-%include "Sample/Correlations/IPeakShape.h"
+%include "Sample/Correlation/IPeakShape.h"
%include "Sample/Aggregate/IInterference.h"
%include "Sample/Aggregate/Interference1DLattice.h"
--
GitLab
From 257683883407192ab3ec89938c41a83c232d3606 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:11 +0100
Subject: [PATCH 22/32] rename Sample/Correlations/Profiles1D.cpp ->
Sample/Correlation
---
Sample/{Correlations => Correlation}/Profiles1D.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Sample/{Correlations => Correlation}/Profiles1D.cpp (99%)
diff --git a/Sample/Correlations/Profiles1D.cpp b/Sample/Correlation/Profiles1D.cpp
similarity index 99%
rename from Sample/Correlations/Profiles1D.cpp
rename to Sample/Correlation/Profiles1D.cpp
index 96d8449c6e5..742371df437 100644
--- a/Sample/Correlations/Profiles1D.cpp
+++ b/Sample/Correlation/Profiles1D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/Profiles1D.cpp
+//! @file Sample/Correlation/Profiles1D.cpp
//! @brief Implements class interface IProfile2D and children thereof.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 0971155a58f8098d308a47f92298de630ff482a1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:11 +0100
Subject: [PATCH 23/32] rename Sample/Correlations/Profiles1D.h ->
Sample/Correlation
---
GUI/Model/Sample/ProfileItems.h | 2 +-
Sample/Aggregate/Interference1DLattice.cpp | 2 +-
Sample/Aggregate/Interference2DLattice.cpp | 2 +-
Sample/Aggregate/InterferenceRadialParacrystal.h | 2 +-
Sample/Correlation/Profiles1D.cpp | 2 +-
Sample/{Correlations => Correlation}/Profiles1D.h | 8 ++++----
Sample/StandardSamples/LatticeBuilder.cpp | 2 +-
Tests/Unit/Sample/ProfilesTest.cpp | 2 +-
Wrap/Swig/libBornAgainSample.i | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
rename Sample/{Correlations => Correlation}/Profiles1D.h (96%)
diff --git a/GUI/Model/Sample/ProfileItems.h b/GUI/Model/Sample/ProfileItems.h
index b13d73fe1bf..b49b359e4fa 100644
--- a/GUI/Model/Sample/ProfileItems.h
+++ b/GUI/Model/Sample/ProfileItems.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_SAMPLE_PROFILEITEMS_H
#include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Sample/Correlations/Profiles2D.h"
#include <memory>
diff --git a/Sample/Aggregate/Interference1DLattice.cpp b/Sample/Aggregate/Interference1DLattice.cpp
index 6a607589e3b..cb545807181 100644
--- a/Sample/Aggregate/Interference1DLattice.cpp
+++ b/Sample/Aggregate/Interference1DLattice.cpp
@@ -14,7 +14,7 @@
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Base/Util/Assert.h"
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Sample/Correlations/Profiles2D.h"
#include <algorithm>
diff --git a/Sample/Aggregate/Interference2DLattice.cpp b/Sample/Aggregate/Interference2DLattice.cpp
index 6366715a600..451a6a7401c 100644
--- a/Sample/Aggregate/Interference2DLattice.cpp
+++ b/Sample/Aggregate/Interference2DLattice.cpp
@@ -15,7 +15,7 @@
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Sample/Correlations/Profiles2D.h"
#include <algorithm>
diff --git a/Sample/Aggregate/InterferenceRadialParacrystal.h b/Sample/Aggregate/InterferenceRadialParacrystal.h
index b0ed303cad3..0a57bf3d5ab 100644
--- a/Sample/Aggregate/InterferenceRadialParacrystal.h
+++ b/Sample/Aggregate/InterferenceRadialParacrystal.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCERADIALPARACRYSTAL_H
#include "Sample/Aggregate/IInterference.h"
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include <heinz/Complex.h>
#include <memory>
diff --git a/Sample/Correlation/Profiles1D.cpp b/Sample/Correlation/Profiles1D.cpp
index 742371df437..9137de35169 100644
--- a/Sample/Correlation/Profiles1D.cpp
+++ b/Sample/Correlation/Profiles1D.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Base/Math/Functions.h"
#include "Base/Py/PyFmt.h"
#include "Base/Util/Assert.h"
diff --git a/Sample/Correlations/Profiles1D.h b/Sample/Correlation/Profiles1D.h
similarity index 96%
rename from Sample/Correlations/Profiles1D.h
rename to Sample/Correlation/Profiles1D.h
index 10d26504a46..f0780b9262c 100644
--- a/Sample/Correlations/Profiles1D.h
+++ b/Sample/Correlation/Profiles1D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/Profiles1D.h
+//! @file Sample/Correlation/Profiles1D.h
//! @brief Defines class interface IProfile1D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES1D_H
-#define BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES1D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATION_PROFILES1D_H
+#define BORNAGAIN_SAMPLE_CORRELATION_PROFILES1D_H
#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
@@ -178,4 +178,4 @@ protected:
const double& m_eta; //!< balances between Gauss (eta=0) and Lorentz (eta=1)
};
-#endif // BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES1D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATION_PROFILES1D_H
diff --git a/Sample/StandardSamples/LatticeBuilder.cpp b/Sample/StandardSamples/LatticeBuilder.cpp
index 8529f3fa9d5..177c1b51d1c 100644
--- a/Sample/StandardSamples/LatticeBuilder.cpp
+++ b/Sample/StandardSamples/LatticeBuilder.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/Units.h"
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Sample/Correlations/Profiles2D.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Tests/Unit/Sample/ProfilesTest.cpp b/Tests/Unit/Sample/ProfilesTest.cpp
index 7dc913f2fa1..dc91b586e14 100644
--- a/Tests/Unit/Sample/ProfilesTest.cpp
+++ b/Tests/Unit/Sample/ProfilesTest.cpp
@@ -1,4 +1,4 @@
-#include "Sample/Correlations/Profiles1D.h"
+#include "Sample/Correlation/Profiles1D.h"
#include "Sample/Correlations/Profiles2D.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index aa8a5d1c09e..43f44ae8911 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -81,7 +81,7 @@
%include "Sample/Particle/Compound.h"
%include "Sample/Particle/CoreAndShell.h"
-%include "Sample/Correlations/Profiles1D.h"
+%include "Sample/Correlation/Profiles1D.h"
%include "Sample/Correlations/Profiles2D.h"
%include "Sample/Correlation/IPeakShape.h"
--
GitLab
From 068bd4310121b52f35a725f6658d1788c2c14f81 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:12 +0100
Subject: [PATCH 24/32] rename Sample/Correlations/Profiles2D.cpp ->
Sample/Correlation
---
Sample/{Correlations => Correlation}/Profiles2D.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename Sample/{Correlations => Correlation}/Profiles2D.cpp (99%)
diff --git a/Sample/Correlations/Profiles2D.cpp b/Sample/Correlation/Profiles2D.cpp
similarity index 99%
rename from Sample/Correlations/Profiles2D.cpp
rename to Sample/Correlation/Profiles2D.cpp
index 8134e9e9b02..68f534f2fa4 100644
--- a/Sample/Correlations/Profiles2D.cpp
+++ b/Sample/Correlation/Profiles2D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/Profiles2D.cpp
+//! @file Sample/Correlation/Profiles2D.cpp
//! @brief Implements class interface IProfile2D and children thereof.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab
From 963ae9404edac44888fa849bdd51177bcec018e4 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:12 +0100
Subject: [PATCH 25/32] rename Sample/Correlations/Profiles2D.h ->
Sample/Correlation
---
GUI/Model/Sample/ProfileItems.h | 2 +-
Sample/Aggregate/Interference1DLattice.cpp | 2 +-
Sample/Aggregate/Interference2DLattice.cpp | 2 +-
Sample/Aggregate/Interference2DParacrystal.h | 2 +-
Sample/ComponentBuilder/Profile2DComponents.h | 2 +-
Sample/Correlation/Profiles2D.cpp | 2 +-
Sample/{Correlations => Correlation}/Profiles2D.h | 8 ++++----
Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp | 2 +-
Sample/StandardSamples/CompoundBuilder.cpp | 2 +-
Sample/StandardSamples/LatticeBuilder.cpp | 2 +-
Sample/StandardSamples/TwoDimLatticeBuilder.cpp | 2 +-
Tests/Unit/Sample/ProfilesTest.cpp | 2 +-
Wrap/Swig/libBornAgainSample.i | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
rename Sample/{Correlations => Correlation}/Profiles2D.h (96%)
diff --git a/GUI/Model/Sample/ProfileItems.h b/GUI/Model/Sample/ProfileItems.h
index b49b359e4fa..f140f366886 100644
--- a/GUI/Model/Sample/ProfileItems.h
+++ b/GUI/Model/Sample/ProfileItems.h
@@ -17,7 +17,7 @@
#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "Sample/Correlation/Profiles1D.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include <memory>
class Profile1DItem {
diff --git a/Sample/Aggregate/Interference1DLattice.cpp b/Sample/Aggregate/Interference1DLattice.cpp
index cb545807181..3c0655f2a90 100644
--- a/Sample/Aggregate/Interference1DLattice.cpp
+++ b/Sample/Aggregate/Interference1DLattice.cpp
@@ -15,7 +15,7 @@
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Base/Util/Assert.h"
#include "Sample/Correlation/Profiles1D.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include <algorithm>
namespace {
diff --git a/Sample/Aggregate/Interference2DLattice.cpp b/Sample/Aggregate/Interference2DLattice.cpp
index 451a6a7401c..dbdbaf032e0 100644
--- a/Sample/Aggregate/Interference2DLattice.cpp
+++ b/Sample/Aggregate/Interference2DLattice.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
#include "Sample/Correlation/Profiles1D.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include <algorithm>
namespace {
diff --git a/Sample/Aggregate/Interference2DParacrystal.h b/Sample/Aggregate/Interference2DParacrystal.h
index 3631bd7bc68..279431771e0 100644
--- a/Sample/Aggregate/Interference2DParacrystal.h
+++ b/Sample/Aggregate/Interference2DParacrystal.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_SAMPLE_AGGREGATE_INTERFERENCE2DPARACRYSTAL_H
#include "Sample/Aggregate/IInterference.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Sample/Lattice/Lattice2D.h"
#include <array>
#include <heinz/Complex.h>
diff --git a/Sample/ComponentBuilder/Profile2DComponents.h b/Sample/ComponentBuilder/Profile2DComponents.h
index a83a90dae7a..a06d7f48daa 100644
--- a/Sample/ComponentBuilder/Profile2DComponents.h
+++ b/Sample/ComponentBuilder/Profile2DComponents.h
@@ -19,7 +19,7 @@
#define BORNAGAIN_SAMPLE_COMPONENTBUILDER_PROFILE2DCOMPONENTS_H
#include "Sample/ComponentBuilder/IRegistry.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
//! Predefined Fourier transformed distributions for functional tests.
diff --git a/Sample/Correlation/Profiles2D.cpp b/Sample/Correlation/Profiles2D.cpp
index 68f534f2fa4..25dbd37170c 100644
--- a/Sample/Correlation/Profiles2D.cpp
+++ b/Sample/Correlation/Profiles2D.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Py/PyFmt.h"
diff --git a/Sample/Correlations/Profiles2D.h b/Sample/Correlation/Profiles2D.h
similarity index 96%
rename from Sample/Correlations/Profiles2D.h
rename to Sample/Correlation/Profiles2D.h
index b4d4cb9158e..bad379a95bc 100644
--- a/Sample/Correlations/Profiles2D.h
+++ b/Sample/Correlation/Profiles2D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Correlations/Profiles2D.h
+//! @file Sample/Correlation/Profiles2D.h
//! @brief Defines class interface IProfile2D, and children thereof.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES2D_H
-#define BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES2D_H
+#ifndef BORNAGAIN_SAMPLE_CORRELATION_PROFILES2D_H
+#define BORNAGAIN_SAMPLE_CORRELATION_PROFILES2D_H
#include "Base/Type/ICloneable.h"
#include "Param/Node/INode.h"
@@ -170,4 +170,4 @@ protected:
const double& m_eta;
};
-#endif // BORNAGAIN_SAMPLE_CORRELATIONS_PROFILES2D_H
+#endif // BORNAGAIN_SAMPLE_CORRELATION_PROFILES2D_H
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp b/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
index 2d11f16898b..7e0420ab692 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+++ b/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
@@ -15,7 +15,7 @@
#include "Sample/StandardSamples/BoxesSquareLatticeBuilder.h"
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Sample/HardParticle/Polyhedra.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/CompoundBuilder.cpp b/Sample/StandardSamples/CompoundBuilder.cpp
index 1d1759f3863..fdf92ab7a6e 100644
--- a/Sample/StandardSamples/CompoundBuilder.cpp
+++ b/Sample/StandardSamples/CompoundBuilder.cpp
@@ -15,7 +15,7 @@
#include "Sample/StandardSamples/CompoundBuilder.h"
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/HardParticle/Sphere.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/LatticeBuilder.cpp b/Sample/StandardSamples/LatticeBuilder.cpp
index 177c1b51d1c..d68eb0952b3 100644
--- a/Sample/StandardSamples/LatticeBuilder.cpp
+++ b/Sample/StandardSamples/LatticeBuilder.cpp
@@ -17,7 +17,7 @@
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Correlation/Profiles1D.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp b/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
index 1b5c5ab89d3..ffdd30a954b 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
@@ -18,7 +18,7 @@
#include "Sample/Aggregate/Interference2DSuperLattice.h"
#include "Sample/Aggregate/InterferenceFinite2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Tests/Unit/Sample/ProfilesTest.cpp b/Tests/Unit/Sample/ProfilesTest.cpp
index dc91b586e14..bb2826b22f4 100644
--- a/Tests/Unit/Sample/ProfilesTest.cpp
+++ b/Tests/Unit/Sample/ProfilesTest.cpp
@@ -1,6 +1,6 @@
#include "Sample/Correlation/Profiles1D.h"
-#include "Sample/Correlations/Profiles2D.h"
+#include "Sample/Correlation/Profiles2D.h"
#include "Tests/GTestWrapper/google_test.h"
#include <memory>
diff --git a/Wrap/Swig/libBornAgainSample.i b/Wrap/Swig/libBornAgainSample.i
index 43f44ae8911..71c29b83a2b 100644
--- a/Wrap/Swig/libBornAgainSample.i
+++ b/Wrap/Swig/libBornAgainSample.i
@@ -82,7 +82,7 @@
%include "Sample/Particle/CoreAndShell.h"
%include "Sample/Correlation/Profiles1D.h"
-%include "Sample/Correlations/Profiles2D.h"
+%include "Sample/Correlation/Profiles2D.h"
%include "Sample/Correlation/IPeakShape.h"
%include "Sample/Aggregate/IInterference.h"
--
GitLab
From fe10d7eb487857ece884bf9171e3cbdd26cfbc8a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:30:36 +0100
Subject: [PATCH 26/32] rename Sample/Shapes -> Sample/Shape
---
Sample/HardParticle/Cone.cpp | 2 +-
Sample/HardParticle/Cylinder.cpp | 2 +-
Sample/HardParticle/EllipsoidalCylinder.cpp | 2 +-
Sample/HardParticle/HemiEllipsoid.cpp | 2 +-
Sample/HardParticle/HorizontalCylinder.cpp | 2 +-
Sample/HardParticle/IProfileRipple.cpp | 6 +++---
Sample/HardParticle/LongBoxGauss.cpp | 2 +-
Sample/HardParticle/LongBoxLorentz.cpp | 2 +-
Sample/HardParticle/Spheroid.cpp | 2 +-
Sample/HardParticle/TruncatedSphere.cpp | 2 +-
Sample/HardParticle/TruncatedSpheroid.cpp | 2 +-
Sample/Particle/IFormFactor.cpp | 2 +-
Sample/{Shapes => Shape}/BoxNet.cpp | 4 ++--
Sample/{Shapes => Shape}/BoxNet.h | 10 +++++-----
Sample/{Shapes => Shape}/DoubleEllipse.cpp | 4 ++--
Sample/{Shapes => Shape}/DoubleEllipse.h | 10 +++++-----
Sample/{Shapes => Shape}/IShape3D.cpp | 4 ++--
Sample/{Shapes => Shape}/IShape3D.h | 8 ++++----
Sample/{Shapes => Shape}/RippleCosineNet.cpp | 4 ++--
Sample/{Shapes => Shape}/RippleCosineNet.h | 10 +++++-----
Sample/{Shapes => Shape}/RippleSawtoothNet.cpp | 4 ++--
Sample/{Shapes => Shape}/RippleSawtoothNet.h | 10 +++++-----
Sample/{Shapes => Shape}/TruncatedEllipsoidNet.cpp | 4 ++--
Sample/{Shapes => Shape}/TruncatedEllipsoidNet.h | 10 +++++-----
Sample/SoftParticle/FuzzySphere.cpp | 2 +-
Sample/SoftParticle/Gauss.cpp | 4 ++--
26 files changed, 58 insertions(+), 58 deletions(-)
rename Sample/{Shapes => Shape}/BoxNet.cpp (92%)
rename Sample/{Shapes => Shape}/BoxNet.h (79%)
rename Sample/{Shapes => Shape}/DoubleEllipse.cpp (95%)
rename Sample/{Shapes => Shape}/DoubleEllipse.h (82%)
rename Sample/{Shapes => Shape}/IShape3D.cpp (97%)
rename Sample/{Shapes => Shape}/IShape3D.h (91%)
rename Sample/{Shapes => Shape}/RippleCosineNet.cpp (92%)
rename Sample/{Shapes => Shape}/RippleCosineNet.h (76%)
rename Sample/{Shapes => Shape}/RippleSawtoothNet.cpp (92%)
rename Sample/{Shapes => Shape}/RippleSawtoothNet.h (76%)
rename Sample/{Shapes => Shape}/TruncatedEllipsoidNet.cpp (94%)
rename Sample/{Shapes => Shape}/TruncatedEllipsoidNet.h (76%)
diff --git a/Sample/HardParticle/Cone.cpp b/Sample/HardParticle/Cone.cpp
index 83bcd6085d2..51d544e4fd5 100644
--- a/Sample/HardParticle/Cone.cpp
+++ b/Sample/HardParticle/Cone.cpp
@@ -17,7 +17,7 @@
#include "Base/Math/Functions.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/DoubleEllipse.h"
+#include "Sample/Shape/DoubleEllipse.h"
#include <limits>
#include <numbers>
diff --git a/Sample/HardParticle/Cylinder.cpp b/Sample/HardParticle/Cylinder.cpp
index 2304b86417a..034628fd574 100644
--- a/Sample/HardParticle/Cylinder.cpp
+++ b/Sample/HardParticle/Cylinder.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Bessel.h"
#include "Base/Math/Functions.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/DoubleEllipse.h"
+#include "Sample/Shape/DoubleEllipse.h"
#include <numbers>
using std::numbers::pi;
diff --git a/Sample/HardParticle/EllipsoidalCylinder.cpp b/Sample/HardParticle/EllipsoidalCylinder.cpp
index db8e8fed5f9..c26da64e8f6 100644
--- a/Sample/HardParticle/EllipsoidalCylinder.cpp
+++ b/Sample/HardParticle/EllipsoidalCylinder.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Bessel.h"
#include "Base/Math/Functions.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/DoubleEllipse.h"
+#include "Sample/Shape/DoubleEllipse.h"
#include <numbers>
using std::numbers::pi;
diff --git a/Sample/HardParticle/HemiEllipsoid.cpp b/Sample/HardParticle/HemiEllipsoid.cpp
index 6c5da675cdd..bcf4edb9695 100644
--- a/Sample/HardParticle/HemiEllipsoid.cpp
+++ b/Sample/HardParticle/HemiEllipsoid.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include <limits>
#include <numbers>
diff --git a/Sample/HardParticle/HorizontalCylinder.cpp b/Sample/HardParticle/HorizontalCylinder.cpp
index 76b3f787e14..643c8e06ce3 100644
--- a/Sample/HardParticle/HorizontalCylinder.cpp
+++ b/Sample/HardParticle/HorizontalCylinder.cpp
@@ -17,7 +17,7 @@
#include "Base/Math/Functions.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/DoubleEllipse.h"
+#include "Sample/Shape/DoubleEllipse.h"
#include <numbers>
using std::numbers::pi;
diff --git a/Sample/HardParticle/IProfileRipple.cpp b/Sample/HardParticle/IProfileRipple.cpp
index 44f62f60c50..5a521486851 100644
--- a/Sample/HardParticle/IProfileRipple.cpp
+++ b/Sample/HardParticle/IProfileRipple.cpp
@@ -14,9 +14,9 @@
#include "Sample/HardParticle/IProfileRipple.h"
#include "Sample/HardParticle/Ripples.h"
-#include "Sample/Shapes/BoxNet.h"
-#include "Sample/Shapes/RippleCosineNet.h"
-#include "Sample/Shapes/RippleSawtoothNet.h"
+#include "Sample/Shape/BoxNet.h"
+#include "Sample/Shape/RippleCosineNet.h"
+#include "Sample/Shape/RippleSawtoothNet.h"
// ************************************************************************************************
// interface IProfileRipple
diff --git a/Sample/HardParticle/LongBoxGauss.cpp b/Sample/HardParticle/LongBoxGauss.cpp
index 176d7b8bcf4..691817e25a0 100644
--- a/Sample/HardParticle/LongBoxGauss.cpp
+++ b/Sample/HardParticle/LongBoxGauss.cpp
@@ -14,7 +14,7 @@
#include "Sample/HardParticle/LongBoxGauss.h"
#include "Base/Math/Functions.h"
-#include "Sample/Shapes/BoxNet.h"
+#include "Sample/Shape/BoxNet.h"
LongBoxGauss::LongBoxGauss(const std::vector<double> P)
: IFormFactor(P)
diff --git a/Sample/HardParticle/LongBoxLorentz.cpp b/Sample/HardParticle/LongBoxLorentz.cpp
index a9afeede7dc..986ecd67608 100644
--- a/Sample/HardParticle/LongBoxLorentz.cpp
+++ b/Sample/HardParticle/LongBoxLorentz.cpp
@@ -14,7 +14,7 @@
#include "Sample/HardParticle/LongBoxLorentz.h"
#include "Base/Math/Functions.h"
-#include "Sample/Shapes/BoxNet.h"
+#include "Sample/Shape/BoxNet.h"
LongBoxLorentz::LongBoxLorentz(const std::vector<double> P)
: IFormFactor(P)
diff --git a/Sample/HardParticle/Spheroid.cpp b/Sample/HardParticle/Spheroid.cpp
index cc1eeb41a34..97d74ab6d16 100644
--- a/Sample/HardParticle/Spheroid.cpp
+++ b/Sample/HardParticle/Spheroid.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Functions.h"
#include "Base/Util/Assert.h"
#include "Sample/HardParticle/TruncatedSpheroid.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include <limits>
#include <numbers>
diff --git a/Sample/HardParticle/TruncatedSphere.cpp b/Sample/HardParticle/TruncatedSphere.cpp
index 9a8eb53fdb3..7ca05478ce6 100644
--- a/Sample/HardParticle/TruncatedSphere.cpp
+++ b/Sample/HardParticle/TruncatedSphere.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include <limits>
#include <numbers>
diff --git a/Sample/HardParticle/TruncatedSpheroid.cpp b/Sample/HardParticle/TruncatedSpheroid.cpp
index b5258d678cb..ce57cedf01f 100644
--- a/Sample/HardParticle/TruncatedSpheroid.cpp
+++ b/Sample/HardParticle/TruncatedSpheroid.cpp
@@ -16,7 +16,7 @@
#include "Base/Math/Bessel.h"
#include "Base/Math/IntegratorGK.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include <limits>
#include <numbers>
diff --git a/Sample/Particle/IFormFactor.cpp b/Sample/Particle/IFormFactor.cpp
index c66526bebef..d1a2b84b531 100644
--- a/Sample/Particle/IFormFactor.cpp
+++ b/Sample/Particle/IFormFactor.cpp
@@ -20,7 +20,7 @@
#include "Base/Vector/WavevectorInfo.h"
#include "Sample/Particle/PolyhedralUtil.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
#include <sstream>
#include <stdexcept>
diff --git a/Sample/Shapes/BoxNet.cpp b/Sample/Shape/BoxNet.cpp
similarity index 92%
rename from Sample/Shapes/BoxNet.cpp
rename to Sample/Shape/BoxNet.cpp
index 622a2c50f41..f70329e9838 100644
--- a/Sample/Shapes/BoxNet.cpp
+++ b/Sample/Shape/BoxNet.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/BoxNet.cpp
+//! @file Sample/Shape/BoxNet.cpp
//! @brief Implements class BoxNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/BoxNet.h"
+#include "Sample/Shape/BoxNet.h"
#include <algorithm>
BoxNet::BoxNet(double length, double width, double height)
diff --git a/Sample/Shapes/BoxNet.h b/Sample/Shape/BoxNet.h
similarity index 79%
rename from Sample/Shapes/BoxNet.h
rename to Sample/Shape/BoxNet.h
index b7c0f1894c2..7376ded49ff 100644
--- a/Sample/Shapes/BoxNet.h
+++ b/Sample/Shape/BoxNet.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/BoxNet.h
+//! @file Sample/Shape/BoxNet.h
//! @brief Defines class BoxNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,10 +15,10 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_BOXNET_H
-#define BORNAGAIN_SAMPLE_SHAPES_BOXNET_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_BOXNET_H
+#define BORNAGAIN_SAMPLE_SHAPE_BOXNET_H
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
class BoxNet : public IShape3D {
public:
@@ -26,4 +26,4 @@ public:
~BoxNet() override;
};
-#endif // BORNAGAIN_SAMPLE_SHAPES_BOXNET_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_BOXNET_H
diff --git a/Sample/Shapes/DoubleEllipse.cpp b/Sample/Shape/DoubleEllipse.cpp
similarity index 95%
rename from Sample/Shapes/DoubleEllipse.cpp
rename to Sample/Shape/DoubleEllipse.cpp
index d9d4de33e35..dd61dc8df36 100644
--- a/Sample/Shapes/DoubleEllipse.cpp
+++ b/Sample/Shape/DoubleEllipse.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/DoubleEllipse.cpp
+//! @file Sample/Shape/DoubleEllipse.cpp
//! @brief Implements class DoubleEllipse.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/DoubleEllipse.h"
+#include "Sample/Shape/DoubleEllipse.h"
#include <algorithm>
// horizontal ellipses (XY plane)
diff --git a/Sample/Shapes/DoubleEllipse.h b/Sample/Shape/DoubleEllipse.h
similarity index 82%
rename from Sample/Shapes/DoubleEllipse.h
rename to Sample/Shape/DoubleEllipse.h
index 99386e5f816..bc32e3d8287 100644
--- a/Sample/Shapes/DoubleEllipse.h
+++ b/Sample/Shape/DoubleEllipse.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/DoubleEllipse.h
+//! @file Sample/Shape/DoubleEllipse.h
//! @brief Defines class DoubleEllipse.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,10 +15,10 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
-#define BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_DOUBLEELLIPSE_H
+#define BORNAGAIN_SAMPLE_SHAPE_DOUBLEELLIPSE_H
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
class DoubleEllipseZ : public IShape3D {
public:
@@ -32,4 +32,4 @@ public:
double r2_y, double r2_z, double z2_b, double z2_t);
~DoubleEllipseX() override;
};
-#endif // BORNAGAIN_SAMPLE_SHAPES_DOUBLEELLIPSE_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_DOUBLEELLIPSE_H
diff --git a/Sample/Shapes/IShape3D.cpp b/Sample/Shape/IShape3D.cpp
similarity index 97%
rename from Sample/Shapes/IShape3D.cpp
rename to Sample/Shape/IShape3D.cpp
index af2636ff437..166b75742e5 100644
--- a/Sample/Shapes/IShape3D.cpp
+++ b/Sample/Shape/IShape3D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/IShape3D.cpp
+//! @file Sample/Shape/IShape3D.cpp
//! @brief Implements default methods of interface IShape3D.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
#include <cmath>
#include <numbers>
diff --git a/Sample/Shapes/IShape3D.h b/Sample/Shape/IShape3D.h
similarity index 91%
rename from Sample/Shapes/IShape3D.h
rename to Sample/Shape/IShape3D.h
index f0748604df7..41343f2f1c2 100644
--- a/Sample/Shapes/IShape3D.h
+++ b/Sample/Shape/IShape3D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/IShape3D.h
+//! @file Sample/Shape/IShape3D.h
//! @brief Defines interface IShape3D.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_ISHAPE3D_H
-#define BORNAGAIN_SAMPLE_SHAPES_ISHAPE3D_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_ISHAPE3D_H
+#define BORNAGAIN_SAMPLE_SHAPE_ISHAPE3D_H
#include <heinz/Vectors3D.h>
#include <vector>
@@ -52,4 +52,4 @@ std::vector<R3> EllipseVerticesZ(double r_x, double r_y, double z);
//! heights z_b (bottom) and z_t (top)
std::vector<R3> EllipseVerticesXtrunc(double x, double r_y, double r_z, double z_b, double z_t);
-#endif // BORNAGAIN_SAMPLE_SHAPES_ISHAPE3D_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_ISHAPE3D_H
diff --git a/Sample/Shapes/RippleCosineNet.cpp b/Sample/Shape/RippleCosineNet.cpp
similarity index 92%
rename from Sample/Shapes/RippleCosineNet.cpp
rename to Sample/Shape/RippleCosineNet.cpp
index 44f035eac66..069de336cef 100644
--- a/Sample/Shapes/RippleCosineNet.cpp
+++ b/Sample/Shape/RippleCosineNet.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/RippleCosineNet.cpp
+//! @file Sample/Shape/RippleCosineNet.cpp
//! @brief Implements class RippleCosineNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/RippleCosineNet.h"
+#include "Sample/Shape/RippleCosineNet.h"
#include <cmath>
#include <numbers>
diff --git a/Sample/Shapes/RippleCosineNet.h b/Sample/Shape/RippleCosineNet.h
similarity index 76%
rename from Sample/Shapes/RippleCosineNet.h
rename to Sample/Shape/RippleCosineNet.h
index d80951d683d..9fadddc1aec 100644
--- a/Sample/Shapes/RippleCosineNet.h
+++ b/Sample/Shape/RippleCosineNet.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/RippleCosineNet.h
+//! @file Sample/Shape/RippleCosineNet.h
//! @brief Defines class RippleCosineNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,10 +15,10 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINENET_H
-#define BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINENET_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_RIPPLECOSINENET_H
+#define BORNAGAIN_SAMPLE_SHAPE_RIPPLECOSINENET_H
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
class RippleCosineNet : public IShape3D {
public:
@@ -26,4 +26,4 @@ public:
~RippleCosineNet() override;
};
-#endif // BORNAGAIN_SAMPLE_SHAPES_RIPPLECOSINENET_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_RIPPLECOSINENET_H
diff --git a/Sample/Shapes/RippleSawtoothNet.cpp b/Sample/Shape/RippleSawtoothNet.cpp
similarity index 92%
rename from Sample/Shapes/RippleSawtoothNet.cpp
rename to Sample/Shape/RippleSawtoothNet.cpp
index c18616a237d..b9aa4f7fdec 100644
--- a/Sample/Shapes/RippleSawtoothNet.cpp
+++ b/Sample/Shape/RippleSawtoothNet.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/RippleSawtoothNet.cpp
+//! @file Sample/Shape/RippleSawtoothNet.cpp
//! @brief Implements class RippleSawtooth.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/RippleSawtoothNet.h"
+#include "Sample/Shape/RippleSawtoothNet.h"
RippleSawtoothNet::RippleSawtoothNet(double length, double width, double height, double asymmetry)
{
diff --git a/Sample/Shapes/RippleSawtoothNet.h b/Sample/Shape/RippleSawtoothNet.h
similarity index 76%
rename from Sample/Shapes/RippleSawtoothNet.h
rename to Sample/Shape/RippleSawtoothNet.h
index fca8a4b9a3d..d4d6735b05a 100644
--- a/Sample/Shapes/RippleSawtoothNet.h
+++ b/Sample/Shape/RippleSawtoothNet.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/RippleSawtoothNet.h
+//! @file Sample/Shape/RippleSawtoothNet.h
//! @brief Defines class RippleSawtooth.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,10 +15,10 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTHNET_H
-#define BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTHNET_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_RIPPLESAWTOOTHNET_H
+#define BORNAGAIN_SAMPLE_SHAPE_RIPPLESAWTOOTHNET_H
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
class RippleSawtoothNet : public IShape3D {
public:
@@ -26,4 +26,4 @@ public:
~RippleSawtoothNet() override;
};
-#endif // BORNAGAIN_SAMPLE_SHAPES_RIPPLESAWTOOTHNET_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_RIPPLESAWTOOTHNET_H
diff --git a/Sample/Shapes/TruncatedEllipsoidNet.cpp b/Sample/Shape/TruncatedEllipsoidNet.cpp
similarity index 94%
rename from Sample/Shapes/TruncatedEllipsoidNet.cpp
rename to Sample/Shape/TruncatedEllipsoidNet.cpp
index c362e376dd7..a6c36c0c720 100644
--- a/Sample/Shapes/TruncatedEllipsoidNet.cpp
+++ b/Sample/Shape/TruncatedEllipsoidNet.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/TruncatedEllipsoidNet.cpp
+//! @file Sample/Shape/TruncatedEllipsoidNet.cpp
//! @brief Implements class TruncatedEllipsoidNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include "Base/Util/Assert.h"
#include <algorithm>
#include <cmath>
diff --git a/Sample/Shapes/TruncatedEllipsoidNet.h b/Sample/Shape/TruncatedEllipsoidNet.h
similarity index 76%
rename from Sample/Shapes/TruncatedEllipsoidNet.h
rename to Sample/Shape/TruncatedEllipsoidNet.h
index bc02dc86157..a3f6d14102c 100644
--- a/Sample/Shapes/TruncatedEllipsoidNet.h
+++ b/Sample/Shape/TruncatedEllipsoidNet.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Shapes/TruncatedEllipsoidNet.h
+//! @file Sample/Shape/TruncatedEllipsoidNet.h
//! @brief Defines class TruncatedEllipsoidNet.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,10 +15,10 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOIDNET_H
-#define BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOIDNET_H
+#ifndef BORNAGAIN_SAMPLE_SHAPE_TRUNCATEDELLIPSOIDNET_H
+#define BORNAGAIN_SAMPLE_SHAPE_TRUNCATEDELLIPSOIDNET_H
-#include "Sample/Shapes/IShape3D.h"
+#include "Sample/Shape/IShape3D.h"
class TruncatedEllipsoidNet : public IShape3D {
public:
@@ -26,4 +26,4 @@ public:
~TruncatedEllipsoidNet() override;
};
-#endif // BORNAGAIN_SAMPLE_SHAPES_TRUNCATEDELLIPSOIDNET_H
+#endif // BORNAGAIN_SAMPLE_SHAPE_TRUNCATEDELLIPSOIDNET_H
diff --git a/Sample/SoftParticle/FuzzySphere.cpp b/Sample/SoftParticle/FuzzySphere.cpp
index 941de980976..0ef179b8d20 100644
--- a/Sample/SoftParticle/FuzzySphere.cpp
+++ b/Sample/SoftParticle/FuzzySphere.cpp
@@ -15,7 +15,7 @@
#include "Sample/SoftParticle/FuzzySphere.h"
#include "Base/Util/Assert.h"
#include "Sample/LibFF/SomeFormFactors.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
FuzzySphere::FuzzySphere(const std::vector<double> P)
: IFormFactor(P)
diff --git a/Sample/SoftParticle/Gauss.cpp b/Sample/SoftParticle/Gauss.cpp
index e2e3ef073fa..5dd8bffa28c 100644
--- a/Sample/SoftParticle/Gauss.cpp
+++ b/Sample/SoftParticle/Gauss.cpp
@@ -14,8 +14,8 @@
#include "Sample/SoftParticle/Gauss.h"
#include "Base/Util/Assert.h"
-#include "Sample/Shapes/BoxNet.h"
-#include "Sample/Shapes/TruncatedEllipsoidNet.h"
+#include "Sample/Shape/BoxNet.h"
+#include "Sample/Shape/TruncatedEllipsoidNet.h"
#include <limits>
#include <numbers>
--
GitLab
From 45a31ae8a9995b34ebe84a7cc3b7ab2502011659 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:31:34 +0100
Subject: [PATCH 27/32] rename Sample/StandardSamples/ -> Sample/StandardSample
---
GUI/Model/FromCore/GUIExamplesFactory.cpp | 2 +-
.../BoxCompositionBuilder.cpp | 6 +--
.../BoxCompositionBuilder.h | 8 +--
.../BoxesSquareLatticeBuilder.cpp | 6 +--
.../BoxesSquareLatticeBuilder.h | 8 +--
.../CompoundBuilder.cpp | 6 +--
.../CompoundBuilder.h | 8 +--
.../CoreAndShellBuilder.cpp | 6 +--
.../CoreAndShellBuilder.h | 8 +--
.../CustomMorphologyBuilder.cpp | 6 +--
.../CustomMorphologyBuilder.h | 8 +--
.../CylindersAndPrismsBuilder.cpp | 6 +--
.../CylindersAndPrismsBuilder.h | 8 +--
.../CylindersBuilder.cpp | 6 +--
.../CylindersBuilder.h | 8 +--
Sample/StandardSample/ExemplarySamples.h | 53 +++++++++++++++++++
.../FeNiBilayerBuilder.cpp | 4 +-
.../FeNiBilayerBuilder.h | 8 +--
.../HomogeneousMultilayerBuilder.cpp | 4 +-
.../HomogeneousMultilayerBuilder.h | 8 +--
.../LatticeBuilder.cpp | 6 +--
.../LatticeBuilder.h | 8 +--
.../LayersWithAbsorptionBuilder.cpp | 6 +--
.../LayersWithAbsorptionBuilder.h | 8 +--
.../LayersWithAbsorptionBySLDBuilder.cpp | 4 +-
.../LayersWithAbsorptionBySLDBuilder.h | 8 +--
.../MagneticLayersBuilder.cpp | 4 +-
.../MagneticLayersBuilder.h | 8 +--
.../MagneticParticlesBuilder.cpp | 4 +-
.../MagneticParticlesBuilder.h | 8 +--
.../MesocrystalBuilder.cpp | 6 +--
.../MesocrystalBuilder.h | 8 +--
.../MultiLayerWithNCRoughnessBuilder.cpp | 4 +-
.../MultiLayerWithNCRoughnessBuilder.h | 10 ++--
.../MultiLayerWithRoughnessBuilder.cpp | 4 +-
.../MultiLayerWithRoughnessBuilder.h | 8 +--
.../MultipleLayoutBuilder.cpp | 6 +--
.../MultipleLayoutBuilder.h | 8 +--
.../ParacrystalBuilder.cpp | 6 +--
.../ParacrystalBuilder.h | 8 +--
.../ParticleDistributionsBuilder.cpp | 6 +--
.../ParticleDistributionsBuilder.h | 8 +--
.../ParticleInVacuumBuilder.cpp | 6 +--
.../ParticleInVacuumBuilder.h | 8 +--
.../PercusYevickBuilder.cpp | 6 +--
.../PercusYevickBuilder.h | 8 +--
.../PlainMultiLayerBySLDBuilder.cpp | 4 +-
.../PlainMultiLayerBySLDBuilder.h | 8 +--
.../ReferenceMaterials.h | 8 +--
.../ResonatorBuilder.cpp | 4 +-
.../ResonatorBuilder.h | 8 +--
.../RipplesBuilder.cpp | 6 +--
.../RipplesBuilder.h | 8 +--
.../RotatedPyramidsBuilder.cpp | 6 +--
.../RotatedPyramidsBuilder.h | 8 +--
.../SimpleLayerBuilder.cpp | 6 +--
.../SimpleLayerBuilder.h | 8 +--
.../SimpleLayersBuilder.h | 8 +--
.../SizeDistributionModelsBuilder.cpp | 6 +--
.../SizeDistributionModelsBuilder.h | 8 +--
.../SlicedCompositionBuilder.cpp | 6 +--
.../SlicedCompositionBuilder.h | 8 +--
.../SlicedCylindersBuilder.cpp | 4 +-
.../SlicedCylindersBuilder.h | 8 +--
.../ThickAbsorptiveSampleBuilder.cpp | 4 +-
.../ThickAbsorptiveSampleBuilder.h | 8 +--
.../TransformationsBuilder.cpp | 6 +--
.../TransformationsBuilder.h | 8 +--
.../TwoDimLatticeBuilder.cpp | 6 +--
.../TwoDimLatticeBuilder.h | 8 +--
Sample/StandardSamples/ExemplarySamples.h | 53 -------------------
.../Consistence/ConsistenceTests.cpp | 4 +-
Tests/Functional/Fitting/FitTests.cpp | 2 +-
Tests/Suite/Common/TestSuite.h | 2 +-
Tests/Unit/Resample/KzComputationTest.cpp | 2 +-
75 files changed, 288 insertions(+), 288 deletions(-)
rename Sample/{StandardSamples => StandardSample}/BoxCompositionBuilder.cpp (96%)
rename Sample/{StandardSamples => StandardSample}/BoxCompositionBuilder.h (85%)
rename Sample/{StandardSamples => StandardSample}/BoxesSquareLatticeBuilder.cpp (90%)
rename Sample/{StandardSamples => StandardSample}/BoxesSquareLatticeBuilder.h (75%)
rename Sample/{StandardSamples => StandardSample}/CompoundBuilder.cpp (94%)
rename Sample/{StandardSamples => StandardSample}/CompoundBuilder.h (79%)
rename Sample/{StandardSamples => StandardSample}/CoreAndShellBuilder.cpp (94%)
rename Sample/{StandardSamples => StandardSample}/CoreAndShellBuilder.h (80%)
rename Sample/{StandardSamples => StandardSample}/CustomMorphologyBuilder.cpp (95%)
rename Sample/{StandardSamples => StandardSample}/CustomMorphologyBuilder.h (75%)
rename Sample/{StandardSamples => StandardSample}/CylindersAndPrismsBuilder.cpp (88%)
rename Sample/{StandardSamples => StandardSample}/CylindersAndPrismsBuilder.h (75%)
rename Sample/{StandardSamples => StandardSample}/CylindersBuilder.cpp (93%)
rename Sample/{StandardSamples => StandardSample}/CylindersBuilder.h (82%)
create mode 100644 Sample/StandardSample/ExemplarySamples.h
rename Sample/{StandardSamples => StandardSample}/FeNiBilayerBuilder.cpp (98%)
rename Sample/{StandardSamples => StandardSample}/FeNiBilayerBuilder.h (84%)
rename Sample/{StandardSamples => StandardSample}/HomogeneousMultilayerBuilder.cpp (92%)
rename Sample/{StandardSamples => StandardSample}/HomogeneousMultilayerBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/LatticeBuilder.cpp (91%)
rename Sample/{StandardSamples => StandardSample}/LatticeBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBuilder.cpp (89%)
rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBySLDBuilder.cpp (93%)
rename Sample/{StandardSamples => StandardSample}/LayersWithAbsorptionBySLDBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/MagneticLayersBuilder.cpp (98%)
rename Sample/{StandardSamples => StandardSample}/MagneticLayersBuilder.h (86%)
rename Sample/{StandardSamples => StandardSample}/MagneticParticlesBuilder.cpp (97%)
rename Sample/{StandardSamples => StandardSample}/MagneticParticlesBuilder.h (81%)
rename Sample/{StandardSamples => StandardSample}/MesocrystalBuilder.cpp (94%)
rename Sample/{StandardSamples => StandardSample}/MesocrystalBuilder.h (79%)
rename Sample/{StandardSamples => StandardSample}/MultiLayerWithNCRoughnessBuilder.cpp (85%)
rename Sample/{StandardSamples => StandardSample}/MultiLayerWithNCRoughnessBuilder.h (69%)
rename Sample/{StandardSamples => StandardSample}/MultiLayerWithRoughnessBuilder.cpp (93%)
rename Sample/{StandardSamples => StandardSample}/MultiLayerWithRoughnessBuilder.h (73%)
rename Sample/{StandardSamples => StandardSample}/MultipleLayoutBuilder.cpp (90%)
rename Sample/{StandardSamples => StandardSample}/MultipleLayoutBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/ParacrystalBuilder.cpp (96%)
rename Sample/{StandardSamples => StandardSample}/ParacrystalBuilder.h (86%)
rename Sample/{StandardSamples => StandardSample}/ParticleDistributionsBuilder.cpp (98%)
rename Sample/{StandardSamples => StandardSample}/ParticleDistributionsBuilder.h (86%)
rename Sample/{StandardSamples => StandardSample}/ParticleInVacuumBuilder.cpp (86%)
rename Sample/{StandardSamples => StandardSample}/ParticleInVacuumBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/PercusYevickBuilder.cpp (90%)
rename Sample/{StandardSamples => StandardSample}/PercusYevickBuilder.h (76%)
rename Sample/{StandardSamples => StandardSample}/PlainMultiLayerBySLDBuilder.cpp (93%)
rename Sample/{StandardSamples => StandardSample}/PlainMultiLayerBySLDBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/ReferenceMaterials.h (84%)
rename Sample/{StandardSamples => StandardSample}/ResonatorBuilder.cpp (94%)
rename Sample/{StandardSamples => StandardSample}/ResonatorBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/RipplesBuilder.cpp (93%)
rename Sample/{StandardSamples => StandardSample}/RipplesBuilder.h (83%)
rename Sample/{StandardSamples => StandardSample}/RotatedPyramidsBuilder.cpp (89%)
rename Sample/{StandardSamples => StandardSample}/RotatedPyramidsBuilder.h (76%)
rename Sample/{StandardSamples => StandardSample}/SimpleLayerBuilder.cpp (85%)
rename Sample/{StandardSamples => StandardSample}/SimpleLayerBuilder.h (77%)
rename Sample/{StandardSamples => StandardSample}/SimpleLayersBuilder.h (79%)
rename Sample/{StandardSamples => StandardSample}/SizeDistributionModelsBuilder.cpp (96%)
rename Sample/{StandardSamples => StandardSample}/SizeDistributionModelsBuilder.h (85%)
rename Sample/{StandardSamples => StandardSample}/SlicedCompositionBuilder.cpp (91%)
rename Sample/{StandardSamples => StandardSample}/SlicedCompositionBuilder.h (76%)
rename Sample/{StandardSamples => StandardSample}/SlicedCylindersBuilder.cpp (97%)
rename Sample/{StandardSamples => StandardSample}/SlicedCylindersBuilder.h (83%)
rename Sample/{StandardSamples => StandardSample}/ThickAbsorptiveSampleBuilder.cpp (91%)
rename Sample/{StandardSamples => StandardSample}/ThickAbsorptiveSampleBuilder.h (73%)
rename Sample/{StandardSamples => StandardSample}/TransformationsBuilder.cpp (90%)
rename Sample/{StandardSamples => StandardSample}/TransformationsBuilder.h (75%)
rename Sample/{StandardSamples => StandardSample}/TwoDimLatticeBuilder.cpp (97%)
rename Sample/{StandardSamples => StandardSample}/TwoDimLatticeBuilder.h (87%)
delete mode 100644 Sample/StandardSamples/ExemplarySamples.h
diff --git a/GUI/Model/FromCore/GUIExamplesFactory.cpp b/GUI/Model/FromCore/GUIExamplesFactory.cpp
index 38021184c5b..1cc4beef14d 100644
--- a/GUI/Model/FromCore/GUIExamplesFactory.cpp
+++ b/GUI/Model/FromCore/GUIExamplesFactory.cpp
@@ -15,7 +15,7 @@
#include "GUI/Model/FromCore/GUIExamplesFactory.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/FromCore/ItemizeSample.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
#include <QMap>
namespace {
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.cpp b/Sample/StandardSample/BoxCompositionBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/BoxCompositionBuilder.cpp
rename to Sample/StandardSample/BoxCompositionBuilder.cpp
index 7f9b166a446..f4c312ec574 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.cpp
+++ b/Sample/StandardSample/BoxCompositionBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/BoxCompositionBuilder.cpp
+//! @file Sample/StandardSample/BoxCompositionBuilder.cpp
//! @brief Implements class BoxCompositionBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/BoxCompositionBuilder.h"
+#include "Sample/StandardSample/BoxCompositionBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -21,7 +21,7 @@
#include "Sample/Particle/Compound.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/BoxCompositionBuilder.h b/Sample/StandardSample/BoxCompositionBuilder.h
similarity index 85%
rename from Sample/StandardSamples/BoxCompositionBuilder.h
rename to Sample/StandardSample/BoxCompositionBuilder.h
index 3ca74b750fc..d71e0bf5893 100644
--- a/Sample/StandardSamples/BoxCompositionBuilder.h
+++ b/Sample/StandardSample/BoxCompositionBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/BoxCompositionBuilder.h
+//! @file Sample/StandardSample/BoxCompositionBuilder.h
//! @brief Defines classes of BoxCompositionBuilder family.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
class MultiLayer;
@@ -60,4 +60,4 @@ MultiLayer* createBoxStackComposition();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp b/Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
rename to Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
index 7e0420ab692..8e8aabbb388 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+++ b/Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/BoxesSquareLatticeBuilder.cpp
+//! @file Sample/StandardSample/BoxesSquareLatticeBuilder.cpp
//! @brief Implements class BoxesSquareLattice2DBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/BoxesSquareLatticeBuilder.h"
+#include "Sample/StandardSample/BoxesSquareLatticeBuilder.h"
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Correlation/Profiles2D.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
namespace {
MultiLayer* createBoxesSquareLattice2D(double length, double height, double lattice)
diff --git a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h b/Sample/StandardSample/BoxesSquareLatticeBuilder.h
similarity index 75%
rename from Sample/StandardSamples/BoxesSquareLatticeBuilder.h
rename to Sample/StandardSample/BoxesSquareLatticeBuilder.h
index 0e2e4b76083..dd7928352d0 100644
--- a/Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+++ b/Sample/StandardSample/BoxesSquareLatticeBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/BoxesSquareLatticeBuilder.h
+//! @file Sample/StandardSample/BoxesSquareLatticeBuilder.h
//! @brief Defines class BoxesSquareLattice2DBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
class MultiLayer;
@@ -30,4 +30,4 @@ MultiLayer* createBoxesLayer();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_BOXESSQUARELATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_BOXESSQUARELATTICEBUILDER_H
diff --git a/Sample/StandardSamples/CompoundBuilder.cpp b/Sample/StandardSample/CompoundBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/CompoundBuilder.cpp
rename to Sample/StandardSample/CompoundBuilder.cpp
index fdf92ab7a6e..e4f9af45552 100644
--- a/Sample/StandardSamples/CompoundBuilder.cpp
+++ b/Sample/StandardSample/CompoundBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CompoundBuilder.cpp
+//! @file Sample/StandardSample/CompoundBuilder.cpp
//! @brief Implements class CompoundBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/CompoundBuilder.h"
+#include "Sample/StandardSample/CompoundBuilder.h"
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Correlation/Profiles2D.h"
@@ -22,7 +22,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Compound.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
// --- CompoundBuilder ---
diff --git a/Sample/StandardSamples/CompoundBuilder.h b/Sample/StandardSample/CompoundBuilder.h
similarity index 79%
rename from Sample/StandardSamples/CompoundBuilder.h
rename to Sample/StandardSample/CompoundBuilder.h
index 5ec33ba791f..dadf56e37df 100644
--- a/Sample/StandardSamples/CompoundBuilder.h
+++ b/Sample/StandardSample/CompoundBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CompoundBuilder.h
+//! @file Sample/StandardSample/CompoundBuilder.h
//! @brief Defines class CompoundBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createCompoundPlus();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_COMPOUNDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_COMPOUNDBUILDER_H
diff --git a/Sample/StandardSamples/CoreAndShellBuilder.cpp b/Sample/StandardSample/CoreAndShellBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/CoreAndShellBuilder.cpp
rename to Sample/StandardSample/CoreAndShellBuilder.cpp
index 98a478ec9b1..4c12c03998c 100644
--- a/Sample/StandardSamples/CoreAndShellBuilder.cpp
+++ b/Sample/StandardSample/CoreAndShellBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CoreAndShellBuilder.cpp
+//! @file Sample/StandardSample/CoreAndShellBuilder.cpp
//! @brief Implements class CoreShellParticleBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/CoreAndShellBuilder.h"
+#include "Sample/StandardSample/CoreAndShellBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -21,7 +21,7 @@
#include "Sample/Particle/CoreAndShell.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/CoreAndShellBuilder.h b/Sample/StandardSample/CoreAndShellBuilder.h
similarity index 80%
rename from Sample/StandardSamples/CoreAndShellBuilder.h
rename to Sample/StandardSample/CoreAndShellBuilder.h
index a9f3544cf6a..0a718884978 100644
--- a/Sample/StandardSamples/CoreAndShellBuilder.h
+++ b/Sample/StandardSample/CoreAndShellBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CoreAndShellBuilder.h
+//! @file Sample/StandardSample/CoreAndShellBuilder.h
//! @brief Defines class CoreShellParticleBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
class MultiLayer;
@@ -36,4 +36,4 @@ MultiLayer* createCoreShellBoxRotateZandY();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_COREANDSHELLBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_COREANDSHELLBUILDER_H
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.cpp b/Sample/StandardSample/CustomMorphologyBuilder.cpp
similarity index 95%
rename from Sample/StandardSamples/CustomMorphologyBuilder.cpp
rename to Sample/StandardSample/CustomMorphologyBuilder.cpp
index 3e4871e587d..b35b87b5689 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.cpp
+++ b/Sample/StandardSample/CustomMorphologyBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CustomMorphologyBuilder.cpp
+//! @file Sample/StandardSample/CustomMorphologyBuilder.cpp
//! @brief Implements class CustomMorphologyBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/CustomMorphologyBuilder.h"
+#include "Sample/StandardSample/CustomMorphologyBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/CustomMorphologyBuilder.h b/Sample/StandardSample/CustomMorphologyBuilder.h
similarity index 75%
rename from Sample/StandardSamples/CustomMorphologyBuilder.h
rename to Sample/StandardSample/CustomMorphologyBuilder.h
index feae8f4b650..46c07d1d588 100644
--- a/Sample/StandardSamples/CustomMorphologyBuilder.h
+++ b/Sample/StandardSample/CustomMorphologyBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CustomMorphologyBuilder.h
+//! @file Sample/StandardSample/CustomMorphologyBuilder.h
//! @brief Defines class CustomMorphologyBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createCustomMorphology();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CUSTOMMORPHOLOGYBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CUSTOMMORPHOLOGYBUILDER_H
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp b/Sample/StandardSample/CylindersAndPrismsBuilder.cpp
similarity index 88%
rename from Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
rename to Sample/StandardSample/CylindersAndPrismsBuilder.cpp
index b712bdfdb6e..7fc1ef6816d 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
+++ b/Sample/StandardSample/CylindersAndPrismsBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CylindersAndPrismsBuilder.cpp
+//! @file Sample/StandardSample/CylindersAndPrismsBuilder.cpp
//! @brief Implements class CylindersAndPrismsBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/HardParticle/Polyhedra.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createCylindersAndPrisms()
{
diff --git a/Sample/StandardSamples/CylindersAndPrismsBuilder.h b/Sample/StandardSample/CylindersAndPrismsBuilder.h
similarity index 75%
rename from Sample/StandardSamples/CylindersAndPrismsBuilder.h
rename to Sample/StandardSample/CylindersAndPrismsBuilder.h
index 6513b6ec6cf..9149892d187 100644
--- a/Sample/StandardSamples/CylindersAndPrismsBuilder.h
+++ b/Sample/StandardSample/CylindersAndPrismsBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CylindersAndPrismsBuilder.h
+//! @file Sample/StandardSample/CylindersAndPrismsBuilder.h
//! @brief Defines class CylindersAndPrismsBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createCylindersAndPrisms();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSANDPRISMSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSANDPRISMSBUILDER_H
diff --git a/Sample/StandardSamples/CylindersBuilder.cpp b/Sample/StandardSample/CylindersBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/CylindersBuilder.cpp
rename to Sample/StandardSample/CylindersBuilder.cpp
index 7b3bf16c721..e3232dc2daa 100644
--- a/Sample/StandardSamples/CylindersBuilder.cpp
+++ b/Sample/StandardSample/CylindersBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CylindersBuilder.cpp
+//! @file Sample/StandardSample/CylindersBuilder.cpp
//! @brief Implements classes of CylindersBuilder family.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/CylindersBuilder.h"
+#include "Sample/StandardSample/CylindersBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/Interface/LayerInterface.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createCylindersInDWBA()
{
diff --git a/Sample/StandardSamples/CylindersBuilder.h b/Sample/StandardSample/CylindersBuilder.h
similarity index 82%
rename from Sample/StandardSamples/CylindersBuilder.h
rename to Sample/StandardSample/CylindersBuilder.h
index d299e13f631..2a4321d2255 100644
--- a/Sample/StandardSamples/CylindersBuilder.h
+++ b/Sample/StandardSample/CylindersBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/CylindersBuilder.h
+//! @file Sample/StandardSample/CylindersBuilder.h
//! @brief Defines classes of CylindersBuilder family.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
class MultiLayer;
@@ -33,4 +33,4 @@ MultiLayer* createLargeCylindersInDWBA(double height = 1000, double radius = 500
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_CYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_CYLINDERSBUILDER_H
diff --git a/Sample/StandardSample/ExemplarySamples.h b/Sample/StandardSample/ExemplarySamples.h
new file mode 100644
index 00000000000..6287cd40c57
--- /dev/null
+++ b/Sample/StandardSample/ExemplarySamples.h
@@ -0,0 +1,53 @@
+// ************************************************************************************************
+//
+// BornAgain: simulate and fit reflection and scattering
+//
+//! @file Sample/StandardSample/ExemplarySamples.h
+//! @brief includes all StandardSample headers.
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2018
+//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
+//
+// ************************************************************************************************
+
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
+
+class MultiLayer;
+
+#include "Sample/StandardSample/BoxCompositionBuilder.h"
+#include "Sample/StandardSample/BoxesSquareLatticeBuilder.h"
+#include "Sample/StandardSample/CompoundBuilder.h"
+#include "Sample/StandardSample/CoreAndShellBuilder.h"
+#include "Sample/StandardSample/CustomMorphologyBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/CylindersBuilder.h"
+#include "Sample/StandardSample/FeNiBilayerBuilder.h"
+#include "Sample/StandardSample/HomogeneousMultilayerBuilder.h"
+#include "Sample/StandardSample/LatticeBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h"
+#include "Sample/StandardSample/MagneticLayersBuilder.h"
+#include "Sample/StandardSample/MagneticParticlesBuilder.h"
+#include "Sample/StandardSample/MesocrystalBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h"
+#include "Sample/StandardSample/MultipleLayoutBuilder.h"
+#include "Sample/StandardSample/ParacrystalBuilder.h"
+#include "Sample/StandardSample/ParticleDistributionsBuilder.h"
+#include "Sample/StandardSample/ParticleInVacuumBuilder.h"
+#include "Sample/StandardSample/PercusYevickBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/ResonatorBuilder.h"
+#include "Sample/StandardSample/RipplesBuilder.h"
+#include "Sample/StandardSample/RotatedPyramidsBuilder.h"
+#include "Sample/StandardSample/SimpleLayerBuilder.h"
+#include "Sample/StandardSample/SizeDistributionModelsBuilder.h"
+#include "Sample/StandardSample/SlicedCompositionBuilder.h"
+#include "Sample/StandardSample/SlicedCylindersBuilder.h"
+#include "Sample/StandardSample/ThickAbsorptiveSampleBuilder.h"
+#include "Sample/StandardSample/TransformationsBuilder.h"
+#include "Sample/StandardSample/TwoDimLatticeBuilder.h"
+
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_EXEMPLARYSAMPLES_H
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.cpp b/Sample/StandardSample/FeNiBilayerBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/FeNiBilayerBuilder.cpp
rename to Sample/StandardSample/FeNiBilayerBuilder.cpp
index 0df3954766b..40bcc800dcf 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.cpp
+++ b/Sample/StandardSample/FeNiBilayerBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/FeNiBilayerBuilder.cpp
+//! @file Sample/StandardSample/FeNiBilayerBuilder.cpp
//! @brief Defines various sample builder classes to.
//! test polarized specular computations
//!
@@ -13,7 +13,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/FeNiBilayerBuilder.h"
+#include "Sample/StandardSample/FeNiBilayerBuilder.h"
#include "Base/Const/PhysicalConstants.h"
#include "Base/Const/Units.h"
#include "Sample/Interface/LayerRoughness.h"
diff --git a/Sample/StandardSamples/FeNiBilayerBuilder.h b/Sample/StandardSample/FeNiBilayerBuilder.h
similarity index 84%
rename from Sample/StandardSamples/FeNiBilayerBuilder.h
rename to Sample/StandardSample/FeNiBilayerBuilder.h
index c2f18eb3a04..c5b1f25758d 100644
--- a/Sample/StandardSamples/FeNiBilayerBuilder.h
+++ b/Sample/StandardSample/FeNiBilayerBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/FeNiBilayerBuilder.h
+//! @file Sample/StandardSample/FeNiBilayerBuilder.h
//! @brief Defines various sample builder classes to.
//! test polarized specular computations
//!
@@ -16,8 +16,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
class MultiLayer;
@@ -57,4 +57,4 @@ MultiLayer* createFeNiBilayerSpinFlipNC();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_FENIBILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_FENIBILAYERBUILDER_H
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp b/Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
similarity index 92%
rename from Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
rename to Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
index cf44ffee424..6f9d7c30ee4 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
+++ b/Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/HomogeneousMultilayerBuilder.cpp
+//! @file Sample/StandardSample/HomogeneousMultilayerBuilder.cpp
//! @brief Implements class HomogeneousMultilayerBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/HomogeneousMultilayerBuilder.h"
+#include "Sample/StandardSample/HomogeneousMultilayerBuilder.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h b/Sample/StandardSample/HomogeneousMultilayerBuilder.h
similarity index 77%
rename from Sample/StandardSamples/HomogeneousMultilayerBuilder.h
rename to Sample/StandardSample/HomogeneousMultilayerBuilder.h
index 7ddee607be3..a7a8f58dca2 100644
--- a/Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+++ b/Sample/StandardSample/HomogeneousMultilayerBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/HomogeneousMultilayerBuilder.h
+//! @file Sample/StandardSample/HomogeneousMultilayerBuilder.h
//! @brief Defines class HomogeneousMultilayerBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
class MultiLayer;
@@ -30,4 +30,4 @@ MultiLayer* createHomogeneousMultilayer();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_HOMOGENEOUSMULTILAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_HOMOGENEOUSMULTILAYERBUILDER_H
diff --git a/Sample/StandardSamples/LatticeBuilder.cpp b/Sample/StandardSample/LatticeBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/LatticeBuilder.cpp
rename to Sample/StandardSample/LatticeBuilder.cpp
index d68eb0952b3..cd20ffebb5e 100644
--- a/Sample/StandardSamples/LatticeBuilder.cpp
+++ b/Sample/StandardSample/LatticeBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LatticeBuilder.cpp
+//! @file Sample/StandardSample/LatticeBuilder.cpp
//! @brief Implements class Lattice1DBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/LatticeBuilder.h"
+#include "Sample/StandardSample/LatticeBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Sample/Aggregate/ParticleLayout.h"
@@ -22,7 +22,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/LatticeBuilder.h b/Sample/StandardSample/LatticeBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LatticeBuilder.h
rename to Sample/StandardSample/LatticeBuilder.h
index 12931acc57c..da5a722c365 100644
--- a/Sample/StandardSamples/LatticeBuilder.h
+++ b/Sample/StandardSample/LatticeBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LatticeBuilder.h
+//! @file Sample/StandardSample/LatticeBuilder.h
//! @brief Defines class Lattice1DBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createLattice1D();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LATTICEBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp b/Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
similarity index 89%
rename from Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
rename to Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
index d66ad4fa999..29378c7256f 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+++ b/Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LayersWithAbsorptionBuilder.cpp
+//! @file Sample/StandardSample/LayersWithAbsorptionBuilder.cpp
//! @brief Implements class LayersWithAbsorptionBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/LayersWithAbsorptionBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Sphere.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h b/Sample/StandardSample/LayersWithAbsorptionBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LayersWithAbsorptionBuilder.h
rename to Sample/StandardSample/LayersWithAbsorptionBuilder.h
index 02d20cc3cec..919c284f343 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+++ b/Sample/StandardSample/LayersWithAbsorptionBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LayersWithAbsorptionBuilder.h
+//! @file Sample/StandardSample/LayersWithAbsorptionBuilder.h
//! @brief Defines class LayersWithAbsorptionBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
class IFormFactor;
class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createLayersWithAbsorptionWithFF(const IFormFactor*);
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBUILDER_H
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
rename to Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
index 9322ac34a18..3e98e0c5a9f 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+++ b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.cpp
+//! @file Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.cpp
//! @brief Implements class LayersWithAbsorptionBySLDBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h"
+#include "Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Sphere.h"
diff --git a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
similarity index 77%
rename from Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
rename to Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
index e0fc218ac6e..8cc9eeac406 100644
--- a/Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+++ b/Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h
+//! @file Sample/StandardSample/LayersWithAbsorptionBySLDBuilder.h
//! @brief Defines class LayersWithAbsorptionBySLDBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
class MultiLayer;
@@ -30,4 +30,4 @@ MultiLayer* createLayersWithAbsorptionBySLD();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_LAYERSWITHABSORPTIONBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_LAYERSWITHABSORPTIONBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.cpp b/Sample/StandardSample/MagneticLayersBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/MagneticLayersBuilder.cpp
rename to Sample/StandardSample/MagneticLayersBuilder.cpp
index 66c338c2f21..77dfc3a4e5f 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.cpp
+++ b/Sample/StandardSample/MagneticLayersBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MagneticLayersBuilder.cpp
+//! @file Sample/StandardSample/MagneticLayersBuilder.cpp
//! @brief Implements class to build samples with magnetic layers.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MagneticLayersBuilder.h"
+#include "Sample/StandardSample/MagneticLayersBuilder.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "Sample/Aggregate/ParticleLayout.h"
diff --git a/Sample/StandardSamples/MagneticLayersBuilder.h b/Sample/StandardSample/MagneticLayersBuilder.h
similarity index 86%
rename from Sample/StandardSamples/MagneticLayersBuilder.h
rename to Sample/StandardSample/MagneticLayersBuilder.h
index 915eb4221af..d7943f40bd1 100644
--- a/Sample/StandardSamples/MagneticLayersBuilder.h
+++ b/Sample/StandardSample/MagneticLayersBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MagneticLayersBuilder.h
+//! @file Sample/StandardSample/MagneticLayersBuilder.h
//! @brief Defines class to build samples with magnetic layers.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
class MultiLayer;
@@ -62,4 +62,4 @@ MultiLayer* createMagneticRotation();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICLAYERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICLAYERSBUILDER_H
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.cpp b/Sample/StandardSample/MagneticParticlesBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/MagneticParticlesBuilder.cpp
rename to Sample/StandardSample/MagneticParticlesBuilder.cpp
index 729c3913167..ee6321dbc4a 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.cpp
+++ b/Sample/StandardSample/MagneticParticlesBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MagneticParticlesBuilder.cpp
+//! @file Sample/StandardSample/MagneticParticlesBuilder.cpp
//! @brief Implements classes to build magnetic samples.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MagneticParticlesBuilder.h"
+#include "Sample/StandardSample/MagneticParticlesBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/HardParticle/Sphere.h"
diff --git a/Sample/StandardSamples/MagneticParticlesBuilder.h b/Sample/StandardSample/MagneticParticlesBuilder.h
similarity index 81%
rename from Sample/StandardSamples/MagneticParticlesBuilder.h
rename to Sample/StandardSample/MagneticParticlesBuilder.h
index 5eff113f38a..03195cd670d 100644
--- a/Sample/StandardSamples/MagneticParticlesBuilder.h
+++ b/Sample/StandardSample/MagneticParticlesBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MagneticParticlesBuilder.h
+//! @file Sample/StandardSample/MagneticParticlesBuilder.h
//! @brief Defines class to build magnetic samples.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
class MultiLayer;
@@ -44,4 +44,4 @@ MultiLayer* createMagneticSpheres();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MAGNETICPARTICLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MAGNETICPARTICLESBUILDER_H
diff --git a/Sample/StandardSamples/MesocrystalBuilder.cpp b/Sample/StandardSample/MesocrystalBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/MesocrystalBuilder.cpp
rename to Sample/StandardSample/MesocrystalBuilder.cpp
index c35103519dc..bd4f97fd5f9 100644
--- a/Sample/StandardSamples/MesocrystalBuilder.cpp
+++ b/Sample/StandardSample/MesocrystalBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MesocrystalBuilder.cpp
+//! @file Sample/StandardSample/MesocrystalBuilder.cpp
//! @brief Implements class MesocrystalBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MesocrystalBuilder.h"
+#include "Sample/StandardSample/MesocrystalBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -23,7 +23,7 @@
#include "Sample/Particle/Crystal.h"
#include "Sample/Particle/Mesocrystal.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createMesocrystal()
{
diff --git a/Sample/StandardSamples/MesocrystalBuilder.h b/Sample/StandardSample/MesocrystalBuilder.h
similarity index 79%
rename from Sample/StandardSamples/MesocrystalBuilder.h
rename to Sample/StandardSample/MesocrystalBuilder.h
index 7448093fece..0f48baa9ca6 100644
--- a/Sample/StandardSamples/MesocrystalBuilder.h
+++ b/Sample/StandardSample/MesocrystalBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MesocrystalBuilder.h
+//! @file Sample/StandardSample/MesocrystalBuilder.h
//! @brief Defines class MesocrystalBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createMesocrystalPlus();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MESOCRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MESOCRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
similarity index 85%
rename from Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
rename to Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
index 247e45c8506..31228462c37 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+++ b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.cpp
+//! @file Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.cpp
//! @brief Implement class MultiLayerWithNCRoughnessBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
similarity index 69%
rename from Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
rename to Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
index 44466c07670..b2382caab79 100644
--- a/Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+++ b/Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h
+//! @file Sample/StandardSample/MultiLayerWithNCRoughnessBuilder.h
//! @brief Defines class MultiLayerWithNCRoughnessBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,12 +15,12 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
class MultiLayer;
-#include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithRoughnessBuilder.h"
//! Builds sample: layers with correlated roughness.
@@ -30,4 +30,4 @@ MultiLayer* createMultiLayerWithNCRoughness();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHNCROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHNCROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
rename to Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
index 30c59abf582..d47c50ac1de 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+++ b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultiLayerWithRoughnessBuilder.cpp
+//! @file Sample/StandardSample/MultiLayerWithRoughnessBuilder.cpp
//! @brief Implement class MultiLayerWithRoughnessBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h"
+#include "Sample/StandardSample/MultiLayerWithRoughnessBuilder.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
similarity index 73%
rename from Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
rename to Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
index bf58867e2ad..4115c3084f3 100644
--- a/Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+++ b/Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultiLayerWithRoughnessBuilder.h
+//! @file Sample/StandardSample/MultiLayerWithRoughnessBuilder.h
//! @brief Defines class MultiLayerWithRoughnessBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createMultiLayerWithRoughness();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTILAYERWITHROUGHNESSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTILAYERWITHROUGHNESSBUILDER_H
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.cpp b/Sample/StandardSample/MultipleLayoutBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/MultipleLayoutBuilder.cpp
rename to Sample/StandardSample/MultipleLayoutBuilder.cpp
index f70025583d1..0da086ceb99 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.cpp
+++ b/Sample/StandardSample/MultipleLayoutBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultipleLayoutBuilder.cpp
+//! @file Sample/StandardSample/MultipleLayoutBuilder.cpp
//! @brief Implements class MultipleLayoutBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/MultipleLayoutBuilder.h"
+#include "Sample/StandardSample/MultipleLayoutBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/HardParticle/Polyhedra.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createMultipleLayout()
{
diff --git a/Sample/StandardSamples/MultipleLayoutBuilder.h b/Sample/StandardSample/MultipleLayoutBuilder.h
similarity index 77%
rename from Sample/StandardSamples/MultipleLayoutBuilder.h
rename to Sample/StandardSample/MultipleLayoutBuilder.h
index 5b4f020ccaf..4de79862808 100644
--- a/Sample/StandardSamples/MultipleLayoutBuilder.h
+++ b/Sample/StandardSample/MultipleLayoutBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/MultipleLayoutBuilder.h
+//! @file Sample/StandardSample/MultipleLayoutBuilder.h
//! @brief Defines class MultipleLayoutBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
class MultiLayer;
@@ -29,4 +29,4 @@ MultiLayer* createMultipleLayout();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_MULTIPLELAYOUTBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_MULTIPLELAYOUTBUILDER_H
diff --git a/Sample/StandardSamples/ParacrystalBuilder.cpp b/Sample/StandardSample/ParacrystalBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/ParacrystalBuilder.cpp
rename to Sample/StandardSample/ParacrystalBuilder.cpp
index 7335e9739a5..6ccccf5d168 100644
--- a/Sample/StandardSamples/ParacrystalBuilder.cpp
+++ b/Sample/StandardSample/ParacrystalBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParacrystalBuilder.cpp
+//! @file Sample/StandardSample/ParacrystalBuilder.cpp
//! @brief Implements class ParacrystalBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/ParacrystalBuilder.h"
+#include "Sample/StandardSample/ParacrystalBuilder.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "Sample/Aggregate/Interference2DParacrystal.h"
@@ -22,7 +22,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/ParacrystalBuilder.h b/Sample/StandardSample/ParacrystalBuilder.h
similarity index 86%
rename from Sample/StandardSamples/ParacrystalBuilder.h
rename to Sample/StandardSample/ParacrystalBuilder.h
index 39fa5fdf8b2..f00a368bf16 100644
--- a/Sample/StandardSamples/ParacrystalBuilder.h
+++ b/Sample/StandardSample/ParacrystalBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParacrystalBuilder.h
+//! @file Sample/StandardSample/ParacrystalBuilder.h
//! @brief Defines classes of ParacrystalBuilder family.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
class IProfile2D;
class MultiLayer;
@@ -55,4 +55,4 @@ MultiLayer* createRectParacrystal();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARACRYSTALBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARACRYSTALBUILDER_H
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp b/Sample/StandardSample/ParticleDistributionsBuilder.cpp
similarity index 98%
rename from Sample/StandardSamples/ParticleDistributionsBuilder.cpp
rename to Sample/StandardSample/ParticleDistributionsBuilder.cpp
index 129dc4bca83..90d90cb205d 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+++ b/Sample/StandardSample/ParticleDistributionsBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParticleDistributionsBuilder.cpp
+//! @file Sample/StandardSample/ParticleDistributionsBuilder.cpp
//! @brief Implements classes of with different types of particle distributions.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/ParticleDistributionsBuilder.h"
+#include "Sample/StandardSample/ParticleDistributionsBuilder.h"
#include "Param/Distrib/Distributions.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cone.h"
@@ -22,7 +22,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createCylindersWithSizeDistribution()
{
diff --git a/Sample/StandardSamples/ParticleDistributionsBuilder.h b/Sample/StandardSample/ParticleDistributionsBuilder.h
similarity index 86%
rename from Sample/StandardSamples/ParticleDistributionsBuilder.h
rename to Sample/StandardSample/ParticleDistributionsBuilder.h
index 680c80664e6..e9cbec98f0c 100644
--- a/Sample/StandardSamples/ParticleDistributionsBuilder.h
+++ b/Sample/StandardSample/ParticleDistributionsBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParticleDistributionsBuilder.h
+//! @file Sample/StandardSample/ParticleDistributionsBuilder.h
//! @brief Defines classes of with different types of particle distributions.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
class MultiLayer;
@@ -68,4 +68,4 @@ MultiLayer* createLinkedBoxDistribution();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEDISTRIBUTIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEDISTRIBUTIONSBUILDER_H
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp b/Sample/StandardSample/ParticleInVacuumBuilder.cpp
similarity index 86%
rename from Sample/StandardSamples/ParticleInVacuumBuilder.cpp
rename to Sample/StandardSample/ParticleInVacuumBuilder.cpp
index 166b0065b7f..705c2fbf689 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.cpp
+++ b/Sample/StandardSample/ParticleInVacuumBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParticleInVacuumBuilder.cpp
+//! @file Sample/StandardSample/ParticleInVacuumBuilder.cpp
//! @brief Implements class ParticleInVacuumBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/ParticleInVacuumBuilder.h"
+#include "Sample/StandardSample/ParticleInVacuumBuilder.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Sphere.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
#include <iostream>
MultiLayer* ExemplarySamples::createParticleInVacuumWithFF(const IFormFactor* ff)
diff --git a/Sample/StandardSamples/ParticleInVacuumBuilder.h b/Sample/StandardSample/ParticleInVacuumBuilder.h
similarity index 77%
rename from Sample/StandardSamples/ParticleInVacuumBuilder.h
rename to Sample/StandardSample/ParticleInVacuumBuilder.h
index 970761e7192..f4b21fe0f2e 100644
--- a/Sample/StandardSamples/ParticleInVacuumBuilder.h
+++ b/Sample/StandardSample/ParticleInVacuumBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ParticleInVacuumBuilder.h
+//! @file Sample/StandardSample/ParticleInVacuumBuilder.h
//! @brief Defines class ParticleInVacuumBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
class IFormFactor;
class MultiLayer;
@@ -30,4 +30,4 @@ MultiLayer* createParticleInVacuumWithFF(const IFormFactor*);
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PARTICLEINVACUUMBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PARTICLEINVACUUMBUILDER_H
diff --git a/Sample/StandardSamples/PercusYevickBuilder.cpp b/Sample/StandardSample/PercusYevickBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/PercusYevickBuilder.cpp
rename to Sample/StandardSample/PercusYevickBuilder.cpp
index be6a3deac61..806f07c5718 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.cpp
+++ b/Sample/StandardSample/PercusYevickBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/PercusYevickBuilder.cpp
+//! @file Sample/StandardSample/PercusYevickBuilder.cpp
//! @brief Implements class PercusYevickBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/PercusYevickBuilder.h"
+#include "Sample/StandardSample/PercusYevickBuilder.h"
#include "Sample/Aggregate/InterferenceHardDisk.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createHardDisk()
{
diff --git a/Sample/StandardSamples/PercusYevickBuilder.h b/Sample/StandardSample/PercusYevickBuilder.h
similarity index 76%
rename from Sample/StandardSamples/PercusYevickBuilder.h
rename to Sample/StandardSample/PercusYevickBuilder.h
index 4eff14427e7..1e324570861 100644
--- a/Sample/StandardSamples/PercusYevickBuilder.h
+++ b/Sample/StandardSample/PercusYevickBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/PercusYevickBuilder.h
+//! @file Sample/StandardSample/PercusYevickBuilder.h
//! @brief Defines classes of PercusYevickBuilder family.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createHardDisk();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PERCUSYEVICKBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PERCUSYEVICKBUILDER_H
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
rename to Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
index f39e69c963f..56b610a1448 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+++ b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/PlainMultiLayerBySLDBuilder.cpp
+//! @file Sample/StandardSample/PlainMultiLayerBySLDBuilder.cpp
//! @brief Implements class PlainMultiLayerBySLDBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
similarity index 77%
rename from Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
rename to Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
index accf8853c96..835ee60b93e 100644
--- a/Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+++ b/Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h
+//! @file Sample/StandardSample/PlainMultiLayerBySLDBuilder.h
//! @brief Declares class the PlainMultiLayerBySLDBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
class MultiLayer;
@@ -29,4 +29,4 @@ MultiLayer* createPlainMultiLayerBySLD(int n_layers = 10, double thick_ti = 3.0)
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_PLAINMULTILAYERBYSLDBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_PLAINMULTILAYERBYSLDBUILDER_H
diff --git a/Sample/StandardSamples/ReferenceMaterials.h b/Sample/StandardSample/ReferenceMaterials.h
similarity index 84%
rename from Sample/StandardSamples/ReferenceMaterials.h
rename to Sample/StandardSample/ReferenceMaterials.h
index 6bacfa2ca8e..7c9227cedcd 100644
--- a/Sample/StandardSamples/ReferenceMaterials.h
+++ b/Sample/StandardSample/ReferenceMaterials.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ReferenceMaterials.h
+//! @file Sample/StandardSample/ReferenceMaterials.h
//! @brief Defines materials in namespace refMat.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
class MultiLayer;
@@ -38,4 +38,4 @@ const Material Substrate2 = RefractiveMaterial("Substrate2", 3.212e-6, 3.244e-8)
} // namespace refMat
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_REFERENCEMATERIALS_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_REFERENCEMATERIALS_H
diff --git a/Sample/StandardSamples/ResonatorBuilder.cpp b/Sample/StandardSample/ResonatorBuilder.cpp
similarity index 94%
rename from Sample/StandardSamples/ResonatorBuilder.cpp
rename to Sample/StandardSample/ResonatorBuilder.cpp
index 3ced2372999..89b480235b5 100644
--- a/Sample/StandardSamples/ResonatorBuilder.cpp
+++ b/Sample/StandardSample/ResonatorBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ResonatorBuilder.cpp
+//! @file Sample/StandardSample/ResonatorBuilder.cpp
//! @brief Implements class ResonatorBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/ResonatorBuilder.h"
+#include "Sample/StandardSample/ResonatorBuilder.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/ResonatorBuilder.h b/Sample/StandardSample/ResonatorBuilder.h
similarity index 77%
rename from Sample/StandardSamples/ResonatorBuilder.h
rename to Sample/StandardSample/ResonatorBuilder.h
index 5ced26c27b5..cd2c8ef0b27 100644
--- a/Sample/StandardSamples/ResonatorBuilder.h
+++ b/Sample/StandardSample/ResonatorBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ResonatorBuilder.h
+//! @file Sample/StandardSample/ResonatorBuilder.h
//! @brief Defines class ResonatorBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createResonator(double ti_thickness = 13.0);
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RESONATORBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_RESONATORBUILDER_H
diff --git a/Sample/StandardSamples/RipplesBuilder.cpp b/Sample/StandardSample/RipplesBuilder.cpp
similarity index 93%
rename from Sample/StandardSamples/RipplesBuilder.cpp
rename to Sample/StandardSample/RipplesBuilder.cpp
index 484e1c6b15c..e4a0fb69359 100644
--- a/Sample/StandardSamples/RipplesBuilder.cpp
+++ b/Sample/StandardSample/RipplesBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/RipplesBuilder.cpp
+//! @file Sample/StandardSample/RipplesBuilder.cpp
//! @brief Implement classes to build various ripples.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/RipplesBuilder.h"
+#include "Sample/StandardSample/RipplesBuilder.h"
#include "Sample/Aggregate/InterferenceRadialParacrystal.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/CosineRipple.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createCosineRipple()
{
diff --git a/Sample/StandardSamples/RipplesBuilder.h b/Sample/StandardSample/RipplesBuilder.h
similarity index 83%
rename from Sample/StandardSamples/RipplesBuilder.h
rename to Sample/StandardSample/RipplesBuilder.h
index d4c3fd16cab..a16f88fa5e1 100644
--- a/Sample/StandardSamples/RipplesBuilder.h
+++ b/Sample/StandardSample/RipplesBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/RipplesBuilder.h
+//! @file Sample/StandardSample/RipplesBuilder.h
//! @brief Defines classes to build various ripples.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
class MultiLayer;
@@ -42,4 +42,4 @@ MultiLayer* createAsymRipple();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_RIPPLESBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_RIPPLESBUILDER_H
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp b/Sample/StandardSample/RotatedPyramidsBuilder.cpp
similarity index 89%
rename from Sample/StandardSamples/RotatedPyramidsBuilder.cpp
rename to Sample/StandardSample/RotatedPyramidsBuilder.cpp
index 8c5b0efe9de..0a498108b15 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.cpp
+++ b/Sample/StandardSample/RotatedPyramidsBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/RotatedPyramidsBuilder.cpp
+//! @file Sample/StandardSample/RotatedPyramidsBuilder.cpp
//! @brief Implements classe RotatedPyramidsBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/RotatedPyramidsBuilder.h"
+#include "Sample/StandardSample/RotatedPyramidsBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/RotatedPyramidsBuilder.h b/Sample/StandardSample/RotatedPyramidsBuilder.h
similarity index 76%
rename from Sample/StandardSamples/RotatedPyramidsBuilder.h
rename to Sample/StandardSample/RotatedPyramidsBuilder.h
index 36e98816c58..891e9b1fb84 100644
--- a/Sample/StandardSamples/RotatedPyramidsBuilder.h
+++ b/Sample/StandardSample/RotatedPyramidsBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/RotatedPyramidsBuilder.h
+//! @file Sample/StandardSample/RotatedPyramidsBuilder.h
//! @brief Defines class RotatedPyramidsBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createRotatedPyramids();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_ROTATEDPYRAMIDSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_ROTATEDPYRAMIDSBUILDER_H
diff --git a/Sample/StandardSamples/SimpleLayerBuilder.cpp b/Sample/StandardSample/SimpleLayerBuilder.cpp
similarity index 85%
rename from Sample/StandardSamples/SimpleLayerBuilder.cpp
rename to Sample/StandardSample/SimpleLayerBuilder.cpp
index 8a693cdbd32..cebccb1bd06 100644
--- a/Sample/StandardSamples/SimpleLayerBuilder.cpp
+++ b/Sample/StandardSample/SimpleLayerBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SimpleLayerBuilder.cpp
+//! @file Sample/StandardSample/SimpleLayerBuilder.cpp
//! @brief Implements class SimpleLayerBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/SimpleLayerBuilder.h"
+#include "Sample/StandardSample/SimpleLayerBuilder.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createSimpleLayer()
{
diff --git a/Sample/StandardSamples/SimpleLayerBuilder.h b/Sample/StandardSample/SimpleLayerBuilder.h
similarity index 77%
rename from Sample/StandardSamples/SimpleLayerBuilder.h
rename to Sample/StandardSample/SimpleLayerBuilder.h
index c4f4eb094ba..b5afbb067b3 100644
--- a/Sample/StandardSamples/SimpleLayerBuilder.h
+++ b/Sample/StandardSample/SimpleLayerBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SimpleLayerBuilder.h
+//! @file Sample/StandardSample/SimpleLayerBuilder.h
//! @brief Defines class SimpleLayerBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
class IFormFactor;
class MultiLayer;
@@ -29,4 +29,4 @@ MultiLayer* createSimpleLayer();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERBUILDER_H
diff --git a/Sample/StandardSamples/SimpleLayersBuilder.h b/Sample/StandardSample/SimpleLayersBuilder.h
similarity index 79%
rename from Sample/StandardSamples/SimpleLayersBuilder.h
rename to Sample/StandardSample/SimpleLayersBuilder.h
index 487982417a5..bbff11f9499 100644
--- a/Sample/StandardSamples/SimpleLayersBuilder.h
+++ b/Sample/StandardSample/SimpleLayersBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SimpleLayersBuilder.h
+//! @file Sample/StandardSample/SimpleLayersBuilder.h
//! @brief Defines class LayersWithAbsorptionBuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
class IFormFactor;
class MultiLayer;
@@ -32,4 +32,4 @@ MultiLayer* createLayersWithAbsorptionWithFF(const IFormFactor*);
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIMPLELAYERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIMPLELAYERSBUILDER_H
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp b/Sample/StandardSample/SizeDistributionModelsBuilder.cpp
similarity index 96%
rename from Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
rename to Sample/StandardSample/SizeDistributionModelsBuilder.cpp
index 4726471c05b..717d0221fa6 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+++ b/Sample/StandardSample/SizeDistributionModelsBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SizeDistributionModelsBuilder.cpp
+//! @file Sample/StandardSample/SizeDistributionModelsBuilder.cpp
//! @brief Implements class ParticlesInSSCABuilder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/SizeDistributionModelsBuilder.h"
+#include "Sample/StandardSample/SizeDistributionModelsBuilder.h"
#include "Param/Distrib/Distributions.h"
#include "Sample/Aggregate/InterferenceRadialParacrystal.h"
#include "Sample/Aggregate/ParticleLayout.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
MultiLayer* ExemplarySamples::createSizeDistributionDAModel()
{
diff --git a/Sample/StandardSamples/SizeDistributionModelsBuilder.h b/Sample/StandardSample/SizeDistributionModelsBuilder.h
similarity index 85%
rename from Sample/StandardSamples/SizeDistributionModelsBuilder.h
rename to Sample/StandardSample/SizeDistributionModelsBuilder.h
index 8eeae8dc253..9c8f9289416 100644
--- a/Sample/StandardSamples/SizeDistributionModelsBuilder.h
+++ b/Sample/StandardSample/SizeDistributionModelsBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SizeDistributionModelsBuilder.h
+//! @file Sample/StandardSample/SizeDistributionModelsBuilder.h
//! @brief Defines various sample builder classes to test DA, LMA, SSCA approximations.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
class MultiLayer;
@@ -55,4 +55,4 @@ MultiLayer* createCylindersInSSCA();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SIZEDISTRIBUTIONMODELSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SIZEDISTRIBUTIONMODELSBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.cpp b/Sample/StandardSample/SlicedCompositionBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/SlicedCompositionBuilder.cpp
rename to Sample/StandardSample/SlicedCompositionBuilder.cpp
index ce9ca9256e6..4f0dadf06e7 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.cpp
+++ b/Sample/StandardSample/SlicedCompositionBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SlicedCompositionBuilder.cpp
+//! @file Sample/StandardSample/SlicedCompositionBuilder.cpp
//! @brief Defines classes to build various particles crossing interfaces.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/SlicedCompositionBuilder.h"
+#include "Sample/StandardSample/SlicedCompositionBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/TruncatedSphere.h"
@@ -21,7 +21,7 @@
#include "Sample/Particle/Compound.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/SlicedCompositionBuilder.h b/Sample/StandardSample/SlicedCompositionBuilder.h
similarity index 76%
rename from Sample/StandardSamples/SlicedCompositionBuilder.h
rename to Sample/StandardSample/SlicedCompositionBuilder.h
index 31f413f1aa4..daea45c43a3 100644
--- a/Sample/StandardSamples/SlicedCompositionBuilder.h
+++ b/Sample/StandardSample/SlicedCompositionBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SlicedCompositionBuilder.h
+//! @file Sample/StandardSample/SlicedCompositionBuilder.h
//! @brief Defines classes to build various particles crossing interfaces.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createSlicedComposition();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCOMPOSITIONBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCOMPOSITIONBUILDER_H
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.cpp b/Sample/StandardSample/SlicedCylindersBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/SlicedCylindersBuilder.cpp
rename to Sample/StandardSample/SlicedCylindersBuilder.cpp
index 97e27c7cef5..2a00d4ac54d 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.cpp
+++ b/Sample/StandardSample/SlicedCylindersBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SlicedCylindersBuilder.cpp
+//! @file Sample/StandardSample/SlicedCylindersBuilder.cpp
//! @brief Implements classes for testing slicing machinery.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/SlicedCylindersBuilder.h"
+#include "Sample/StandardSample/SlicedCylindersBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Cylinder.h"
diff --git a/Sample/StandardSamples/SlicedCylindersBuilder.h b/Sample/StandardSample/SlicedCylindersBuilder.h
similarity index 83%
rename from Sample/StandardSamples/SlicedCylindersBuilder.h
rename to Sample/StandardSample/SlicedCylindersBuilder.h
index b6349471092..a165384ab63 100644
--- a/Sample/StandardSamples/SlicedCylindersBuilder.h
+++ b/Sample/StandardSample/SlicedCylindersBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/SlicedCylindersBuilder.h
+//! @file Sample/StandardSample/SlicedCylindersBuilder.h
//! @brief Defines classes for testing slicing machinery.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
class MultiLayer;
@@ -47,4 +47,4 @@ MultiLayer* createAveragedSlicedCylinders();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_SLICEDCYLINDERSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_SLICEDCYLINDERSBUILDER_H
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
similarity index 91%
rename from Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
rename to Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
index 57a6374cf98..7a72ac74a21 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+++ b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ThickAbsorptiveSampleBuilder.cpp
+//! @file Sample/StandardSample/ThickAbsorptiveSampleBuilder.cpp
//! @brief Implements class to build thick highly-absorptive sample with roughness.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
+#include "Sample/StandardSample/ThickAbsorptiveSampleBuilder.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
similarity index 73%
rename from Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
rename to Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
index 2a8d9c4bcd4..c2d45be5338 100644
--- a/Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+++ b/Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h
+//! @file Sample/StandardSample/ThickAbsorptiveSampleBuilder.h
//! @brief Defines class to build thick highly-absorptive sample with roughness.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
class MultiLayer;
@@ -26,4 +26,4 @@ MultiLayer* createThickAbsorptiveSample();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_THICKABSORPTIVESAMPLEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_THICKABSORPTIVESAMPLEBUILDER_H
diff --git a/Sample/StandardSamples/TransformationsBuilder.cpp b/Sample/StandardSample/TransformationsBuilder.cpp
similarity index 90%
rename from Sample/StandardSamples/TransformationsBuilder.cpp
rename to Sample/StandardSample/TransformationsBuilder.cpp
index 549d9835c85..77795ab44cf 100644
--- a/Sample/StandardSamples/TransformationsBuilder.cpp
+++ b/Sample/StandardSample/TransformationsBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/TransformationsBuilder.cpp
+//! @file Sample/StandardSample/TransformationsBuilder.cpp
//! @brief Implements classes to build samples with different transformations.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/TransformationsBuilder.h"
+#include "Sample/StandardSample/TransformationsBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/Polyhedra.h"
@@ -20,7 +20,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Scattering/Rotations.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/TransformationsBuilder.h b/Sample/StandardSample/TransformationsBuilder.h
similarity index 75%
rename from Sample/StandardSamples/TransformationsBuilder.h
rename to Sample/StandardSample/TransformationsBuilder.h
index 0c6d0d12aeb..841250cad36 100644
--- a/Sample/StandardSamples/TransformationsBuilder.h
+++ b/Sample/StandardSample/TransformationsBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/TransformationsBuilder.h
+//! @file Sample/StandardSample/TransformationsBuilder.h
//! @brief Defines classes to build samples with different transformations.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
class MultiLayer;
@@ -28,4 +28,4 @@ MultiLayer* createTransformBox();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TRANSFORMATIONSBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_TRANSFORMATIONSBUILDER_H
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp b/Sample/StandardSample/TwoDimLatticeBuilder.cpp
similarity index 97%
rename from Sample/StandardSamples/TwoDimLatticeBuilder.cpp
rename to Sample/StandardSample/TwoDimLatticeBuilder.cpp
index ffdd30a954b..b1588ff4290 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+++ b/Sample/StandardSample/TwoDimLatticeBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/TwoDimLatticeBuilder.cpp
+//! @file Sample/StandardSample/TwoDimLatticeBuilder.cpp
//! @brief Implements class IsGISAXS06Builder.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/StandardSamples/TwoDimLatticeBuilder.h"
+#include "Sample/StandardSample/TwoDimLatticeBuilder.h"
#include "Base/Const/Units.h"
#include "Sample/Aggregate/Interference2DLattice.h"
#include "Sample/Aggregate/Interference2DSuperLattice.h"
@@ -24,7 +24,7 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Particle/Compound.h"
#include "Sample/Particle/Particle.h"
-#include "Sample/StandardSamples/ReferenceMaterials.h"
+#include "Sample/StandardSample/ReferenceMaterials.h"
using Units::deg;
diff --git a/Sample/StandardSamples/TwoDimLatticeBuilder.h b/Sample/StandardSample/TwoDimLatticeBuilder.h
similarity index 87%
rename from Sample/StandardSamples/TwoDimLatticeBuilder.h
rename to Sample/StandardSample/TwoDimLatticeBuilder.h
index c3d84fa8de4..2a2da8b6e6f 100644
--- a/Sample/StandardSamples/TwoDimLatticeBuilder.h
+++ b/Sample/StandardSample/TwoDimLatticeBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/StandardSamples/TwoDimLatticeBuilder.h
+//! @file Sample/StandardSample/TwoDimLatticeBuilder.h
//! @brief Defines class IsGISAXS06Builder.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
+#define BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
class MultiLayer;
@@ -68,4 +68,4 @@ MultiLayer* createSuperLattice();
} // namespace ExemplarySamples
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_TWODIMLATTICEBUILDER_H
+#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLE_TWODIMLATTICEBUILDER_H
diff --git a/Sample/StandardSamples/ExemplarySamples.h b/Sample/StandardSamples/ExemplarySamples.h
deleted file mode 100644
index ea25d3806e3..00000000000
--- a/Sample/StandardSamples/ExemplarySamples.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// ************************************************************************************************
-//
-// BornAgain: simulate and fit reflection and scattering
-//
-//! @file Sample/StandardSamples/ExemplarySamples.h
-//! @brief includes all StandardSample headers.
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2018
-//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
-//
-// ************************************************************************************************
-
-#ifndef BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
-#define BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
-
-class MultiLayer;
-
-#include "Sample/StandardSamples/BoxCompositionBuilder.h"
-#include "Sample/StandardSamples/BoxesSquareLatticeBuilder.h"
-#include "Sample/StandardSamples/CompoundBuilder.h"
-#include "Sample/StandardSamples/CoreAndShellBuilder.h"
-#include "Sample/StandardSamples/CustomMorphologyBuilder.h"
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
-#include "Sample/StandardSamples/CylindersBuilder.h"
-#include "Sample/StandardSamples/FeNiBilayerBuilder.h"
-#include "Sample/StandardSamples/HomogeneousMultilayerBuilder.h"
-#include "Sample/StandardSamples/LatticeBuilder.h"
-#include "Sample/StandardSamples/LayersWithAbsorptionBuilder.h"
-#include "Sample/StandardSamples/LayersWithAbsorptionBySLDBuilder.h"
-#include "Sample/StandardSamples/MagneticLayersBuilder.h"
-#include "Sample/StandardSamples/MagneticParticlesBuilder.h"
-#include "Sample/StandardSamples/MesocrystalBuilder.h"
-#include "Sample/StandardSamples/MultiLayerWithNCRoughnessBuilder.h"
-#include "Sample/StandardSamples/MultipleLayoutBuilder.h"
-#include "Sample/StandardSamples/ParacrystalBuilder.h"
-#include "Sample/StandardSamples/ParticleDistributionsBuilder.h"
-#include "Sample/StandardSamples/ParticleInVacuumBuilder.h"
-#include "Sample/StandardSamples/PercusYevickBuilder.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
-#include "Sample/StandardSamples/ResonatorBuilder.h"
-#include "Sample/StandardSamples/RipplesBuilder.h"
-#include "Sample/StandardSamples/RotatedPyramidsBuilder.h"
-#include "Sample/StandardSamples/SimpleLayerBuilder.h"
-#include "Sample/StandardSamples/SizeDistributionModelsBuilder.h"
-#include "Sample/StandardSamples/SlicedCompositionBuilder.h"
-#include "Sample/StandardSamples/SlicedCylindersBuilder.h"
-#include "Sample/StandardSamples/ThickAbsorptiveSampleBuilder.h"
-#include "Sample/StandardSamples/TransformationsBuilder.h"
-#include "Sample/StandardSamples/TwoDimLatticeBuilder.h"
-
-#endif // BORNAGAIN_SAMPLE_STANDARDSAMPLES_EXEMPLARYSAMPLES_H
diff --git a/Tests/Functional/Consistence/ConsistenceTests.cpp b/Tests/Functional/Consistence/ConsistenceTests.cpp
index f44bfd2b149..0b71d7843c9 100644
--- a/Tests/Functional/Consistence/ConsistenceTests.cpp
+++ b/Tests/Functional/Consistence/ConsistenceTests.cpp
@@ -16,8 +16,8 @@
// some other tests, coincide within reasonable numeric error margins.
#include "Device/Data/Datafield.h"
-#include "Sample/StandardSamples/CylindersAndPrismsBuilder.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/CylindersAndPrismsBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
#include "Sim/Simulation/ScatteringSimulation.h"
#include "Sim/Simulation/SpecularSimulation.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Functional/Fitting/FitTests.cpp b/Tests/Functional/Fitting/FitTests.cpp
index 7299d4c84ac..c8ee332ca85 100644
--- a/Tests/Functional/Fitting/FitTests.cpp
+++ b/Tests/Functional/Fitting/FitTests.cpp
@@ -20,7 +20,7 @@
#include "Device/Mask/Rectangle.h"
#include "Fit/Kernel/Minimizer.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
#include "Sim/Fitting/FitObjective.h"
#include "Sim/Simulation/OffspecSimulation.h"
#include "Sim/Simulation/ScatteringSimulation.h"
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index c508e93ed77..d6a63799462 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -24,7 +24,7 @@
#include "Sample/ComponentBuilder/FormFactorComponents.h"
#include "Sample/ComponentBuilder/Profile2DComponents.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/ExemplarySamples.h"
+#include "Sample/StandardSample/ExemplarySamples.h"
#include "Sim/Background/ConstantBackground.h"
#include "Sim/Simulation/includeSimulations.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Resample/KzComputationTest.cpp b/Tests/Unit/Resample/KzComputationTest.cpp
index 491d16bbe7a..87a00e1cf28 100644
--- a/Tests/Unit/Resample/KzComputationTest.cpp
+++ b/Tests/Unit/Resample/KzComputationTest.cpp
@@ -6,7 +6,7 @@
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/StandardSamples/PlainMultiLayerBySLDBuilder.h"
+#include "Sample/StandardSample/PlainMultiLayerBySLDBuilder.h"
#include "Tests/GTestWrapper/google_test.h"
TEST(KzComputationTest, initial)
--
GitLab
From 4044a2bb33f509d1a14e57b297929aa00512f090 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:32:13 +0100
Subject: [PATCH 28/32] rename Fit/Tools/ -> Fit/Tool
---
Fit/Adapter/MinimizerAdapter.cpp | 2 +-
Fit/Adapter/Report.cpp | 2 +-
Fit/Kernel/Kernel.cpp | 2 +-
Fit/Minimizer/MinimizerCatalog.cpp | 2 +-
Fit/Minimizer/MinimizerResult.cpp | 2 +-
Fit/Option/MinimizerOptions.cpp | 2 +-
Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp | 4 ++--
Fit/Suite/GSLMultiMinimizer.cpp | 2 +-
Fit/Suite/Minuit2Minimizer.cpp | 2 +-
Fit/{Tools => Tool}/MinimizerUtil.cpp | 4 ++--
Fit/{Tools => Tool}/MinimizerUtil.h | 8 ++++----
Fit/{Tools => Tool}/StringUtil.cpp | 4 ++--
Fit/{Tools => Tool}/StringUtil.h | 8 ++++----
Fit/{Tools => Tool}/WallclockTimer.cpp | 4 ++--
Fit/{Tools => Tool}/WallclockTimer.h | 8 ++++----
Sim/Fitting/FitPrintService.h | 2 +-
16 files changed, 29 insertions(+), 29 deletions(-)
rename Fit/{Tools => Tool}/MinimizerUtil.cpp (97%)
rename Fit/{Tools => Tool}/MinimizerUtil.h (85%)
rename Fit/{Tools => Tool}/StringUtil.cpp (92%)
rename Fit/{Tools => Tool}/StringUtil.h (88%)
rename Fit/{Tools => Tool}/WallclockTimer.cpp (95%)
rename Fit/{Tools => Tool}/WallclockTimer.h (84%)
diff --git a/Fit/Adapter/MinimizerAdapter.cpp b/Fit/Adapter/MinimizerAdapter.cpp
index 084062bd223..08c707ec650 100644
--- a/Fit/Adapter/MinimizerAdapter.cpp
+++ b/Fit/Adapter/MinimizerAdapter.cpp
@@ -17,7 +17,7 @@
#include "Fit/Adapter/Report.h"
#include "Fit/Residual/RootResidualFunction.h"
#include "Fit/Residual/RootScalarFunction.h"
-#include "Fit/Tools/StringUtil.h"
+#include "Fit/Tool/StringUtil.h"
#include <Math/Minimizer.h>
#include <utility>
diff --git a/Fit/Adapter/Report.cpp b/Fit/Adapter/Report.cpp
index f6aea61d6c7..2b90a2e4d84 100644
--- a/Fit/Adapter/Report.cpp
+++ b/Fit/Adapter/Report.cpp
@@ -14,7 +14,7 @@
#include "Fit/Adapter/Report.h"
#include "Fit/Adapter/MinimizerAdapter.h"
-#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
#include <iomanip>
#include <sstream>
diff --git a/Fit/Kernel/Kernel.cpp b/Fit/Kernel/Kernel.cpp
index ea7053b7361..513534ee39c 100644
--- a/Fit/Kernel/Kernel.cpp
+++ b/Fit/Kernel/Kernel.cpp
@@ -15,7 +15,7 @@
#include "Fit/Kernel/Kernel.h"
#include "Fit/Kernel/MinimizerFactory.h"
#include "Fit/Minimizer/IMinimizer.h"
-#include "Fit/Tools/WallclockTimer.h"
+#include "Fit/Tool/WallclockTimer.h"
using namespace mumufit;
diff --git a/Fit/Minimizer/MinimizerCatalog.cpp b/Fit/Minimizer/MinimizerCatalog.cpp
index 380cffbc274..53060a59aca 100644
--- a/Fit/Minimizer/MinimizerCatalog.cpp
+++ b/Fit/Minimizer/MinimizerCatalog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerCatalog.h"
-#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
#include <boost/format.hpp>
#include <sstream>
diff --git a/Fit/Minimizer/MinimizerResult.cpp b/Fit/Minimizer/MinimizerResult.cpp
index 04c9a6db655..388fdda5c55 100644
--- a/Fit/Minimizer/MinimizerResult.cpp
+++ b/Fit/Minimizer/MinimizerResult.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerResult.h"
-#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
#include <boost/format.hpp>
#include <sstream>
diff --git a/Fit/Option/MinimizerOptions.cpp b/Fit/Option/MinimizerOptions.cpp
index 028f292f0fd..4125e1b8ebd 100644
--- a/Fit/Option/MinimizerOptions.cpp
+++ b/Fit/Option/MinimizerOptions.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Option/MinimizerOptions.h"
-#include "Fit/Tools/StringUtil.h"
+#include "Fit/Tool/StringUtil.h"
#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp b/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp
index 7a0013065fe..16c7f96f491 100644
--- a/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/Suite/GSLLevenbergMarquardtMinimizer.cpp
@@ -14,8 +14,8 @@
#include "Fit/Suite/GSLLevenbergMarquardtMinimizer.h"
#include "Fit/Suite/GSLMultiMinimizer.h"
-#include "Fit/Tools/MinimizerUtil.h"
-#include "Fit/Tools/StringUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
+#include "Fit/Tool/StringUtil.h"
#include <stdexcept>
#ifdef _WIN32
diff --git a/Fit/Suite/GSLMultiMinimizer.cpp b/Fit/Suite/GSLMultiMinimizer.cpp
index 14e7ac4dd8b..e7d006189c3 100644
--- a/Fit/Suite/GSLMultiMinimizer.cpp
+++ b/Fit/Suite/GSLMultiMinimizer.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Suite/GSLMultiMinimizer.h"
-#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
#include <string>
#ifdef _WIN32
diff --git a/Fit/Suite/Minuit2Minimizer.cpp b/Fit/Suite/Minuit2Minimizer.cpp
index 1500c8253c6..0ca9cd60873 100644
--- a/Fit/Suite/Minuit2Minimizer.cpp
+++ b/Fit/Suite/Minuit2Minimizer.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Suite/Minuit2Minimizer.h"
-#include "Fit/Tools/StringUtil.h"
+#include "Fit/Tool/StringUtil.h"
#include <Minuit2/Minuit2Minimizer.h>
namespace {
diff --git a/Fit/Tools/MinimizerUtil.cpp b/Fit/Tool/MinimizerUtil.cpp
similarity index 97%
rename from Fit/Tools/MinimizerUtil.cpp
rename to Fit/Tool/MinimizerUtil.cpp
index 4731057269b..ae0c8193587 100644
--- a/Fit/Tools/MinimizerUtil.cpp
+++ b/Fit/Tool/MinimizerUtil.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/MinimizerUtil.cpp
+//! @file Fit/Tool/MinimizerUtil.cpp
//! @brief Declares namespace MinimizerUtils.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tool/MinimizerUtil.h"
#include <algorithm>
#include <cmath>
#include <limits>
diff --git a/Fit/Tools/MinimizerUtil.h b/Fit/Tool/MinimizerUtil.h
similarity index 85%
rename from Fit/Tools/MinimizerUtil.h
rename to Fit/Tool/MinimizerUtil.h
index aa180a4263a..c0b7017162b 100644
--- a/Fit/Tools/MinimizerUtil.h
+++ b/Fit/Tool/MinimizerUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/MinimizerUtil.h
+//! @file Fit/Tool/MinimizerUtil.h
//! @brief Declares namespace MinimizerUtils.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
-#define BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
+#ifndef BORNAGAIN_FIT_TOOL_MINIMIZERUTIL_H
+#define BORNAGAIN_FIT_TOOL_MINIMIZERUTIL_H
#include <map>
#include <string>
@@ -36,4 +36,4 @@ std::string sectionString(const std::string& sectionName = "", size_t report_wid
} // namespace mumufit::utils
-#endif // BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
+#endif // BORNAGAIN_FIT_TOOL_MINIMIZERUTIL_H
diff --git a/Fit/Tools/StringUtil.cpp b/Fit/Tool/StringUtil.cpp
similarity index 92%
rename from Fit/Tools/StringUtil.cpp
rename to Fit/Tool/StringUtil.cpp
index d2ad2a4cac7..78f67bb1160 100644
--- a/Fit/Tools/StringUtil.cpp
+++ b/Fit/Tool/StringUtil.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/StringUtil.cpp
+//! @file Fit/Tool/StringUtil.cpp
//! @brief Implements a few helper functions.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Tools/StringUtil.h"
+#include "Fit/Tool/StringUtil.h"
#include <boost/algorithm/string.hpp>
//! Returns token vector obtained by splitting string at delimiters.
diff --git a/Fit/Tools/StringUtil.h b/Fit/Tool/StringUtil.h
similarity index 88%
rename from Fit/Tools/StringUtil.h
rename to Fit/Tool/StringUtil.h
index ea12acaa4ad..be871dc570c 100644
--- a/Fit/Tools/StringUtil.h
+++ b/Fit/Tool/StringUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/StringUtil.h
+//! @file Fit/Tool/StringUtil.h
//! @brief Defines a few helper functions.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
-#define BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
+#ifndef BORNAGAIN_FIT_TOOL_STRINGUTIL_H
+#define BORNAGAIN_FIT_TOOL_STRINGUTIL_H
#include <iomanip>
#include <sstream>
@@ -42,4 +42,4 @@ template <typename T> std::string scientific(const T value, int n)
} // namespace mumufit::stringUtil
-#endif // BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
+#endif // BORNAGAIN_FIT_TOOL_STRINGUTIL_H
diff --git a/Fit/Tools/WallclockTimer.cpp b/Fit/Tool/WallclockTimer.cpp
similarity index 95%
rename from Fit/Tools/WallclockTimer.cpp
rename to Fit/Tool/WallclockTimer.cpp
index a3ee9ef18dc..463367d7339 100644
--- a/Fit/Tools/WallclockTimer.cpp
+++ b/Fit/Tool/WallclockTimer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/WallclockTimer.cpp
+//! @file Fit/Tool/WallclockTimer.cpp
//! @brief Implements class WallclockTimer.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Tools/WallclockTimer.h"
+#include "Fit/Tool/WallclockTimer.h"
#include <chrono>
using clock_used = std::chrono::high_resolution_clock;
diff --git a/Fit/Tools/WallclockTimer.h b/Fit/Tool/WallclockTimer.h
similarity index 84%
rename from Fit/Tools/WallclockTimer.h
rename to Fit/Tool/WallclockTimer.h
index dee6d519e22..8de774abbc9 100644
--- a/Fit/Tools/WallclockTimer.h
+++ b/Fit/Tool/WallclockTimer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/WallclockTimer.h
+//! @file Fit/Tool/WallclockTimer.h
//! @brief Defines class WallclockTimer.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
-#define BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
+#ifndef BORNAGAIN_FIT_TOOL_WALLCLOCKTIMER_H
+#define BORNAGAIN_FIT_TOOL_WALLCLOCKTIMER_H
#include <memory>
@@ -39,4 +39,4 @@ private:
std::unique_ptr<WallclockTimerState> m_state;
};
-#endif // BORNAGAIN_FIT_TOOLS_WALLCLOCKTIMER_H
+#endif // BORNAGAIN_FIT_TOOL_WALLCLOCKTIMER_H
diff --git a/Sim/Fitting/FitPrintService.h b/Sim/Fitting/FitPrintService.h
index 7555a6b80da..372e1bec959 100644
--- a/Sim/Fitting/FitPrintService.h
+++ b/Sim/Fitting/FitPrintService.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_SIM_FITTING_FITPRINTSERVICE_H
#define BORNAGAIN_SIM_FITTING_FITPRINTSERVICE_H
-#include "Fit/Tools/WallclockTimer.h"
+#include "Fit/Tool/WallclockTimer.h"
#include <string>
class FitObjective;
--
GitLab
From 89624b44b223bafb84202b22e59dc98ec73cd8d0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:32:38 +0100
Subject: [PATCH 29/32] rename Resample/Options/ -> Resample/Option
---
GUI/Model/FromCore/ItemizeSimulation.cpp | 2 +-
GUI/Model/ToCore/SimulationToCore.cpp | 2 +-
Resample/Interparticle/IInterparticleStrategy.h | 2 +-
Resample/{Options => Option}/SimulationOptions.cpp | 4 ++--
Resample/{Options => Option}/SimulationOptions.h | 8 ++++----
Resample/Particle/ReMesocrystal.h | 2 +-
Resample/Processed/ReSample.cpp | 2 +-
Resample/Processed/Slicer.h | 2 +-
Resample/Swig/MultiLayerFuncs.cpp | 2 +-
Sim/Computation/DWBAComputation.cpp | 2 +-
Sim/Export/SimulationToPython.cpp | 2 +-
Sim/Simulation/ISimulation.cpp | 2 +-
Tests/SimFactory/MakeSimulations.cpp | 2 +-
Tests/Suite/Common/TestSuite.h | 2 +-
Wrap/Swig/libBornAgainResample.i | 4 ++--
15 files changed, 20 insertions(+), 20 deletions(-)
rename Resample/{Options => Option}/SimulationOptions.cpp (95%)
rename Resample/{Options => Option}/SimulationOptions.h (92%)
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 84afcfd35d4..b732de275eb 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -40,7 +40,7 @@
#include "GUI/Model/Mask/MasksSet.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
#include "Param/Distrib/Distributions.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Sim/Background/ConstantBackground.h"
#include "Sim/Background/PoissonBackground.h"
#include "Sim/Scan/AlphaScan.h"
diff --git a/GUI/Model/ToCore/SimulationToCore.cpp b/GUI/Model/ToCore/SimulationToCore.cpp
index 75c200ccfed..b636c443f34 100644
--- a/GUI/Model/ToCore/SimulationToCore.cpp
+++ b/GUI/Model/ToCore/SimulationToCore.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Model/ToCore/SampleToCore.h"
#include "GUI/Support/Data/SimulationOptionsItem.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sim/Simulation/ISimulation.h"
diff --git a/Resample/Interparticle/IInterparticleStrategy.h b/Resample/Interparticle/IInterparticleStrategy.h
index 4e8f2ae081e..8ce6fc5f2bd 100644
--- a/Resample/Interparticle/IInterparticleStrategy.h
+++ b/Resample/Interparticle/IInterparticleStrategy.h
@@ -19,7 +19,7 @@
#define BORNAGAIN_RESAMPLE_INTERPARTICLE_IINTERPARTICLESTRATEGY_H
#include "Base/Type/OwningVector.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include <heinz/Complex.h>
#include <memory>
#include <vector>
diff --git a/Resample/Options/SimulationOptions.cpp b/Resample/Option/SimulationOptions.cpp
similarity index 95%
rename from Resample/Options/SimulationOptions.cpp
rename to Resample/Option/SimulationOptions.cpp
index d03ec7f77ba..5aebde9010c 100644
--- a/Resample/Options/SimulationOptions.cpp
+++ b/Resample/Option/SimulationOptions.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Options/SimulationOptions.cpp
+//! @file Resample/Option/SimulationOptions.cpp
//! @brief Implements class SimulationOptions.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Base/Util/Assert.h"
#include <cstdlib>
#include <iostream>
diff --git a/Resample/Options/SimulationOptions.h b/Resample/Option/SimulationOptions.h
similarity index 92%
rename from Resample/Options/SimulationOptions.h
rename to Resample/Option/SimulationOptions.h
index 8ae4b172b2e..4a4e19d7062 100644
--- a/Resample/Options/SimulationOptions.h
+++ b/Resample/Option/SimulationOptions.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Resample/Options/SimulationOptions.h
+//! @file Resample/Option/SimulationOptions.h
//! @brief Defines class SimulationOptions.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_RESAMPLE_OPTIONS_SIMULATIONOPTIONS_H
-#define BORNAGAIN_RESAMPLE_OPTIONS_SIMULATIONOPTIONS_H
+#ifndef BORNAGAIN_RESAMPLE_OPTION_SIMULATIONOPTIONS_H
+#define BORNAGAIN_RESAMPLE_OPTION_SIMULATIONOPTIONS_H
#include <cstddef>
@@ -86,4 +86,4 @@ private:
#endif // SWIG
};
-#endif // BORNAGAIN_RESAMPLE_OPTIONS_SIMULATIONOPTIONS_H
+#endif // BORNAGAIN_RESAMPLE_OPTION_SIMULATIONOPTIONS_H
diff --git a/Resample/Particle/ReMesocrystal.h b/Resample/Particle/ReMesocrystal.h
index 3cb137ea314..ed888d0ec16 100644
--- a/Resample/Particle/ReMesocrystal.h
+++ b/Resample/Particle/ReMesocrystal.h
@@ -18,7 +18,7 @@
#ifndef BORNAGAIN_RESAMPLE_PARTICLE_REMESOCRYSTAL_H
#define BORNAGAIN_RESAMPLE_PARTICLE_REMESOCRYSTAL_H
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Resample/Particle/IReParticle.h"
#include "Sample/Lattice/Lattice3D.h"
#include "Sample/Particle/Mesocrystal.h"
diff --git a/Resample/Processed/ReSample.cpp b/Resample/Processed/ReSample.cpp
index 8060bfd49f6..90bfbc2e29b 100644
--- a/Resample/Processed/ReSample.cpp
+++ b/Resample/Processed/ReSample.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Resample/Coherence/CoheringSubparticles.h"
#include "Resample/Flux/IFlux.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Resample/Particle/IReParticle.h"
#include "Resample/Processed/ReLayout.h"
#include "Resample/Processed/Slicer.h"
diff --git a/Resample/Processed/Slicer.h b/Resample/Processed/Slicer.h
index 4b61d24b8b1..b4f61ae2459 100644
--- a/Resample/Processed/Slicer.h
+++ b/Resample/Processed/Slicer.h
@@ -20,7 +20,7 @@
#define BORNAGAIN_RESAMPLE_PROCESSED_SLICER_H
#include "Base/Type/OwningVector.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
class IParticle;
class IReParticle;
diff --git a/Resample/Swig/MultiLayerFuncs.cpp b/Resample/Swig/MultiLayerFuncs.cpp
index f996e5c0589..470697f6551 100644
--- a/Resample/Swig/MultiLayerFuncs.cpp
+++ b/Resample/Swig/MultiLayerFuncs.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Resample/Swig/MultiLayerFuncs.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Resample/Processed/ReSample.h"
#include "Resample/Slice/ProfileHelper.h"
diff --git a/Sim/Computation/DWBAComputation.cpp b/Sim/Computation/DWBAComputation.cpp
index 2bfd4f02bef..2a913b91ccd 100644
--- a/Sim/Computation/DWBAComputation.cpp
+++ b/Sim/Computation/DWBAComputation.cpp
@@ -16,7 +16,7 @@
#include "Resample/Element/DiffuseElement.h"
#include "Resample/Flux/IFlux.h"
#include "Resample/Interparticle/IInterparticleStrategy.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Resample/Processed/ReLayout.h"
#include "Resample/Processed/ReSample.h"
#include "Sim/Computation/GISASSpecularContribution.h"
diff --git a/Sim/Export/SimulationToPython.cpp b/Sim/Export/SimulationToPython.cpp
index d0bef203887..1eaf5b73628 100644
--- a/Sim/Export/SimulationToPython.cpp
+++ b/Sim/Export/SimulationToPython.cpp
@@ -26,7 +26,7 @@
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Param/Distrib/Distributions.h"
#include "Param/Node/NodeUtil.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Sim/Background/ConstantBackground.h"
#include "Sim/Background/PoissonBackground.h"
#include "Sim/Export/PyFmt2.h"
diff --git a/Sim/Simulation/ISimulation.cpp b/Sim/Simulation/ISimulation.cpp
index 1fddc727666..840d7e4585c 100644
--- a/Sim/Simulation/ISimulation.cpp
+++ b/Sim/Simulation/ISimulation.cpp
@@ -18,7 +18,7 @@
#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
#include "Param/Distrib/DistributionHandler.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Resample/Processed/ReSample.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sim/Background/IBackground.h"
diff --git a/Tests/SimFactory/MakeSimulations.cpp b/Tests/SimFactory/MakeSimulations.cpp
index d2b2ae356be..3769452df61 100644
--- a/Tests/SimFactory/MakeSimulations.cpp
+++ b/Tests/SimFactory/MakeSimulations.cpp
@@ -27,7 +27,7 @@
#include "Device/Mask/Rectangle.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Param/Distrib/Distributions.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Sim/Background/ConstantBackground.h"
#include "Sim/Scan/AlphaScan.h"
#include "Sim/Scan/QzScan.h"
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index d6a63799462..ed646ecffde 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -20,7 +20,7 @@
#define BORNAGAIN_TESTS_SUITE_COMMON_TESTSUITE_H
#include "Base/Axis/Scale.h"
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
#include "Sample/ComponentBuilder/FormFactorComponents.h"
#include "Sample/ComponentBuilder/Profile2DComponents.h"
#include "Sample/Multilayer/MultiLayer.h"
diff --git a/Wrap/Swig/libBornAgainResample.i b/Wrap/Swig/libBornAgainResample.i
index 5a96fc66148..7fc3fecfbaa 100644
--- a/Wrap/Swig/libBornAgainResample.i
+++ b/Wrap/Swig/libBornAgainResample.i
@@ -19,10 +19,10 @@
%include "commons.i"
%{
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
%}
-%include "Resample/Options/SimulationOptions.h"
+%include "Resample/Option/SimulationOptions.h"
%include "ignoreSample.i"
--
GitLab
From 1883e284bd3d31d4607350eeeba86e0910c050ac Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:33:14 +0100
Subject: [PATCH 30/32] rename GUI/View/Views/ -> GUI/View/View
---
GUI/View/Main/ActionManager.cpp | 6 +++---
GUI/View/Main/CentralWidget.cpp | 10 +++++-----
GUI/View/{Views => View}/DataView.cpp | 6 +++---
GUI/View/{Views => View}/DataView.h | 8 ++++----
GUI/View/{Views => View}/DatafilesSelector.cpp | 4 ++--
GUI/View/{Views => View}/DatafilesSelector.h | 8 ++++----
GUI/View/{Views => View}/InstrumentView.cpp | 4 ++--
GUI/View/{Views => View}/InstrumentView.h | 8 ++++----
GUI/View/{Views => View}/JobView.cpp | 4 ++--
GUI/View/{Views => View}/JobView.h | 8 ++++----
GUI/View/{Views => View}/SampleView.cpp | 4 ++--
GUI/View/{Views => View}/SampleView.h | 8 ++++----
GUI/View/{Views => View}/SimulationView.cpp | 4 ++--
GUI/View/{Views => View}/SimulationView.h | 8 ++++----
14 files changed, 45 insertions(+), 45 deletions(-)
rename GUI/View/{Views => View}/DataView.cpp (89%)
rename GUI/View/{Views => View}/DataView.h (80%)
rename GUI/View/{Views => View}/DatafilesSelector.cpp (96%)
rename GUI/View/{Views => View}/DatafilesSelector.h (81%)
rename GUI/View/{Views => View}/InstrumentView.cpp (98%)
rename GUI/View/{Views => View}/InstrumentView.h (85%)
rename GUI/View/{Views => View}/JobView.cpp (98%)
rename GUI/View/{Views => View}/JobView.h (90%)
rename GUI/View/{Views => View}/SampleView.cpp (99%)
rename GUI/View/{Views => View}/SampleView.h (86%)
rename GUI/View/{Views => View}/SimulationView.cpp (99%)
rename GUI/View/{Views => View}/SimulationView.h (93%)
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index cd7112566c5..c3d7da485d0 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -21,9 +21,9 @@
#include "GUI/View/Base/mainwindow_constants.h"
#include "GUI/View/Main/AboutDialog.h"
#include "GUI/View/Manager/ProjectManager.h"
-#include "GUI/View/Views/InstrumentView.h"
-#include "GUI/View/Views/JobView.h"
-#include "GUI/View/Views/SampleView.h"
+#include "GUI/View/View/InstrumentView.h"
+#include "GUI/View/View/JobView.h"
+#include "GUI/View/View/SampleView.h"
#include <QButtonGroup>
#include <QCheckBox>
#include <QDesktopServices>
diff --git a/GUI/View/Main/CentralWidget.cpp b/GUI/View/Main/CentralWidget.cpp
index 8970a9604e5..c5987b02e35 100644
--- a/GUI/View/Main/CentralWidget.cpp
+++ b/GUI/View/Main/CentralWidget.cpp
@@ -16,11 +16,11 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Setup/FrameActions.h"
-#include "GUI/View/Views/DataView.h"
-#include "GUI/View/Views/InstrumentView.h"
-#include "GUI/View/Views/JobView.h"
-#include "GUI/View/Views/SampleView.h"
-#include "GUI/View/Views/SimulationView.h"
+#include "GUI/View/View/DataView.h"
+#include "GUI/View/View/InstrumentView.h"
+#include "GUI/View/View/JobView.h"
+#include "GUI/View/View/SampleView.h"
+#include "GUI/View/View/SimulationView.h"
#include <QAction>
#include <QApplication>
#include <QDir>
diff --git a/GUI/View/Views/DataView.cpp b/GUI/View/View/DataView.cpp
similarity index 89%
rename from GUI/View/Views/DataView.cpp
rename to GUI/View/View/DataView.cpp
index e455510a50e..cb9dd95079b 100644
--- a/GUI/View/Views/DataView.cpp
+++ b/GUI/View/View/DataView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/DataView.cpp
+//! @file GUI/View/View/DataView.cpp
//! @brief Implements class DataView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/DataView.h"
+#include "GUI/View/View/DataView.h"
#include "GUI/View/Frame/StackedFrames.h"
-#include "GUI/View/Views/DatafilesSelector.h"
+#include "GUI/View/View/DatafilesSelector.h"
#include <QSplitter>
#include <QVBoxLayout>
diff --git a/GUI/View/Views/DataView.h b/GUI/View/View/DataView.h
similarity index 80%
rename from GUI/View/Views/DataView.h
rename to GUI/View/View/DataView.h
index 2cfb6b4b711..78aa97ae07d 100644
--- a/GUI/View/Views/DataView.h
+++ b/GUI/View/View/DataView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/DataView.h
+//! @file GUI/View/View/DataView.h
//! @brief Defines class DataView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
#include <QWidget>
@@ -25,4 +25,4 @@ public:
DataView();
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_DATAVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_DATAVIEW_H
diff --git a/GUI/View/Views/DatafilesSelector.cpp b/GUI/View/View/DatafilesSelector.cpp
similarity index 96%
rename from GUI/View/Views/DatafilesSelector.cpp
rename to GUI/View/View/DatafilesSelector.cpp
index 03890b95a4e..5c7840edfaa 100644
--- a/GUI/View/Views/DatafilesSelector.cpp
+++ b/GUI/View/View/DatafilesSelector.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/DatafilesSelector.cpp
+//! @file GUI/View/View/DatafilesSelector.cpp
//! @brief Implements class DatafilesSelector.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/DatafilesSelector.h"
+#include "GUI/View/View/DatafilesSelector.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Files/DatafilesSet.h"
diff --git a/GUI/View/Views/DatafilesSelector.h b/GUI/View/View/DatafilesSelector.h
similarity index 81%
rename from GUI/View/Views/DatafilesSelector.h
rename to GUI/View/View/DatafilesSelector.h
index 55f82060b1c..bbb309d051e 100644
--- a/GUI/View/Views/DatafilesSelector.h
+++ b/GUI/View/View/DatafilesSelector.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/DatafilesSelector.h
+//! @file GUI/View/View/DatafilesSelector.h
//! @brief Defines class DatafilesSelector.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
+#define BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
#include <QWidget>
@@ -38,4 +38,4 @@ private:
QAction* m_rm_action;
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_DATAFILESSELECTOR_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_DATAFILESSELECTOR_H
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/View/InstrumentView.cpp
similarity index 98%
rename from GUI/View/Views/InstrumentView.cpp
rename to GUI/View/View/InstrumentView.cpp
index 0f786ecdd24..66d0754b25d 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/View/InstrumentView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/InstrumentView.cpp
+//! @file GUI/View/View/InstrumentView.cpp
//! @brief Implements class InstrumentView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/InstrumentView.h"
+#include "GUI/View/View/InstrumentView.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsSet.h"
diff --git a/GUI/View/Views/InstrumentView.h b/GUI/View/View/InstrumentView.h
similarity index 85%
rename from GUI/View/Views/InstrumentView.h
rename to GUI/View/View/InstrumentView.h
index b48b4db2b50..11ac2038b21 100644
--- a/GUI/View/Views/InstrumentView.h
+++ b/GUI/View/View/InstrumentView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/InstrumentView.h
+//! @file GUI/View/View/InstrumentView.h
//! @brief Defines class InstrumentView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
#include <QAction>
#include <QScrollArea>
@@ -46,4 +46,4 @@ private:
QAction* m_save_action;
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_INSTRUMENTVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_INSTRUMENTVIEW_H
diff --git a/GUI/View/Views/JobView.cpp b/GUI/View/View/JobView.cpp
similarity index 98%
rename from GUI/View/Views/JobView.cpp
rename to GUI/View/View/JobView.cpp
index 6a4e6ba1ea2..63c4d7f0b27 100644
--- a/GUI/View/Views/JobView.cpp
+++ b/GUI/View/View/JobView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/JobView.cpp
+//! @file GUI/View/View/JobView.cpp
//! @brief Implements class JobView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/JobView.h"
+#include "GUI/View/View/JobView.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobsSet.h"
diff --git a/GUI/View/Views/JobView.h b/GUI/View/View/JobView.h
similarity index 90%
rename from GUI/View/Views/JobView.h
rename to GUI/View/View/JobView.h
index b9269643bd9..71c3a21f402 100644
--- a/GUI/View/Views/JobView.h
+++ b/GUI/View/View/JobView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/JobView.h
+//! @file GUI/View/View/JobView.h
//! @brief Defines class JobView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
#include <QActionGroup>
#include <QMainWindow>
@@ -67,4 +67,4 @@ private:
QActionGroup m_activity_actions;
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_JOBVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_JOBVIEW_H
diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/View/SampleView.cpp
similarity index 99%
rename from GUI/View/Views/SampleView.cpp
rename to GUI/View/View/SampleView.cpp
index 954a3e02e29..f2ee47a9837 100644
--- a/GUI/View/Views/SampleView.cpp
+++ b/GUI/View/View/SampleView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/SampleView.cpp
+//! @file GUI/View/View/SampleView.cpp
//! @brief Implements class SampleView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/SampleView.h"
+#include "GUI/View/View/SampleView.h"
#include "Base/Util/Vec.h"
#include "GUI/Model/FromCore/GUIExamplesFactory.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Views/SampleView.h b/GUI/View/View/SampleView.h
similarity index 86%
rename from GUI/View/Views/SampleView.h
rename to GUI/View/View/SampleView.h
index e22e880601a..a13635219db 100644
--- a/GUI/View/Views/SampleView.h
+++ b/GUI/View/View/SampleView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/SampleView.h
+//! @file GUI/View/View/SampleView.h
//! @brief Defines class SampleView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
#include <QAction>
#include <QWidget>
@@ -48,4 +48,4 @@ private:
QAction* m_cp_action;
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_SAMPLEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_SAMPLEVIEW_H
diff --git a/GUI/View/Views/SimulationView.cpp b/GUI/View/View/SimulationView.cpp
similarity index 99%
rename from GUI/View/Views/SimulationView.cpp
rename to GUI/View/View/SimulationView.cpp
index 27cabe8b7e7..042fc393d70 100644
--- a/GUI/View/Views/SimulationView.cpp
+++ b/GUI/View/View/SimulationView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/SimulationView.cpp
+//! @file GUI/View/View/SimulationView.cpp
//! @brief Implements class SimulationView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Views/SimulationView.h"
+#include "GUI/View/View/SimulationView.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Device/InstrumentsSet.h"
#include "GUI/Model/Files/DatafilesSet.h"
diff --git a/GUI/View/Views/SimulationView.h b/GUI/View/View/SimulationView.h
similarity index 93%
rename from GUI/View/Views/SimulationView.h
rename to GUI/View/View/SimulationView.h
index d27c9fb6288..927fd613d64 100644
--- a/GUI/View/Views/SimulationView.h
+++ b/GUI/View/View/SimulationView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Views/SimulationView.h
+//! @file GUI/View/View/SimulationView.h
//! @brief Defines class SimulationView.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
-#define BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H
+#define BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H
#include <QCheckBox>
#include <QComboBox>
@@ -92,4 +92,4 @@ private:
SimulationOptionsItem* optionsItem() const;
};
-#endif // BORNAGAIN_GUI_VIEW_VIEWS_SIMULATIONVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_VIEW_SIMULATIONVIEW_H
--
GitLab
From 9310745d38cbc5f30b635e524ba867a440e1293b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:34:04 +0100
Subject: [PATCH 31/32] rename GUI/Model/Files/ -> GUI/Model/File
---
GUI/Model/Device/InstrumentItems.cpp | 2 +-
GUI/Model/{Files => File}/DatafileItem.cpp | 4 ++--
GUI/Model/{Files => File}/DatafileItem.h | 8 ++++----
GUI/Model/{Files => File}/DatafilesCleaner.cpp | 4 ++--
GUI/Model/{Files => File}/DatafilesCleaner.h | 8 ++++----
GUI/Model/{Files => File}/DatafilesSet.cpp | 4 ++--
GUI/Model/{Files => File}/DatafilesSet.h | 12 ++++++------
GUI/Model/Job/DataSource.cpp | 2 +-
GUI/Model/Job/JobItem.cpp | 2 +-
GUI/Model/Job/JobsSet.cpp | 2 +-
GUI/Model/Job/JobsSet.h | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 4 ++--
GUI/View/Canvas/SpecularDataCanvas.cpp | 2 +-
GUI/View/FitControl/FitObjectiveBuilder.cpp | 2 +-
GUI/View/Frame/Plot2DFrame.cpp | 2 +-
GUI/View/Frame/StackedFrames.cpp | 2 +-
GUI/View/Loader/DataLoader.cpp | 2 +-
GUI/View/Setup/AxesPanel.cpp | 2 +-
GUI/View/Setup/AxisPanel.cpp | 2 +-
GUI/View/View/DatafilesSelector.cpp | 2 +-
GUI/View/View/SimulationView.cpp | 2 +-
Tests/Unit/GUI/TestDatafilesModel.cpp | 4 ++--
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
Tests/Unit/GUI/Utils.cpp | 4 ++--
24 files changed, 42 insertions(+), 42 deletions(-)
rename GUI/Model/{Files => File}/DatafileItem.cpp (98%)
rename GUI/Model/{Files => File}/DatafileItem.h (89%)
rename GUI/Model/{Files => File}/DatafilesCleaner.cpp (92%)
rename GUI/Model/{Files => File}/DatafilesCleaner.h (83%)
rename GUI/Model/{Files => File}/DatafilesSet.cpp (96%)
rename GUI/Model/{Files => File}/DatafilesSet.h (79%)
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 98e213391ff..93316592b26 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -35,7 +35,7 @@
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsCatalog.h"
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/XML/Backup.h"
#include "Param/Distrib/Distributions.h"
diff --git a/GUI/Model/Files/DatafileItem.cpp b/GUI/Model/File/DatafileItem.cpp
similarity index 98%
rename from GUI/Model/Files/DatafileItem.cpp
rename to GUI/Model/File/DatafileItem.cpp
index b3a54c88260..69dda4fffcf 100644
--- a/GUI/Model/Files/DatafileItem.cpp
+++ b/GUI/Model/File/DatafileItem.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafileItem.cpp
+//! @file GUI/Model/File/DatafileItem.cpp
//! @brief Implements class DatafileItem.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "Base/Axis/Frame.h"
#include "Base/Axis/Scale.h"
#include "Device/Data/DataUtil.h"
diff --git a/GUI/Model/Files/DatafileItem.h b/GUI/Model/File/DatafileItem.h
similarity index 89%
rename from GUI/Model/Files/DatafileItem.h
rename to GUI/Model/File/DatafileItem.h
index 6e3fd21e289..6779832a6c7 100644
--- a/GUI/Model/Files/DatafileItem.h
+++ b/GUI/Model/File/DatafileItem.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafileItem.h
+//! @file GUI/Model/File/DatafileItem.h
//! @brief Defines class DatafileItem.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_FILES_DATAFILEITEM_H
-#define BORNAGAIN_GUI_MODEL_FILES_DATAFILEITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_FILE_DATAFILEITEM_H
+#define BORNAGAIN_GUI_MODEL_FILE_DATAFILEITEM_H
#include "GUI/Model/Type/NamedItem.h"
#include <QObject>
@@ -68,4 +68,4 @@ private:
std::unique_ptr<DataItem> m_data_item; //!< Can be 1D or 2D item.
};
-#endif // BORNAGAIN_GUI_MODEL_FILES_DATAFILEITEM_H
+#endif // BORNAGAIN_GUI_MODEL_FILE_DATAFILEITEM_H
diff --git a/GUI/Model/Files/DatafilesCleaner.cpp b/GUI/Model/File/DatafilesCleaner.cpp
similarity index 92%
rename from GUI/Model/Files/DatafilesCleaner.cpp
rename to GUI/Model/File/DatafilesCleaner.cpp
index 97571fbb98a..984aef5b0c0 100644
--- a/GUI/Model/Files/DatafilesCleaner.cpp
+++ b/GUI/Model/File/DatafilesCleaner.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafilesCleaner.cpp
+//! @file GUI/Model/File/DatafilesCleaner.cpp
//! @brief Implements class DatafilesCleaner.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Files/DatafilesCleaner.h"
+#include "GUI/Model/File/DatafilesCleaner.h"
#include "GUI/Model/Data/DataItem.h"
#include <QFile>
diff --git a/GUI/Model/Files/DatafilesCleaner.h b/GUI/Model/File/DatafilesCleaner.h
similarity index 83%
rename from GUI/Model/Files/DatafilesCleaner.h
rename to GUI/Model/File/DatafilesCleaner.h
index c07852bdc96..1b8569c55b0 100644
--- a/GUI/Model/Files/DatafilesCleaner.h
+++ b/GUI/Model/File/DatafilesCleaner.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafilesCleaner.h
+//! @file GUI/Model/File/DatafilesCleaner.h
//! @brief Defines class DatafilesCleaner.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_FILES_DATAFILESCLEANER_H
-#define BORNAGAIN_GUI_MODEL_FILES_DATAFILESCLEANER_H
+#ifndef BORNAGAIN_GUI_MODEL_FILE_DATAFILESCLEANER_H
+#define BORNAGAIN_GUI_MODEL_FILE_DATAFILESCLEANER_H
#include <QVector>
@@ -35,4 +35,4 @@ private:
QStringList m_fnames;
};
-#endif // BORNAGAIN_GUI_MODEL_FILES_DATAFILESCLEANER_H
+#endif // BORNAGAIN_GUI_MODEL_FILE_DATAFILESCLEANER_H
diff --git a/GUI/Model/Files/DatafilesSet.cpp b/GUI/Model/File/DatafilesSet.cpp
similarity index 96%
rename from GUI/Model/Files/DatafilesSet.cpp
rename to GUI/Model/File/DatafilesSet.cpp
index 18b7a3106b8..10df52d95f3 100644
--- a/GUI/Model/Files/DatafilesSet.cpp
+++ b/GUI/Model/File/DatafilesSet.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafilesSet.cpp
+//! @file GUI/Model/File/DatafilesSet.cpp
//! @brief Implements class DatafilesSet.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Files/DatafilesSet.h b/GUI/Model/File/DatafilesSet.h
similarity index 79%
rename from GUI/Model/Files/DatafilesSet.h
rename to GUI/Model/File/DatafilesSet.h
index 99ea7964f38..4a250779907 100644
--- a/GUI/Model/Files/DatafilesSet.h
+++ b/GUI/Model/File/DatafilesSet.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Files/DatafilesSet.h
+//! @file GUI/Model/File/DatafilesSet.h
//! @brief Defines class DatafilesSet.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_FILES_DATAFILESSET_H
-#define BORNAGAIN_GUI_MODEL_FILES_DATAFILESSET_H
+#ifndef BORNAGAIN_GUI_MODEL_FILE_DATAFILESSET_H
+#define BORNAGAIN_GUI_MODEL_FILE_DATAFILESSET_H
-#include "GUI/Model/Files/DatafileItem.h"
-#include "GUI/Model/Files/DatafilesCleaner.h"
+#include "GUI/Model/File/DatafileItem.h"
+#include "GUI/Model/File/DatafilesCleaner.h"
#include "GUI/Model/Type/SetWithModel.h"
class DataItem;
@@ -39,4 +39,4 @@ private:
mutable DatafilesCleaner dataFilesCleaner;
};
-#endif // BORNAGAIN_GUI_MODEL_FILES_DATAFILESSET_H
+#endif // BORNAGAIN_GUI_MODEL_FILE_DATAFILESSET_H
diff --git a/GUI/Model/Job/DataSource.cpp b/GUI/Model/Job/DataSource.cpp
index 9cc6fead48f..cd598927136 100644
--- a/GUI/Model/Job/DataSource.cpp
+++ b/GUI/Model/Job/DataSource.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/Data1DItem.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 5c7dbdc5721..88001fb3761 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Detector/DetectorItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Job/ParameterTreeBuilder.h"
#include "GUI/Model/Mask/MaskUnitsConverter.h"
diff --git a/GUI/Model/Job/JobsSet.cpp b/GUI/Model/Job/JobsSet.cpp
index 6cf013e27c7..de5885b75e2 100644
--- a/GUI/Model/Job/JobsSet.cpp
+++ b/GUI/Model/Job/JobsSet.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Model/Job/JobsSet.h"
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "GUI/Model/Job/BatchInfo.h"
#include "GUI/Model/Par/ParameterTreeItems.h"
#include "GUI/Support/Data/JobStatus.h"
diff --git a/GUI/Model/Job/JobsSet.h b/GUI/Model/Job/JobsSet.h
index 7234cb15abb..11aceb86938 100644
--- a/GUI/Model/Job/JobsSet.h
+++ b/GUI/Model/Job/JobsSet.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_JOB_JOBSSET_H
#include "Base/Type/VectorWC.h"
-#include "GUI/Model/Files/DatafilesCleaner.h"
+#include "GUI/Model/File/DatafilesCleaner.h"
#include "GUI/Model/Job/JobItem.h"
#include <QObject>
#include <QXmlStreamReader>
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 145cb7ab690..b47872a557f 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -15,8 +15,8 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentsSet.h"
-#include "GUI/Model/Files/DatafileItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafileItem.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Project/ProjectUtil.h"
diff --git a/GUI/View/Canvas/SpecularDataCanvas.cpp b/GUI/View/Canvas/SpecularDataCanvas.cpp
index 925365c6072..e074d8bc798 100644
--- a/GUI/View/Canvas/SpecularDataCanvas.cpp
+++ b/GUI/View/Canvas/SpecularDataCanvas.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Canvas/SpecularDataCanvas.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/Data1DItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Canvas/SavePlotAssistant.h"
diff --git a/GUI/View/FitControl/FitObjectiveBuilder.cpp b/GUI/View/FitControl/FitObjectiveBuilder.cpp
index 776c9509df5..a7bcf68823c 100644
--- a/GUI/View/FitControl/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitControl/FitObjectiveBuilder.cpp
@@ -18,7 +18,7 @@
#include "Fit/Kernel/Minimizer.h"
#include "Fit/Minimizer/IMinimizer.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Mini/MinimizerItems.h"
#include "GUI/Model/ToCore/SimulationToCore.h"
diff --git a/GUI/View/Frame/Plot2DFrame.cpp b/GUI/View/Frame/Plot2DFrame.cpp
index 501b0d08015..d89242ae363 100644
--- a/GUI/View/Frame/Plot2DFrame.cpp
+++ b/GUI/View/Frame/Plot2DFrame.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Frame/Plot2DFrame.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Mask/MasksQModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Frame/StackedFrames.cpp b/GUI/View/Frame/StackedFrames.cpp
index 623af6efbe2..8d45ff613fb 100644
--- a/GUI/View/Frame/StackedFrames.cpp
+++ b/GUI/View/Frame/StackedFrames.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Frame/StackedFrames.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Frame/Fit1DFrame.h"
diff --git a/GUI/View/Loader/DataLoader.cpp b/GUI/View/Loader/DataLoader.cpp
index 91a7215a478..adead1befd8 100644
--- a/GUI/View/Loader/DataLoader.cpp
+++ b/GUI/View/Loader/DataLoader.cpp
@@ -18,7 +18,7 @@
#include "Device/IO/IOFactory.h"
#include "Device/IO/ZipUtil.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Files/DatafileItem.h"
+#include "GUI/Model/File/DatafileItem.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Base/AppConfig.h"
#include "GUI/View/Info/MessageBox.h"
diff --git a/GUI/View/Setup/AxesPanel.cpp b/GUI/View/Setup/AxesPanel.cpp
index 079d6a0b4d2..864d5239e82 100644
--- a/GUI/View/Setup/AxesPanel.cpp
+++ b/GUI/View/Setup/AxesPanel.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/Data2DItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Data/ComboProperty.h"
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index 65d5fcea9e3..68fa1fb633d 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Data/Data1DItem.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/DataSource.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Data/ComboProperty.h"
diff --git a/GUI/View/View/DatafilesSelector.cpp b/GUI/View/View/DatafilesSelector.cpp
index 5c7840edfaa..42be80df605 100644
--- a/GUI/View/View/DatafilesSelector.cpp
+++ b/GUI/View/View/DatafilesSelector.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/View/DatafilesSelector.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Loader/DataLoader.h"
#include "GUI/View/Modelview/SetView.h"
diff --git a/GUI/View/View/SimulationView.cpp b/GUI/View/View/SimulationView.cpp
index 042fc393d70..92c1d4c199d 100644
--- a/GUI/View/View/SimulationView.cpp
+++ b/GUI/View/View/SimulationView.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/View/SimulationView.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Device/InstrumentsSet.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobsSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/Tests/Unit/GUI/TestDatafilesModel.cpp b/Tests/Unit/GUI/TestDatafilesModel.cpp
index 16079196137..ca25218f372 100644
--- a/Tests/Unit/GUI/TestDatafilesModel.cpp
+++ b/Tests/Unit/GUI/TestDatafilesModel.cpp
@@ -6,8 +6,8 @@
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsSet.h"
-#include "GUI/Model/Files/DatafileItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafileItem.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Tests/Unit/GUI/Utils.h"
#include <QTest>
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index f9a3083c01f..49e77480e81 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -4,8 +4,8 @@
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentsSet.h"
-#include "GUI/Model/Files/DatafileItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafileItem.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Project/ProjectUtil.h"
#include "GUI/Support/Util/Path.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 898db0791da..fd275a571ca 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -18,8 +18,8 @@
#include "Device/IO/DiffUtil.h"
#include "Device/IO/IOFactory.h"
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Files/DatafileItem.h"
-#include "GUI/Model/Files/DatafilesSet.h"
+#include "GUI/Model/File/DatafileItem.h"
+#include "GUI/Model/File/DatafilesSet.h"
#include "GUI/Model/Project/ProjectUtil.h"
void UTest::GUI::create_dir(const QString& dir_name)
--
GitLab
From ff1e7398e2dd030468aacc7138029c02f8371aaa Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 13 Mar 2024 13:36:30 +0100
Subject: [PATCH 32/32] repair Swig bindings
---
Wrap/Swig/fromBase.i | 4 ++--
Wrap/Swig/libBornAgainParam.i | 2 +-
auto/Wrap/libBornAgainBase_wrap.cpp | 4 ++--
auto/Wrap/libBornAgainResample_wrap.cpp | 2 +-
auto/Wrap/libBornAgainSample_wrap.cpp | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Wrap/Swig/fromBase.i b/Wrap/Swig/fromBase.i
index fe89a6f0d4a..83569ea7e58 100644
--- a/Wrap/Swig/fromBase.i
+++ b/Wrap/Swig/fromBase.i
@@ -1,7 +1,7 @@
%import(module="libBornAgainBase") <heinz/Complex.h>
%import(module="libBornAgainBase") <heinz/Vectors3D.h>
-%import(module="libBornAgainBase") "Base/Types/ICloneable.h"
-%import(module="libBornAgainBase") "Base/Types/Span.h"
+%import(module="libBornAgainBase") "Base/Type/ICloneable.h"
+%import(module="libBornAgainBase") "Base/Type/Span.h"
%import(module="libBornAgainBase") "Base/Vector/RotMatrix.h"
%import(module="libBornAgainBase") "Base/Axis/Scale.h"
%import(module="libBornAgainBase") "Base/Axis/Frame.h"
diff --git a/Wrap/Swig/libBornAgainParam.i b/Wrap/Swig/libBornAgainParam.i
index 7b4cacd9005..e4b2ef349a8 100644
--- a/Wrap/Swig/libBornAgainParam.i
+++ b/Wrap/Swig/libBornAgainParam.i
@@ -25,7 +25,7 @@
%}
%import(module="libBornAgainBase") <heinz/Complex.h>
-%import(module="libBornAgainBase") "Base/Types/ICloneable.h"
+%import(module="libBornAgainBase") "Base/Type/ICloneable.h"
%template(swig_dummy_type_const_inode_vector) std::vector<const INode*>;
%template(vector_parsample_t) std::vector<ParameterSample>;
diff --git a/auto/Wrap/libBornAgainBase_wrap.cpp b/auto/Wrap/libBornAgainBase_wrap.cpp
index 317244d4a27..b8fb07a90c4 100644
--- a/auto/Wrap/libBornAgainBase_wrap.cpp
+++ b/auto/Wrap/libBornAgainBase_wrap.cpp
@@ -7023,8 +7023,8 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Base/Axis/MakeScale.h"
#include "Base/Const/Units.h"
#include "Base/Math/Numeric.h"
-#include "Base/Types/ICloneable.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/ICloneable.h"
+#include "Base/Type/Span.h"
#include "Base/Vector/RotMatrix.h"
diff --git a/auto/Wrap/libBornAgainResample_wrap.cpp b/auto/Wrap/libBornAgainResample_wrap.cpp
index 4781d3f5332..9700cd22554 100644
--- a/auto/Wrap/libBornAgainResample_wrap.cpp
+++ b/auto/Wrap/libBornAgainResample_wrap.cpp
@@ -7014,7 +7014,7 @@ SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std
SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_0(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::value_type const &x){ return self->insert(pos, x); }
SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_1(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::size_type n,std::vector< std::pair< double,double > >::value_type const &x){ self->insert(pos, n, x); }
-#include "Resample/Options/SimulationOptions.h"
+#include "Resample/Option/SimulationOptions.h"
SWIGINTERN int
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index 4146a620791..0758dd49ae3 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -7122,7 +7122,7 @@ SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std
SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_1(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::size_type n,std::vector< std::pair< double,double > >::value_type const &x){ self->insert(pos, n, x); }
#include "Base/Axis/Frame.h"
-#include "Base/Types/Span.h"
+#include "Base/Type/Span.h"
#include "Base/Vector/RotMatrix.h"
#include "Param/Distrib/ParameterDistribution.h"
#include "Sample/Aggregate/Interference1DLattice.h"
@@ -7134,7 +7134,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Sample/Aggregate/InterferenceNone.h"
#include "Sample/Aggregate/InterferenceRadialParacrystal.h"
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Sample/Correlations/IPeakShape.h"
+#include "Sample/Correlation/IPeakShape.h"
#include "Sample/HardParticle/HardParticles.h"
#include "Sample/Lattice/Lattice3D.h"
#include "Sample/Lattice/BakeLattice.h"
--
GitLab