From b7506e450aa595e7822f4cf65545b9049fa4fb04 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Tue, 4 Jul 2023 18:26:42 +0200
Subject: [PATCH] rm availableUnits()
---
Device/Coord/CoordSystem1D.cpp | 16 ----------------
Device/Coord/CoordSystem1D.h | 7 -------
Device/Coord/CoordSystem2D.cpp | 30 ------------------------------
Device/Coord/CoordSystem2D.h | 10 ----------
Device/Coord/ICoordSystem.h | 2 --
5 files changed, 65 deletions(-)
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index 3be5579d445..a6359ef1a31 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -99,16 +99,6 @@ AngularReflectometryCoords* AngularReflectometryCoords::clone() const
return new AngularReflectometryCoords(*this);
}
-std::vector<Coords> AngularReflectometryCoords::availableUnits() const
-{
- return availableUnits0();
-}
-
-std::vector<Coords> AngularReflectometryCoords::availableUnits0() // static
-{
- return {Coords::NBINS, Coords::RADIANS, Coords::DEGREES, Coords::QSPACE};
-}
-
std::string AngularReflectometryCoords::nameOfAxis(size_t i_axis) const
{
ASSERT(i_axis == 0);
@@ -157,12 +147,6 @@ WavenumberReflectometryCoords* WavenumberReflectometryCoords::clone() const
return new WavenumberReflectometryCoords(*this);
}
-//! Returns the list of all available units
-std::vector<Coords> WavenumberReflectometryCoords::availableUnits() const
-{
- return {Coords::NBINS, Coords::QSPACE};
-}
-
std::string WavenumberReflectometryCoords::nameOfAxis(size_t) const
{
return "Q [1/nm]";
diff --git a/Device/Coord/CoordSystem1D.h b/Device/Coord/CoordSystem1D.h
index 997a287f084..dce1cd90224 100644
--- a/Device/Coord/CoordSystem1D.h
+++ b/Device/Coord/CoordSystem1D.h
@@ -55,13 +55,9 @@ public:
AngularReflectometryCoords* clone() const override;
- static std::vector<Coords> availableUnits0();
static std::string nameOfAxis0();
private:
- //! Returns the list of all available units
- std::vector<Coords> availableUnits() const override;
-
std::string nameOfAxis(size_t i_axis) const override;
AngularReflectometryCoords(const AngularReflectometryCoords& other);
@@ -82,9 +78,6 @@ public:
WavenumberReflectometryCoords* clone() const override;
private:
- //! Returns the list of all available units
- std::vector<Coords> availableUnits() const override;
-
std::string nameOfAxis(size_t i_axis) const override;
WavenumberReflectometryCoords(const WavenumberReflectometryCoords& other);
diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp
index fc6824e36bc..bcafe0b093b 100644
--- a/Device/Coord/CoordSystem2D.cpp
+++ b/Device/Coord/CoordSystem2D.cpp
@@ -50,11 +50,6 @@ double CoordSystem2D::calculateMax(size_t i_axis) const
return calculateValue(i_axis, m_axes[i_axis]->max());
}
-std::vector<Coords> CoordSystem2D::availableUnits() const
-{
- return {Coords::NBINS, Coords::RADIANS, Coords::DEGREES};
-}
-
Scale* CoordSystem2D::convertedAxis(size_t i_axis) const
{
const double min = calculateMin(i_axis);
@@ -84,13 +79,6 @@ SphericalCoords* SphericalCoords::clone() const
return new SphericalCoords(*this);
}
-std::vector<Coords> SphericalCoords::availableUnits() const
-{
- auto result = CoordSystem2D::availableUnits();
- result.push_back(Coords::QSPACE);
- return result;
-}
-
double SphericalCoords::calculateValue(size_t, double value) const
{
return value;
@@ -134,14 +122,6 @@ ImageCoords* ImageCoords::clone() const
return new ImageCoords(*this);
}
-std::vector<Coords> ImageCoords::availableUnits() const
-{
- auto result = CoordSystem2D::availableUnits();
- result.push_back(Coords::QSPACE);
- result.push_back(Coords::MM);
- return result;
-}
-
double ImageCoords::calculateValue(size_t, double value) const
{
return value;
@@ -240,20 +220,10 @@ DepthprobeCoords* DepthprobeCoords::clone() const
return new DepthprobeCoords(*this);
}
-std::vector<Coords> DepthprobeCoords::availableUnits() const
-{
- auto result = CoordSystem2D::availableUnits();
- result.push_back(Coords::QSPACE);
- return result;
-}
-
double DepthprobeCoords::calculateValue(size_t, double value) const
{
return value;
/*
- const auto& available_units = availableUnits();
- if (std::find(available_units.begin(), available_units.end(), units) == available_units.cend())
- ASSERT(false);
if (i_axis == 1)
return value; // unit conversions are not applied to sample position axis
diff --git a/Device/Coord/CoordSystem2D.h b/Device/Coord/CoordSystem2D.h
index 1ee0527c607..df9ac69af07 100644
--- a/Device/Coord/CoordSystem2D.h
+++ b/Device/Coord/CoordSystem2D.h
@@ -35,10 +35,6 @@ public:
double calculateMin(size_t i_axis) const override;
double calculateMax(size_t i_axis) const override;
- //! Returns list of units that are available for all 2D detectors.
- //! Further units may be added by child classes.
- std::vector<Coords> availableUnits() const override;
-
Scale* convertedAxis(size_t i_axis) const override;
protected:
@@ -60,8 +56,6 @@ public:
SphericalCoords* clone() const override;
private:
- std::vector<Coords> availableUnits() const override;
-
std::string nameOfAxis(size_t i_axis) const override;
SphericalCoords(const SphericalCoords& other); //!< used by clone()
@@ -82,8 +76,6 @@ public:
ImageCoords* clone() const override;
private:
- std::vector<Coords> availableUnits() const override;
-
std::string nameOfAxis(size_t i_axis) const override;
ImageCoords(const ImageCoords& other); //!< used by clone()
@@ -123,8 +115,6 @@ public:
DepthprobeCoords* clone() const override;
private:
- std::vector<Coords> availableUnits() const override;
-
std::string nameOfAxis(size_t i_axis) const override;
DepthprobeCoords(const DepthprobeCoords& other); //!< used by clone()
diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h
index e4ffea2800e..dbde2b95799 100644
--- a/Device/Coord/ICoordSystem.h
+++ b/Device/Coord/ICoordSystem.h
@@ -36,8 +36,6 @@ public:
virtual std::string nameOfAxis(size_t i_axis) const = 0;
- virtual std::vector<Coords> availableUnits() const = 0;
-
virtual Scale* convertedAxis(size_t i_axis) const = 0;
std::vector<const Scale*> defaultAxes() const;
--
GitLab