mv fct createOutputData

Core/Simulation/UnitConverterUtils.cpp

@@ -18,16 +18,6 @@
 #include "Device/Detector/SphericalDetector.h"
 #include "Device/Instrument/Instrument.h"
 
-std::unique_ptr<OutputData<double>>
-UnitConverterUtils::createOutputData(const IUnitConverter& converter, Axes::Units units)
-{
-    std::unique_ptr<OutputData<double>> result = std::make_unique<OutputData<double>>();
-    for (size_t i = 0; i < converter.dimension(); ++i)
-        result->addAxis(*converter.createConvertedAxis(i, units));
-    result->setAllTo(0.0);
-    return result;
-}
-
 std::unique_ptr<IUnitConverter>
 UnitConverterUtils::createConverterForGISAS(const Instrument& instrument)
 {

Core/Simulation/UnitConverterUtils.h

@@ -29,10 +29,6 @@ template <class T> class OutputData;
 
 namespace UnitConverterUtils {
 
-//! Returns zero-valued output data array in specified units
-std::unique_ptr<OutputData<double>> createOutputData(const IUnitConverter& converter,
-                                                     Axes::Units units);
-
 //! Helper factory function to use in GISASSimulation. Depending on the type of detector,
 //! returns either RectangularConverter or SphericalConverter.
 std::unique_ptr<IUnitConverter> createConverterForGISAS(const Instrument& instrument);

Device/Unit/IUnitConverter.cpp

@@ -16,6 +16,7 @@
 #include "Device/Data/OutputData.h"
 #include "Device/Unit/AxisNames.h"
 
+
 IUnitConverter::~IUnitConverter() = default;
 
 std::string IUnitConverter::axisName(size_t i_axis, const Axes::Units& units_type) const
@@ -57,3 +58,14 @@ Axes::Units IUnitConverter::substituteDefaultUnits(Axes::Units units) const
 {
     return units == Axes::Units::DEFAULT ? defaultUnits() : units;
 }
+
+
+std::unique_ptr<OutputData<double>>
+UnitConverterUtils::createOutputData(const IUnitConverter& converter, Axes::Units units)
+{
+    std::unique_ptr<OutputData<double>> result = std::make_unique<OutputData<double>>();
+    for (size_t i = 0; i < converter.dimension(); ++i)
+        result->addAxis(*converter.createConvertedAxis(i, units));
+    result->setAllTo(0.0);
+    return result;
+}

Device/Unit/IUnitConverter.h

@@ -26,6 +26,7 @@
 #include <string>
 #include <vector>
 
+
 class IAxis;
 template <class T> class OutputData;
 
@@ -74,6 +75,14 @@ private:
     virtual std::vector<std::map<Axes::Units, std::string>> createNameMaps() const = 0;
 };
 
+
+namespace UnitConverterUtils {
+
+//! Returns zero-valued output data array in specified units
+std::unique_ptr<OutputData<double>> createOutputData(const IUnitConverter& converter,
+                                                     Axes::Units units);
+}
+
 #endif // USER_API
 
 #endif // BORNAGAIN_DEVICE_UNIT_IUNITCONVERTER_H

GUI/coregui/Models/DataViewUtils.cpp

@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/coregui/Models/DataViewUtils.h"
-#include "Core/Simulation/UnitConverterUtils.h"
+#include "Device/Unit/IUnitConverter.h"
 #include "GUI/coregui/Models/Data1DViewItem.h"
 #include "GUI/coregui/Models/DataItem.h"
 #include "GUI/coregui/Models/DataPropertyContainer.h"

GUI/coregui/Models/JobItemUtils.cpp

@@ -14,7 +14,6 @@
 
 #include "GUI/coregui/Models/JobItemUtils.h"
 #include "Core/Simulation/ISimulation.h"
-#include "Core/Simulation/UnitConverterUtils.h"
 #include "GUI/coregui/Models/DataItem.h"
 #include "GUI/coregui/Models/DomainObjectBuilder.h"
 #include "GUI/coregui/Models/InstrumentItems.h"

auto/Wrap/doxygenCore.i

@@ -2683,11 +2683,6 @@ GISAS simulation with an extra long wavelength.
 
 
 // File: namespaceUnitConverterUtils.xml
-%feature("docstring")  UnitConverterUtils::createOutputData "std::unique_ptr< OutputData< double > > UnitConverterUtils::createOutputData(const IUnitConverter &converter, Axes::Units units)
-
-Returns zero-valued output data array in specified units. 
-";
-
 %feature("docstring")  UnitConverterUtils::createConverterForGISAS "std::unique_ptr< IUnitConverter > UnitConverterUtils::createConverterForGISAS(const Instrument &instrument)
 
 Helper factory function to use in  GISASSimulation. Depending on the type of detector, returns either RectangularConverter or SphericalConverter. 

auto/Wrap/doxygenDevice.i

@@ -2945,6 +2945,13 @@ Returns true if SimulatioResult agrees with data from reference file.
 ";
 
 
+// File: namespaceUnitConverterUtils.xml
+%feature("docstring")  UnitConverterUtils::createOutputData "std::unique_ptr< OutputData< double > > UnitConverterUtils::createOutputData(const IUnitConverter &converter, Axes::Units units)
+
+Returns zero-valued output data array in specified units. 
+";
+
+
 // File: Beam_8cpp.xml