From 86d1c85c5cb7d6e35250acaf6249fbada3e2b120 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Sat, 1 Apr 2023 09:37:56 +0200
Subject: [PATCH] rm unused fcts createConvertedData
---
Device/Coord/CoordSystem1D.cpp | 18 ------------
Device/Coord/CoordSystem1D.h | 3 --
Device/Coord/ICoordSystem.cpp | 6 ----
Device/Coord/ICoordSystem.h | 4 ---
Tests/Unit/Sim/CoordSystem1DTest.cpp | 43 ----------------------------
5 files changed, 74 deletions(-)
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index f14f92ae4ed..9801dcbe939 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -18,7 +18,6 @@
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Base/Util/Assert.h"
-#include "Device/Data/Datafield.h"
#include <cmath>
#include <stdexcept>
@@ -114,23 +113,6 @@ IAxis* CoordSystem1D::createConvertedAxis(size_t i_axis, Coords units) const
return new PointwiseAxis(nameOfAxis(0, units), coords);
}
-Datafield* CoordSystem1D::createConvertedData(const Datafield& data, Coords units) const
-{
- ASSERT(data.rank() == 1);
-
- auto q_axis = createConvertedAxis(0, units);
- Datafield* result = new Datafield({q_axis});
-
- if (units != Coords::RQ4) {
- result->setVector(data.flatVector());
- return result;
- }
-
- for (size_t i = 0, size = result->size(); i < size; ++i)
- (*result)[i] = data[i] * std::pow((*q_axis)[i], 4);
- return result;
-}
-
// ************************************************************************************************
// class AngularReflectometryCoords
diff --git a/Device/Coord/CoordSystem1D.h b/Device/Coord/CoordSystem1D.h
index babdb57af06..eec53f0ac94 100644
--- a/Device/Coord/CoordSystem1D.h
+++ b/Device/Coord/CoordSystem1D.h
@@ -46,9 +46,6 @@ public:
//! Creates axis in converted units.
IAxis* createConvertedAxis(size_t i_axis, Coords units) const override;
- //! Creates Datafield array in converter units.
- Datafield* createConvertedData(const Datafield& data, Coords units) const override;
-
protected:
//! Returns translating functional (rads --> output units)
virtual std::function<double(double)> getTraslatorTo(Coords units) const = 0;
diff --git a/Device/Coord/ICoordSystem.cpp b/Device/Coord/ICoordSystem.cpp
index 4605bd544ae..7920aa6dc0c 100644
--- a/Device/Coord/ICoordSystem.cpp
+++ b/Device/Coord/ICoordSystem.cpp
@@ -14,7 +14,6 @@
#include "Device/Coord/ICoordSystem.h"
#include "Base/Util/Assert.h"
-#include "Device/Data/Datafield.h"
#include <sstream>
ICoordSystem::~ICoordSystem() = default;
@@ -32,11 +31,6 @@ std::vector<const IAxis*> ICoordSystem::convertedAxes(Coords units) const
return result;
}
-Datafield* ICoordSystem::createConvertedData(const Datafield& data, Coords units) const
-{
- return new Datafield(convertedAxes(units), data.flatVector());
-}
-
void ICoordSystem::throwUnitsError(std::string method, std::vector<Coords> available) const
{
static const std::map<Coords, const char*> axisUnitLabel = {
diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h
index 864eb4e9bc0..eb7f2b276eb 100644
--- a/Device/Coord/ICoordSystem.h
+++ b/Device/Coord/ICoordSystem.h
@@ -25,7 +25,6 @@
#include <string>
#include <vector>
-class Datafield;
class IAxis;
//! Interface to provide axis translations to different units for simulation output
@@ -56,9 +55,6 @@ public:
std::vector<const IAxis*> defaultAxes() const;
std::vector<const IAxis*> convertedAxes(Coords units) const;
- //! Creates Datafield array in converter units.
- virtual Datafield* createConvertedData(const Datafield& data, Coords units) const;
-
protected:
Coords substituteDefaultUnits(Coords units) const;
[[noreturn]] void throwUnitsError(std::string method, std::vector<Coords> available) const;
diff --git a/Tests/Unit/Sim/CoordSystem1DTest.cpp b/Tests/Unit/Sim/CoordSystem1DTest.cpp
index 41356d5cff0..f82aa4f48d1 100644
--- a/Tests/Unit/Sim/CoordSystem1DTest.cpp
+++ b/Tests/Unit/Sim/CoordSystem1DTest.cpp
@@ -4,7 +4,6 @@
#include "Base/Axis/VariableBinAxis.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
-#include "Device/Data/Datafield.h"
#include "Sim/Scan/QzScan.h"
#include "Tests/GTestWrapper/google_test.h"
#include <algorithm>
@@ -87,27 +86,6 @@ void CoordSystem1DTest::checkConventionalConverter(const CoordSystem1D& test_obj
EXPECT_EQ(axis_rq4->min(), test_object.calculateMin(0, Coords::RQ4));
EXPECT_EQ(axis_rq4->max(), test_object.calculateMax(0, Coords::RQ4));
EXPECT_TRUE(*axis_rq4 == *axis_qspace);
-
- Datafield fake_data({m_axis.clone()});
- std::vector<double> raw_fake(m_axis.size(), 1.0);
- fake_data.setVector(raw_fake);
-
- // NBINS
- auto data_nbins = test_object.createConvertedData(fake_data, Coords::NBINS);
- EXPECT_EQ(data_nbins->axis(0), *axis_nbins);
- EXPECT_EQ(data_nbins->size(), axis_nbins->size());
- EXPECT_EQ(raw_fake, data_nbins->flatVector());
-
- // RQ4
- auto data_rq4 = test_object.createConvertedData(fake_data, Coords::RQ4);
- EXPECT_EQ(data_rq4->axis(0), *axis_rq4);
- auto raw_data_rq4 = data_rq4->flatVector();
- EXPECT_EQ(raw_data_rq4.size(), raw_fake.size());
- EXPECT_EQ(raw_data_rq4.size(), axis_rq4->size());
- for (size_t i = 0, size = raw_data_rq4.size(); i < size; ++i) {
- double value = raw_fake[i] * std::pow(axis_rq4->binCenter(i), 4);
- EXPECT_DOUBLE_EQ(raw_data_rq4[i], value);
- }
}
void CoordSystem1DTest::checkQSpecConverter(const CoordSystem1D& test_object)
@@ -154,27 +132,6 @@ void CoordSystem1DTest::checkQSpecConverter(const CoordSystem1D& test_object)
EXPECT_EQ(axis_rq4->min(), test_object.calculateMin(0, Coords::RQ4));
EXPECT_EQ(axis_rq4->max(), test_object.calculateMax(0, Coords::RQ4));
EXPECT_TRUE(*axis_rq4 == *axis_qspace);
-
- Datafield fake_data({m_axis.clone()});
- std::vector<double> raw_fake(m_axis.size(), 1.0);
- fake_data.setVector(raw_fake);
-
- // NBINS
- auto data_nbins = test_object.createConvertedData(fake_data, Coords::NBINS);
- EXPECT_EQ(data_nbins->axis(0), *axis_nbins);
- EXPECT_EQ(data_nbins->size(), axis_nbins->size());
- EXPECT_EQ(raw_fake, data_nbins->flatVector());
-
- // RQ4
- auto data_rq4 = test_object.createConvertedData(fake_data, Coords::RQ4);
- EXPECT_EQ(data_rq4->axis(0), *axis_rq4);
- auto raw_data_rq4 = data_rq4->flatVector();
- EXPECT_EQ(raw_data_rq4.size(), raw_fake.size());
- EXPECT_EQ(raw_data_rq4.size(), axis_rq4->size());
- for (size_t i = 0, size = raw_data_rq4.size(); i < size; ++i) {
- double value = raw_fake[i] * std::pow(axis_rq4->binCenter(i), 4);
- EXPECT_DOUBLE_EQ(raw_data_rq4[i], value);
- }
}
TEST_F(CoordSystem1DTest, MainFunctionality)
--
GitLab