rename class and files -> UnitConverter2D

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"
 

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"

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,

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"

Device/Detector/SimpleUnitConverters.cpp → 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"

Device/Detector/SimpleUnitConverters.h → 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

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"

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"

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 {

Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp

 #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"
 

Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp

 #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>
 

Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp

 #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"
 

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