UnitConverter2D: delete default c'tor

Device/Instrument/UnitConverter2D.cpp

@@ -43,6 +43,14 @@ UnitConverter2D::UnitConverter2D(const Beam& beam)
 {
 }
 
+UnitConverter2D::UnitConverter2D(const UnitConverter2D& other)
+    : m_axis_data_table(other.m_axis_data_table)
+    , m_wavelength(other.m_wavelength)
+    , m_alpha_i(other.m_alpha_i)
+    , m_phi_i(other.m_phi_i)
+{
+}
+
 void UnitConverter2D::addAxisData(std::string name, double min, double max,
                                   Axes::Units default_units, size_t nbins)
 {
@@ -90,14 +98,6 @@ std::unique_ptr<const IAxis> UnitConverter2D::createConvertedAxis(size_t i_axis,
     return std::make_unique<FixedBinAxis>(axis_name, axis_size, min, max);
 }
 
-UnitConverter2D::UnitConverter2D(const UnitConverter2D& other)
-    : m_axis_data_table(other.m_axis_data_table)
-    , m_wavelength(other.m_wavelength)
-    , m_alpha_i(other.m_alpha_i)
-    , m_phi_i(other.m_phi_i)
-{
-}
-
 void UnitConverter2D::addDetectorAxis(const IDetector& detector, size_t i_axis)
 {
     const auto& axis = detector.axis(i_axis);
@@ -138,6 +138,8 @@ SphericalConverter::SphericalConverter(const SphericalDetector& detector, const
     addDetectorAxis(detector, 1);
 }
 
+SphericalConverter::SphericalConverter(const SphericalConverter& other) : UnitConverter2D(other) {}
+
 SphericalConverter::~SphericalConverter() = default;
 
 SphericalConverter* SphericalConverter::clone() const
@@ -152,8 +154,6 @@ std::vector<Axes::Units> SphericalConverter::availableUnits() const
     return result;
 }
 
-SphericalConverter::SphericalConverter(const SphericalConverter& other) : UnitConverter2D(other) {}
-
 double SphericalConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
 {
     switch (units) {
@@ -210,6 +210,11 @@ RectangularConverter::RectangularConverter(const RectangularDetector& detector,
     m_detector_pixel.reset(detector.regionOfInterestPixel());
 }
 
+RectangularConverter::RectangularConverter(const RectangularConverter& other)
+    : UnitConverter2D(other), m_detector_pixel(other.m_detector_pixel->clone())
+{
+}
+
 RectangularConverter::~RectangularConverter() = default;
 
 RectangularConverter* RectangularConverter::clone() const
@@ -225,11 +230,6 @@ std::vector<Axes::Units> RectangularConverter::availableUnits() const
     return result;
 }
 
-RectangularConverter::RectangularConverter(const RectangularConverter& other)
-    : UnitConverter2D(other), m_detector_pixel(other.m_detector_pixel->clone())
-{
-}
-
 double RectangularConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
 {
     if (units == Axes::Units::MM)
@@ -307,6 +307,11 @@ OffSpecularConverter::OffSpecularConverter(const IDetector2D& detector, const Be
     addDetectorYAxis(detector);
 }
 
+OffSpecularConverter::OffSpecularConverter(const OffSpecularConverter& other)
+    : UnitConverter2D(other)
+{
+}
+
 OffSpecularConverter::~OffSpecularConverter() = default;
 
 OffSpecularConverter* OffSpecularConverter::clone() const
@@ -319,11 +324,6 @@ Axes::Units OffSpecularConverter::defaultUnits() const
     return Axes::Units::DEGREES;
 }
 
-OffSpecularConverter::OffSpecularConverter(const OffSpecularConverter& other)
-    : UnitConverter2D(other)
-{
-}
-
 double OffSpecularConverter::calculateValue(size_t, Axes::Units units, double value) const
 {
     switch (units) {
@@ -388,6 +388,10 @@ DepthProbeConverter::DepthProbeConverter(const Beam& beam, const IAxis& alpha_ax
                 z_axis.size());
 }
 
+DepthProbeConverter::DepthProbeConverter(const DepthProbeConverter& other) : UnitConverter2D(other)
+{
+}
+
 DepthProbeConverter::~DepthProbeConverter() = default;
 
 DepthProbeConverter* DepthProbeConverter::clone() const
@@ -402,10 +406,6 @@ std::vector<Axes::Units> DepthProbeConverter::availableUnits() const
     return result;
 }
 
-DepthProbeConverter::DepthProbeConverter(const DepthProbeConverter& other) : UnitConverter2D(other)
-{
-}
-
 double DepthProbeConverter::calculateValue(size_t i_axis, Axes::Units units, double value) const
 {
     checkUnits(units);

Device/Instrument/UnitConverter2D.h

@@ -87,8 +87,8 @@ private:
 
 class SphericalConverter : public UnitConverter2D {
 public:
+    SphericalConverter() = delete;
     SphericalConverter(const SphericalDetector& detector, const Beam& beam);
-
     ~SphericalConverter() override;
 
     SphericalConverter* clone() const override;
@@ -99,7 +99,7 @@ public:
     Axes::Units defaultUnits() const override { return Axes::Units::DEGREES; }
 
 private:
-    SphericalConverter(const SphericalConverter& other);
+    SphericalConverter(const SphericalConverter& other); //!< used by clone()
     double calculateValue(size_t i_axis, Axes::Units units, double value) const override;
     std::vector<std::map<Axes::Units, std::string>> createNameMaps() const override;
 };
@@ -111,6 +111,7 @@ private:
 
 class RectangularConverter : public UnitConverter2D {
 public:
+    RectangularConverter() = delete;
     RectangularConverter(const RectangularDetector& detector, const Beam& beam);
     ~RectangularConverter() override;
 
@@ -122,11 +123,12 @@ public:
     Axes::Units defaultUnits() const override { return Axes::Units::MM; }
 
 private:
-    RectangularConverter(const RectangularConverter& other);
+    RectangularConverter(const RectangularConverter& other); //!< used by clone()
     double calculateValue(size_t i_axis, Axes::Units units, double value) const override;
     std::vector<std::map<Axes::Units, std::string>> createNameMaps() const override;
     kvector_t normalizeToWavelength(kvector_t vector) const;
     double axisAngle(size_t i_axis, kvector_t k_f) const;
+
     std::unique_ptr<RectangularPixel> m_detector_pixel;
 };
 
@@ -138,6 +140,7 @@ private:
 
 class OffSpecularConverter : public UnitConverter2D {
 public:
+    OffSpecularConverter() = delete;
     OffSpecularConverter(const IDetector2D& detector, const Beam& beam, const IAxis& alpha_axis);
     ~OffSpecularConverter() override;
 
@@ -146,7 +149,7 @@ public:
     Axes::Units defaultUnits() const override;
 
 private:
-    OffSpecularConverter(const OffSpecularConverter& other);
+    OffSpecularConverter(const OffSpecularConverter& other); //!< used by clone()
     double calculateValue(size_t i_axis, Axes::Units units, double value) const override;
     std::vector<std::map<Axes::Units, std::string>> createNameMaps() const override;
     void addDetectorYAxis(const IDetector2D& detector);
@@ -159,6 +162,7 @@ private:
 
 class DepthProbeConverter : public UnitConverter2D {
 public:
+    DepthProbeConverter() = delete;
     DepthProbeConverter(const Beam& beam, const IAxis& alpha_axis, const IAxis& z_axis);
     ~DepthProbeConverter() override;
 
@@ -170,7 +174,7 @@ public:
     Axes::Units defaultUnits() const override { return Axes::Units::DEGREES; }
 
 private:
-    DepthProbeConverter(const DepthProbeConverter& other);
+    DepthProbeConverter(const DepthProbeConverter& other); //!< used by clone()
     double calculateValue(size_t, Axes::Units units, double value) const override;
     std::vector<std::map<Axes::Units, std::string>> createNameMaps() const override;
     void checkUnits(Axes::Units units) const;

auto/Wrap/doxygenDevice.i

@@ -227,6 +227,9 @@ DepthProbeConverter class handles the unit translations for depth probe simulati
 C++ includes: UnitConverter2D.h
 ";
 
+%feature("docstring")  DepthProbeConverter::DepthProbeConverter "DepthProbeConverter::DepthProbeConverter()=delete
+";
+
 %feature("docstring")  DepthProbeConverter::DepthProbeConverter "DepthProbeConverter::DepthProbeConverter(const Beam &beam, const IAxis &alpha_axis, const IAxis &z_axis)
 ";
 
@@ -1582,6 +1585,9 @@ IUnitConverter class that handles the unit translations for off-specular simulat
 C++ includes: UnitConverter2D.h
 ";
 
+%feature("docstring")  OffSpecularConverter::OffSpecularConverter "OffSpecularConverter::OffSpecularConverter()=delete
+";
+
 %feature("docstring")  OffSpecularConverter::OffSpecularConverter "OffSpecularConverter::OffSpecularConverter(const IDetector2D &detector, const Beam &beam, const IAxis &alpha_axis)
 ";
 
@@ -2146,6 +2152,9 @@ IUnitConverter class that handles the unit translations for rectangular detector
 C++ includes: UnitConverter2D.h
 ";
 
+%feature("docstring")  RectangularConverter::RectangularConverter "RectangularConverter::RectangularConverter()=delete
+";
+
 %feature("docstring")  RectangularConverter::RectangularConverter "RectangularConverter::RectangularConverter(const RectangularDetector &detector, const Beam &beam)
 ";
 
@@ -2588,6 +2597,9 @@ IUnitConverter class that handles the unit translations for spherical detectors
 C++ includes: UnitConverter2D.h
 ";
 
+%feature("docstring")  SphericalConverter::SphericalConverter "SphericalConverter::SphericalConverter()=delete
+";
+
 %feature("docstring")  SphericalConverter::SphericalConverter "SphericalConverter::SphericalConverter(const SphericalDetector &detector, const Beam &beam)
 ";