v1.0.0-rc.127 (#34)

This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.124.

* jfjoch_broker: Default EIGER readout time is 20 microseconds
* jfjoch_broker: Multiple improvements regarding performance
* jfjoch_broker: Image buffer allows to track frames in preparation and sending
* jfjoch_broker: Dedicated thread for ZeroMQ transmission to better utilize the image buffer
* jfjoch_broker: Experimental implementation of transmission with raw TCP/IP sockets
* jfjoch_writer: Fixes regarding properly closing files in long data collections
* jfjoch_process: Scale & merge has been significantly improved, but it is not yet integrated into mainstream code

Reviewed-on: #34

common/StatusVector.cpp

@@ -4,9 +4,11 @@
 
 #include "StatusVector.h"
 
-void StatusVector::Clear() {
+void StatusVector::Clear(size_t reserve) {
     std::unique_lock ul(m);
     content.clear();
+    if (reserve > 0)
+        content.reserve(reserve);
 
     mean = NAN;
     count = 0;
@@ -23,11 +25,23 @@ void StatusVector::AddElement(uint32_t id, float val) {
     if (id >= content.size()) {
         content.resize(id + 1, NAN);
     }
+
+    const float old_val = content[id];
+    const bool had_old = std::isfinite(old_val);
+
     content[id] = val;
 
-    sum += val;
-    count += 1;
-    mean = sum / count;
+    if (had_old) {
+        sum += static_cast<double>(val) - static_cast<double>(old_val);
+    } else {
+        sum += val;
+        count += 1;
+    }
+
+    if (count > 0)
+        mean = static_cast<float>(sum / static_cast<double>(count));
+    else
+        mean = NAN;
 }
 
 std::optional<float> StatusVector::GetElement(uint32_t id) const {
@@ -57,6 +71,7 @@ int32_t StatusVector::GetActualBinning(int32_t bin_size) const {
 }
 
 [[nodiscard]] float StatusVector::Mean() const {
+    std::unique_lock ul(m);
     return mean;
 }
 
@@ -186,52 +201,3 @@ MultiLinePlot StatusVector::GetMaxPlot(int64_t bin_size, float x_start, float x_
     ret.AddPlot(GetMaxPerBin(bin_size, x_start, x_incr, fill_value));
     return ret;
 }
-
-void StatusMultiVector::Clear() {
-    std::unique_lock ul(m);
-    status.clear();
-}
-
-void StatusMultiVector::AddElement(const std::string &s, uint32_t id, float val) {
-    std::unique_lock ul(m);
-    if (!status.contains(s))
-        status[s] = std::make_unique<StatusVector>();
-    status[s]->AddElement(id, val);
-}
-
-void StatusMultiVector::AddElement(const std::string &s, uint32_t id, std::optional<float> val) {
-    // no need to lock, as AddElement(string, u32, T) has lock already
-    if (val.has_value())
-        AddElement(s, id, val.value());
-}
-
-MultiLinePlotStruct StatusMultiVector::GetMeanPerBin(const std::string &in_key, int64_t bin_size, float x_start,
-                                                     float x_incr,
-                                                     const std::optional<float> &fill_value) const {
-    MultiLinePlotStruct ret{};
-    for (const auto &[key, value]: status) {
-        if (key == in_key) {
-            ret = value->GetMeanPerBin(bin_size, x_start, x_incr, fill_value);
-            ret.title = key;
-        }
-    }
-    return ret;
-}
-
-MultiLinePlot StatusMultiVector::GetMeanPlot(int64_t bin_size, float x_start, float x_incr,
-                                             const std::optional<float> &fill_value) const {
-    MultiLinePlot ret;
-    for (const auto &[key, value]: status) {
-        auto tmp = value->GetMeanPerBin(bin_size, x_start, x_incr, fill_value);
-        tmp.title = key;
-        ret.AddPlot(tmp);
-    }
-    return ret;
-}
-
-std::vector<float> StatusMultiVector::ExportArray(const std::string &s) const {
-    auto iter = status.find(s);
-    if (iter == status.end() || !iter->second)
-        return {};
-    return iter->second->ExportArray();
-}