From 7ce840af669426eb81de8738e85d87d75c492ef8 Mon Sep 17 00:00:00 2001
From: Thorsten Hater <24411438+thorstenhater@users.noreply.github.com>
Date: Thu, 15 Feb 2024 12:58:28 +0100
Subject: [PATCH] Renable evt_index

---
 arbor/backends/event.hpp            | 6 +++---
 arbor/backends/gpu/event_stream.hpp | 3 ---
 test/unit/test_fvm_lowered.cpp      | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/arbor/backends/event.hpp b/arbor/backends/event.hpp
index 18202def88..f50d8a8716 100644
--- a/arbor/backends/event.hpp
+++ b/arbor/backends/event.hpp
@@ -52,15 +52,15 @@ struct has_event_index<deliverable_event> : public std::true_type {};
 // Subset of event information required for mechanism delivery.
 struct deliverable_event_data {
     // cell_local_size_type mech_id;    // same as target_handle::mech_id
-    // cell_local_size_type mech_index; // same as target_handle::mech_index
+    cell_local_size_type mech_index; // same as target_handle::mech_index
     float weight;
     deliverable_event_data(cell_local_size_type id, cell_local_size_type idx, float w):
         // mech_id(id),
-        // mech_index(idx),
+        mech_index(idx),
         weight(w) {}
     ARB_SERDES_ENABLE(deliverable_event_data,
                       // mech_id,
-                      // mech_index,
+                      mech_index,
                       weight);
 };
 
diff --git a/arbor/backends/gpu/event_stream.hpp b/arbor/backends/gpu/event_stream.hpp
index 5377d26893..db83399fe7 100644
--- a/arbor/backends/gpu/event_stream.hpp
+++ b/arbor/backends/gpu/event_stream.hpp
@@ -2,10 +2,7 @@
 
 // Indexed collection of pop-only event queues --- CUDA back-end implementation.
 
-#include "backends/event_stream_base.hpp"
-#include "memory/memory.hpp"
 #include "util/partition.hpp"
-#include "util/range.hpp"
 #include "util/rangeutil.hpp"
 #include "util/transform.hpp"
 #include "threading/threading.hpp"
diff --git a/test/unit/test_fvm_lowered.cpp b/test/unit/test_fvm_lowered.cpp
index 2422999097..3e234bad0e 100644
--- a/test/unit/test_fvm_lowered.cpp
+++ b/test/unit/test_fvm_lowered.cpp
@@ -697,8 +697,6 @@ TEST(fvm_lowered, point_ionic_current) {
 
     // Only one target, corresponding to our point process on soma.
     double ica_nA = 12.3;
-    deliverable_event ev = {0.04, target_handle{0, 0}, (float)ica_nA};
-
     std::vector<pse_vector> events{{{0, 0.04, (float)ica_nA}}};
     auto lanes = util::subrange_view(events, 0, events.size());