BRAYNS-639 Bypass libsonata for node selection in spike reports. (#1261)

Author: Adrien4193

brayns/parameters/SimulationParameters.cpp

@@ -21,14 +21,16 @@
 
 #include "SimulationParameters.h"
 
+#include <stdexcept>
+
 namespace brayns
 {
 void SimulationParameters::reset()
 {
-    setFrame(0);
-    setDt(0.);
     setStartFrame(0);
     setEndFrame(0);
+    setDt(0.);
+    setFrame(0);
 }
 
 void SimulationParameters::setStartFrame(const uint32_t startFrame) noexcept
@@ -51,8 +53,12 @@ uint32_t SimulationParameters::getEndFrame() const noexcept
     return _endFrame;
 }
 
-void SimulationParameters::setFrame(const uint32_t value) noexcept
+void SimulationParameters::setFrame(const uint32_t value)
 {
+    if (value < _startFrame || value > _endFrame)
+    {
+        throw std::out_of_range("Simulation frame out of range");
+    }
     _flag.update(_current, value);
 }
 

brayns/parameters/SimulationParameters.h

@@ -77,7 +77,7 @@ class SimulationParameters : public AbstractParameters
      *
      * @param value uint32_t Current frame index.
      */
-    void setFrame(const uint32_t value) noexcept;
+    void setFrame(const uint32_t value);
 
     /**
      * @brief Returns the current frame.

plugins/CircuitExplorer/io/sonataloader/reports/SonataSpikeData.cpp

@@ -18,6 +18,9 @@
 
 #include "SonataSpikeData.h"
 
+#include <ranges>
+#include <unordered_set>
+
 #include <brayns/utils/MathTypes.h>
 
 namespace sonataloader
@@ -61,12 +64,17 @@ std::string SonataSpikeData::getTimeUnit() const noexcept
 
 std::vector<float> SonataSpikeData::getFrame(double timestamp) const
 {
-    auto limit = static_cast<float>(getEndTime()) - 0.01f;
-    auto frame = brayns::math::clamp(static_cast<float>(timestamp), 0.f, limit);
-    auto frameStart = frame - _interval;
-    auto frameEnd = frame + _interval;
+    auto frameStart = brayns::math::clamp(timestamp - _interval, _start, _end);
+    auto frameEnd = brayns::math::clamp(timestamp + _interval, _start, _end);
+
+    auto spikes = _population.get({}, frameStart, frameEnd);
+
+    auto values = _selection.flatten();
+    auto selection = std::unordered_set<bbp::sonata::Selection::Value>(values.begin(), values.end());
 
-    auto spikes = _population.get(_selection, frameStart, frameEnd);
+    auto notSelected = [&](const auto &spike) { return !selection.contains(spike.first); };
+    auto [first, last] = std::ranges::remove_if(spikes, notSelected);
+    spikes.erase(first, last);
 
     auto data = std::vector<float>(_mapping.size(), 0.f);
 
@@ -83,7 +91,7 @@ std::vector<float> SonataSpikeData::getFrame(double timestamp) const
         }
 
         auto index = it->second;
-        data[index] = _calculator.compute(spikeTime, frame);
+        data[index] = _calculator.compute(spikeTime, static_cast<float>(timestamp));
     }
 
     return data;

tests/unit/brayns/engine/TestSystems.cpp

@@ -149,6 +149,7 @@ TEST_CASE("Systems")
 
         auto parameters = brayns::ParametersManager(0, nullptr);
         auto &simulation = parameters.getSimulationParameters();
+        simulation.setEndFrame(102);
         simulation.setFrame(101);
 
         CHECK(!components.has<uint32_t>());