diff --git a/common/StatusVector.cpp b/common/StatusVector.cpp index a4e18ef4..43193c31 100644 --- a/common/StatusVector.cpp +++ b/common/StatusVector.cpp @@ -50,14 +50,9 @@ int32_t StatusVector::GetActualBinning(int32_t bin_size) const { return bin_size; } -[[nodiscard]] std::vector StatusVector::ExportArray(float def_value) const { +[[nodiscard]] std::vector StatusVector::ExportArray() const { std::unique_lock ul(m); - std::vector ret(content.size(), def_value); - for (int i = 0; i < content.size(); i++) { - if (std::isfinite(content[i])) - ret[i] = content[i]; - } - return ret; + return content; } [[nodiscard]] float StatusVector::Mean() const { @@ -211,10 +206,3 @@ MultiLinePlot StatusMultiVector::GetMeanPlot(int64_t bin_size, float x_start, fl } return ret; } - -std::vector StatusMultiVector::ExportArray(const std::string &s, float def_value) const { - auto iter = status.find(s); - if (iter == status.end() || !iter->second) - return {}; - return iter->second->ExportArray(def_value); -} diff --git a/common/StatusVector.h b/common/StatusVector.h index 7661a0fb..a8823243 100644 --- a/common/StatusVector.h +++ b/common/StatusVector.h @@ -29,7 +29,7 @@ public: size_t GetImageNumber() const; bool empty() const; int32_t GetActualBinning(int32_t bin_size) const; - [[nodiscard]] std::vector ExportArray(float def_value) const; + [[nodiscard]] std::vector ExportArray() const; [[nodiscard]] float Mean() const; MultiLinePlotStruct GetMeanPerBin(int32_t bin_size, float x_start, float x_incr) const; [[nodiscard]] MultiLinePlotStruct GetMaxPerBin(int32_t bin_size, float x_start, float x_incr) const; @@ -47,7 +47,6 @@ public: [[nodiscard]] MultiLinePlotStruct GetMeanPerBin(const std::string& in_key, int64_t bin_size, float x_start, float x_incr) const; [[nodiscard]] MultiLinePlot GetMeanPlot(int64_t bin_size, float x_start, float x_incr) const; - [[nodiscard]] std::vector ExportArray(const std::string& s, float def_value) const; }; #endif //JUNGFRAUJOCH_STATUSVECTOR_H diff --git a/tests/StatusVectorTest.cpp b/tests/StatusVectorTest.cpp index e79d6dc8..b92e427f 100644 --- a/tests/StatusVectorTest.cpp +++ b/tests/StatusVectorTest.cpp @@ -238,13 +238,13 @@ TEST_CASE("StatusVector_ExportArray","[StatusVector]") { status_vector.AddElement(8, 44); status_vector.AddElement(10, 41); - auto status_out = status_vector.ExportArray(1); + auto status_out = status_vector.ExportArray(); REQUIRE(status_out.size() == 11); - CHECK(status_out[0] == 1); + CHECK(std::isnan(status_out[0])); CHECK(status_out[5] == 11); CHECK(status_out[7] == 45); CHECK(status_out[8] == 44); - CHECK(status_out[9] == 1); + CHECK(std::isnan(status_out[9])); CHECK(status_out[10] == 41); }