From 201710b820ab877f2628d2697c8ca55826ae68e7 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 23 Apr 2021 10:50:58 +0200
Subject: [PATCH] rename class and files -> UnitConverter2D
---
Core/Fitting/SimDataPair.cpp | 2 +-
Core/Simulation/DepthProbeSimulation.cpp | 2 +-
Core/Simulation/GISASSimulation.cpp | 2 +-
Core/Simulation/OffSpecularSimulation.cpp | 2 +-
...UnitConverters.cpp => UnitConverter2D.cpp} | 4 +--
...mpleUnitConverters.h => UnitConverter2D.h} | 2 +-
.../Models/DepthProbeInstrumentItem.cpp | 2 +-
GUI/coregui/Models/DomainObjectBuilder.cpp | 2 +-
.../Core/Core/DepthProbeConverterTest.cpp | 2 +-
.../Instrument/OffSpecularConverterTest.cpp | 2 +-
.../Instrument/RectangularConverterTest.cpp | 2 +-
.../Instrument/SphericalConverterTest.cpp | 2 +-
auto/Wrap/doxygenDevice.i | 26 +++++++++----------
13 files changed, 26 insertions(+), 26 deletions(-)
rename Device/Detector/{SimpleUnitConverters.cpp => UnitConverter2D.cpp} (99%)
rename Device/Detector/{SimpleUnitConverters.h => UnitConverter2D.h} (99%)
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index f6ab295de6a..29f50b8548d 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -15,7 +15,7 @@
#include "Core/Fitting/SimDataPair.h"
#include "Base/Math/Numeric.h"
#include "Core/Scan/UnitConverter1D.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Core/Simulation/includeSimulations.h"
#include "Device/Data/DataUtils.h"
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index b23198d7588..535814835cd 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -16,7 +16,7 @@
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
#include "Device/Beam/IFootprintFactor.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SpecularDetector1D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index b97a1056f61..fa98019d9af 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Core/Simulation/GISASSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
GISASSimulation::GISASSimulation(const Beam& beam, const MultiLayer& sample,
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index f9b002bf15a..ff8fe0d03db 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Core/Simulation/OffSpecularSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
diff --git a/Device/Detector/SimpleUnitConverters.cpp b/Device/Detector/UnitConverter2D.cpp
similarity index 99%
rename from Device/Detector/SimpleUnitConverters.cpp
rename to Device/Detector/UnitConverter2D.cpp
index 10e08f5f967..411dead2e09 100644
--- a/Device/Detector/SimpleUnitConverters.cpp
+++ b/Device/Detector/UnitConverter2D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Detector/SimpleUnitConverters.cpp
+//! @file Device/Detector/UnitConverter2D.cpp
//! @brief Implements IUnitConverter classes.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Base/Pixel/RectangularPixel.h"
diff --git a/Device/Detector/SimpleUnitConverters.h b/Device/Detector/UnitConverter2D.h
similarity index 99%
rename from Device/Detector/SimpleUnitConverters.h
rename to Device/Detector/UnitConverter2D.h
index b2f52e59eda..0e47eb9935c 100644
--- a/Device/Detector/SimpleUnitConverters.h
+++ b/Device/Detector/UnitConverter2D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Detector/SimpleUnitConverters.h
+//! @file Device/Detector/UnitConverter2D.h
//! @brief Defines interface UnitConverterSimple and its subclasses.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
index 9cb127634dc..1c6f5399e44 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
@@ -15,7 +15,7 @@
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
#include "Base/Const/Units.h"
#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 91946b33fc7..0b548a24d89 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/Units.h"
#include "Core/Scan/UnitConverter1D.h"
#include "Device/Detector/IDetector2D.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
diff --git a/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp b/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
index b7b0653beab..ae0bcd7a710 100644
--- a/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
+++ b/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
@@ -2,7 +2,7 @@
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
class DepthProbeConverterTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
index 7cc188c5963..00981acf626 100644
--- a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp b/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
index 9e30d02554e..0f7aca1215d 100644
--- a/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
@@ -1,7 +1,7 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/RectangularDetector.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
index a849606e317..0823271f580 100644
--- a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index e6e275b5b8d..2d46df823e6 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -224,7 +224,7 @@ C++ includes: CumulativeValue.h
DepthProbeConverter class handles the unit translations for depth probe simulations Its default units are radians for x-axis and nm for y-axis
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") DepthProbeConverter::DepthProbeConverter "DepthProbeConverter::DepthProbeConverter(const Beam &beam, const IAxis &alpha_axis, const IAxis &z_axis)
@@ -1456,7 +1456,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
Interface to provide axis translations to different units for simulation output.
Child classes are currently declared in
- Device/Detector/SimpleUnitConverters.h,
+Device/Detector/SimpleUnitConverters.h,
Core/Scan/UnitConverter1D.h.
@@ -1582,7 +1582,7 @@ C++ includes: LLData.h
IUnitConverter class that handles the unit translations for off-specular simulations with a spherical detector Its default units are radians for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") OffSpecularConverter::OffSpecularConverter "OffSpecularConverter::OffSpecularConverter(const IDetector2D &detector, const Beam &beam, const IAxis &alpha_axis)
@@ -2146,7 +2146,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
IUnitConverter class that handles the unit translations for rectangular detectors Its default units are mm for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") RectangularConverter::RectangularConverter "RectangularConverter::RectangularConverter(const RectangularDetector &detector, const Beam &beam)
@@ -2588,7 +2588,7 @@ Return default axes units.
IUnitConverter class that handles the unit translations for spherical detectors Its default units are radians for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") SphericalConverter::SphericalConverter "SphericalConverter::SphericalConverter(const SphericalDetector &detector, const Beam &beam)
@@ -2689,7 +2689,7 @@ return default axes units
Interface for objects that provide axis translations to different units for IDetector objects
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") UnitConverterSimple::UnitConverterSimple "UnitConverterSimple::UnitConverterSimple(const Beam &beam)
@@ -2759,7 +2759,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
// File: namespace_0d11.xml
-// File: namespace_0d28.xml
+// File: namespace_0d36.xml
// File: namespace_0d51.xml
@@ -3040,12 +3040,6 @@ make Swappable
// File: RectangularDetector_8h.xml
-// File: SimpleUnitConverters_8cpp.xml
-
-
-// File: SimpleUnitConverters_8h.xml
-
-
// File: SimulationArea_8cpp.xml
@@ -3070,6 +3064,12 @@ make Swappable
// File: SphericalDetector_8h.xml
+// File: UnitConverter2D_8cpp.xml
+
+
+// File: UnitConverter2D_8h.xml
+
+
// File: Histogram1D_8cpp.xml
--
GitLab