Various cleanup, cherry-picked from long task #71

Device/Coord/CoordSystem1D.cpp

@@ -77,18 +77,17 @@ double CoordSystem1D::calculateMin(size_t i_axis, Coords units) const
     if (units == Coords::NBINS)
         return 0.0;
     auto translator = getTraslatorTo(units);
-    return translator(coordinateAxis()->binCenter(0));
+    return translator(m_axes[0]->binCenter(0));
 }
 
 double CoordSystem1D::calculateMax(size_t i_axis, Coords units) const
 {
     ASSERT(i_axis == 0);
     units = substituteDefaultUnits(units);
-    const IAxis* const coordinate_axis = coordinateAxis();
     if (units == Coords::NBINS)
-        return static_cast<double>(coordinate_axis->size());
+        return static_cast<double>(m_axes[0]->size());
     auto translator = getTraslatorTo(units);
-    return translator(coordinate_axis->binCenter(coordinate_axis->size() - 1));
+    return translator(m_axes[0]->binCenter(m_axes[0]->size() - 1));
 }
 
 IAxis* CoordSystem1D::createConvertedAxis(size_t i_axis, Coords units) const
@@ -96,11 +95,11 @@ IAxis* CoordSystem1D::createConvertedAxis(size_t i_axis, Coords units) const
     ASSERT(i_axis == 0);
     units = substituteDefaultUnits(units);
     if (units == Coords::NBINS)
-        return new FixedBinAxis(nameOfAxis(0, units), coordinateAxis()->size(),
-                                calculateMin(0, units), calculateMax(0, units));
+        return new FixedBinAxis(nameOfAxis(0, units), m_axes[0]->size(), calculateMin(0, units),
+                                calculateMax(0, units));
 
     std::function<double(double)> translator = getTraslatorTo(units);
-    auto coords = coordinateAxis()->binCenters();
+    auto coords = m_axes[0]->binCenters();
     for (size_t i = 0, size = coords.size(); i < size; ++i)
         coords[i] = translator(coords[i]);
     return new PointwiseAxis(nameOfAxis(0, units), coords);
@@ -194,7 +193,7 @@ WavenumberReflectometryCoords::WavenumberReflectometryCoords(const IAxis* axis)
 
 WavenumberReflectometryCoords::WavenumberReflectometryCoords(
     const WavenumberReflectometryCoords& other)
-    : CoordSystem1D(other.coordinateAxis()->clone())
+    : CoordSystem1D(other.m_axes[0]->clone())
 {
 }