From cf17a379a53116af4c27d1855a8cf1c3b62fca29 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 6 Jul 2021 11:55:04 +0200
Subject: [PATCH 1/4] Import correct headers in core tests

---
 core-buffer/test/test_bitshuffle.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core-buffer/test/test_bitshuffle.cpp b/core-buffer/test/test_bitshuffle.cpp
index a030256..8ca926e 100644
--- a/core-buffer/test/test_bitshuffle.cpp
+++ b/core-buffer/test/test_bitshuffle.cpp
@@ -6,6 +6,12 @@ extern "C" {
     #include "bitshuffle/bitshuffle.h"
 }
 
+#ifdef USE_EIGER
+#include "eiger.hpp"
+#else
+#include "jungfrau.hpp"
+#endif
+
 using namespace std;
 using namespace buffer_config;
 

From fb6673a32e19e2d618f7a2a62cae03a9d6562f46 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 6 Jul 2021 12:03:07 +0200
Subject: [PATCH 2/4] Fix bug taking pulse_id instead of id

---
 core-buffer/src/RamBuffer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core-buffer/src/RamBuffer.cpp b/core-buffer/src/RamBuffer.cpp
index f52027f..adef0c1 100644
--- a/core-buffer/src/RamBuffer.cpp
+++ b/core-buffer/src/RamBuffer.cpp
@@ -5,7 +5,6 @@
 #include <sstream>
 #include <unistd.h>
 #include "RamBuffer.hpp"
-#include "buffer_config.hpp"
 #include "date.h"
 #include <chrono>
 #include <iostream>
@@ -84,14 +83,15 @@ void RamBuffer::write_frame(
         const char *src_data) const
 {
     auto *dst_meta = (ModuleFrame*) get_frame_meta(
-            src_meta.pulse_id, src_meta.module_id);
+            src_meta.id, src_meta.module_id);
     auto *dst_data = get_frame_data(
-            src_meta.pulse_id, src_meta.module_id);
+            src_meta.id, src_meta.module_id);
 
     #ifdef DEBUG_OUTPUT
         using namespace date;
         cout << " [" << std::chrono::system_clock::now();
         cout << "] [RamBuffer::write_frame] :";
+        cout << " || src_meta.id " << src_meta.id;
         cout << " || src_meta.frame_index " << src_meta.frame_index;
         cout << " || src_meta.n_recv_packets " << src_meta.n_recv_packets;
         cout << " || src_meta.daq_rec " << src_meta.daq_rec;

From 45ca6dcd13e519a94c1fdabf85fc85175dd78bca Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 6 Jul 2021 12:31:51 +0200
Subject: [PATCH 3/4] Fix core buffer tests

---
 core-buffer/test/test_RamBuffer.cpp | 33 ++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/core-buffer/test/test_RamBuffer.cpp b/core-buffer/test/test_RamBuffer.cpp
index aa7c8f2..b779b9f 100644
--- a/core-buffer/test/test_RamBuffer.cpp
+++ b/core-buffer/test/test_RamBuffer.cpp
@@ -4,16 +4,21 @@
 using namespace std;
 using namespace buffer_config;
 
+
 TEST(RamBuffer, simple_store)
 {
     const int n_modules = 3;
-    RamBuffer buffer("test_detector", n_modules, 10);
+    const size_t DATA_N_BYTES = MODULE_N_PIXELS * 2;
+
+    RamBuffer buffer("test_detector",
+            sizeof(ModuleFrame), DATA_N_BYTES, n_modules, 10);
 
     ModuleFrame frame_meta;
+    frame_meta.id = 12345678;
     frame_meta.pulse_id = 123523;
     frame_meta.daq_rec = 1234;
     frame_meta.frame_index = 12342300;
-    frame_meta.n_recv_packets = EIGER_N_PACKETS_PER_FRAME;
+    frame_meta.n_recv_packets = 128;
 
     auto frame_buffer = make_unique<uint16_t[]>(MODULE_N_PIXELS);
 
@@ -28,10 +33,22 @@ TEST(RamBuffer, simple_store)
         buffer.write_frame(frame_meta, (char *) (frame_buffer.get()));
     }
 
-    ImageMetadata image_meta;
-    buffer.assemble_image(frame_meta.pulse_id, image_meta);
-    ASSERT_EQ(image_meta.pulse_id, frame_meta.pulse_id);
-    ASSERT_EQ(image_meta.daq_rec, frame_meta.daq_rec);
-    ASSERT_EQ(image_meta.frame_index, frame_meta.frame_index);
-    ASSERT_EQ(image_meta.is_good_image, 1);
+    auto meta_buffer = (ModuleFrame*) buffer.get_slot_meta(frame_meta.id);
+    for (int i_module=0; i_module<n_modules; i_module++) {
+        ASSERT_EQ(meta_buffer[i_module].id, frame_meta.id);
+        ASSERT_EQ(meta_buffer[i_module].pulse_id, frame_meta.pulse_id);
+        ASSERT_EQ(meta_buffer[i_module].daq_rec, frame_meta.daq_rec);
+        ASSERT_EQ(meta_buffer[i_module].frame_index, frame_meta.frame_index);
+        ASSERT_EQ(meta_buffer[i_module].module_id, i_module);
+    }
+
+    auto data_buffer = (uint16_t*) buffer.get_slot_data(frame_meta.id);
+    for (int i_module=0; i_module<n_modules; i_module++) {
+        auto module_buffer = data_buffer + (MODULE_N_PIXELS * i_module);
+
+        for (size_t i = 0; i < MODULE_N_PIXELS; i++) {
+            ASSERT_EQ(module_buffer[i], i%100);
+        }
+    }
+
 }

From e53439795fa5c534d02c14b298123954bef51f7a Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 6 Jul 2021 12:38:36 +0200
Subject: [PATCH 4/4] Add import of headers

---
 jf-assembler/src/main.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jf-assembler/src/main.cpp b/jf-assembler/src/main.cpp
index 2d0aacb..53c73aa 100644
--- a/jf-assembler/src/main.cpp
+++ b/jf-assembler/src/main.cpp
@@ -11,7 +11,12 @@
 #include "EigerAssembler.hpp"
 #include "assembler_config.hpp"
 #include "ZmqPulseSyncReceiver.hpp"
- 
+
+#ifdef USE_EIGER
+#include "eiger.hpp"
+#else
+#include "jungfrau.hpp"
+#endif
 
 using namespace std;
 using namespace buffer_config;