Merge pull request #36 from slsdetectorgroup/file-tests

added first tests for reading files

core/include/aare/NDView.hpp

@@ -68,6 +68,16 @@ template <typename T, ssize_t Ndim=2> class NDView {
     T &operator()(ssize_t i) { return buffer_[i]; }
     T &operator[](ssize_t i) { return buffer_[i]; }
 
+    bool operator==(const NDView &other) const {
+        if (size_ != other.size_)
+            return false;
+        for (ssize_t i = 0; i != size_; ++i) {
+            if (buffer_[i] != other.buffer_[i])
+                return false;
+        }
+        return true;
+    }
+
     NDView &operator+=(const T val) { return elemenwise(val, std::plus<T>()); }
     NDView &operator-=(const T val) { return elemenwise(val, std::minus<T>()); }
     NDView &operator*=(const T val) { return elemenwise(val, std::multiplies<T>()); }

core/test/CircularFifo.test.cpp

@@ -1,116 +1,116 @@
-#include <catch2/catch_all.hpp>
-
-#include "aare/CircularFifo.hpp"
-
-using aare::CircularFifo;
-
-// Only for testing. To make sure we can avoid copy constructor
-// and copy assignment
-
-struct MoveOnlyInt {
-    int value{};
-
-    MoveOnlyInt() = default;
-    MoveOnlyInt(int i) : value(i){};
-    MoveOnlyInt(const MoveOnlyInt &) = delete;
-    MoveOnlyInt &operator=(const MoveOnlyInt &) = delete;
-    MoveOnlyInt(MoveOnlyInt &&other) { std::swap(value, other.value); }
-    MoveOnlyInt &operator=(MoveOnlyInt &&other) {
-        std::swap(value, other.value);
-        return *this;
-    }
-    bool operator==(int other) const { return value == other; }
-};
-
-TEST_CASE("CircularFifo can be default constructed") { CircularFifo<MoveOnlyInt> f; }
-
-TEST_CASE("Newly constructed fifo has the right size") {
-    size_t size = 17;
-    CircularFifo<MoveOnlyInt> f(size);
-    CHECK(f.numFreeSlots() == size);
-    CHECK(f.numFilledSlots() == 0);
-}
-
-TEST_CASE("Can fit size number of objects") {
-    size_t size = 8;
-    size_t numPushedItems = 0;
-    CircularFifo<MoveOnlyInt> f(size);
-    for (size_t i = 0; i < size; ++i) {
-        MoveOnlyInt a;
-        bool popped = f.try_pop_free(a);
-        CHECK(popped);
-        if (popped) {
-            a.value = i;
-            bool pushed = f.try_push_value(std::move(a));
-            CHECK(pushed);
-            if (pushed)
-                numPushedItems++;
-        }
-    }
-    CHECK(f.numFreeSlots() == 0);
-    CHECK(f.numFilledSlots() == size);
-    CHECK(numPushedItems == size);
-}
-
-TEST_CASE("Push move only type") {
-    CircularFifo<MoveOnlyInt> f;
-    f.push_value(5);
-}
-
-TEST_CASE("Push pop") {
-    CircularFifo<MoveOnlyInt> f;
-    f.push_value(MoveOnlyInt(1));
-
-    auto a = f.pop_value();
-    CHECK(a == 1);
-}
-
-TEST_CASE("Pop free and then push") {
-    CircularFifo<MoveOnlyInt> f;
-
-    auto a = f.pop_free();
-    a.value = 5;
-    f.push_value(std::move(a)); // Explicit move since we can't copy
-    auto b = f.pop_value();
-
-    CHECK(a == 0); // Moved from value
-    CHECK(b == 5); // Original value
-}
-
-TEST_CASE("Skip the first value") {
-    CircularFifo<MoveOnlyInt> f;
-
-    for (int i = 0; i != 10; ++i) {
-        auto a = f.pop_free();
-        a.value = i + 1;
-        f.push_value(std::move(a)); // Explicit move since we can't copy
-    }
-
-    auto b = f.pop_value();
-    CHECK(b == 1);
-    f.next();
-    auto c = f.pop_value();
-    CHECK(c == 3);
-}
-
-TEST_CASE("Use in place and move to free") {
-    size_t size = 18;
-    CircularFifo<MoveOnlyInt> f(size);
-
-    //Push 10 values to the fifo
-    for (int i = 0; i != 10; ++i) {
-        auto a = f.pop_free();
-        a.value = i + 1;
-        f.push_value(std::move(a)); // Explicit move since we can't copy
-    }
-
-    auto b = f.frontPtr();
-    CHECK(*b == 1);
-    CHECK(f.numFilledSlots() == 10);
-    CHECK(f.numFreeSlots() == size-10);
-    f.next();
-    auto c = f.frontPtr();
-    CHECK(*c == 2);
-    CHECK(f.numFilledSlots() == 9);
-    CHECK(f.numFreeSlots() == size-9);
-}
+ #include <catch2/catch_all.hpp>
+
+ #include "aare/CircularFifo.hpp"
+
+ using aare::CircularFifo;
+
+ // Only for testing. To make sure we can avoid copy constructor
+ // and copy assignment
+
+ struct MoveOnlyInt {
+     int value{};
+
+     MoveOnlyInt() = default;
+     MoveOnlyInt(int i) : value(i){};
+     MoveOnlyInt(const MoveOnlyInt &) = delete;
+     MoveOnlyInt &operator=(const MoveOnlyInt &) = delete;
+     MoveOnlyInt(MoveOnlyInt &&other) { std::swap(value, other.value); }
+     MoveOnlyInt &operator=(MoveOnlyInt &&other) {
+         std::swap(value, other.value);
+         return *this;
+     }
+     bool operator==(int other) const { return value == other; }
+ };
+
+ TEST_CASE("CircularFifo can be default constructed") { CircularFifo<MoveOnlyInt> f; }
+
+ TEST_CASE("Newly constructed fifo has the right size") {
+     size_t size = 17;
+     CircularFifo<MoveOnlyInt> f(size);
+     CHECK(f.numFreeSlots() == size);
+     CHECK(f.numFilledSlots() == 0);
+ }
+
+ TEST_CASE("Can fit size number of objects") {
+     size_t size = 8;
+     size_t numPushedItems = 0;
+     CircularFifo<MoveOnlyInt> f(size);
+     for (size_t i = 0; i < size; ++i) {
+         MoveOnlyInt a;
+         bool popped = f.try_pop_free(a);
+         CHECK(popped);
+         if (popped) {
+             a.value = i;
+             bool pushed = f.try_push_value(std::move(a));
+             CHECK(pushed);
+             if (pushed)
+                 numPushedItems++;
+         }
+     }
+     CHECK(f.numFreeSlots() == 0);
+     CHECK(f.numFilledSlots() == size);
+     CHECK(numPushedItems == size);
+ }
+
+ TEST_CASE("Push move only type") {
+     CircularFifo<MoveOnlyInt> f;
+     f.push_value(5);
+ }
+
+ TEST_CASE("Push pop") {
+     CircularFifo<MoveOnlyInt> f;
+     f.push_value(MoveOnlyInt(1));
+
+     auto a = f.pop_value();
+     CHECK(a == 1);
+ }
+
+ TEST_CASE("Pop free and then push") {
+     CircularFifo<MoveOnlyInt> f;
+
+     auto a = f.pop_free();
+     a.value = 5;
+     f.push_value(std::move(a)); // Explicit move since we can't copy
+     auto b = f.pop_value();
+
+     CHECK(a == 0); // Moved from value
+     CHECK(b == 5); // Original value
+ }
+
+ TEST_CASE("Skip the first value") {
+     CircularFifo<MoveOnlyInt> f;
+
+     for (int i = 0; i != 10; ++i) {
+         auto a = f.pop_free();
+         a.value = i + 1;
+         f.push_value(std::move(a)); // Explicit move since we can't copy
+     }
+
+     auto b = f.pop_value();
+     CHECK(b == 1);
+     f.next();
+     auto c = f.pop_value();
+     CHECK(c == 3);
+ }
+
+ TEST_CASE("Use in place and move to free") {
+     size_t size = 18;
+     CircularFifo<MoveOnlyInt> f(size);
+
+     //Push 10 values to the fifo
+     for (int i = 0; i != 10; ++i) {
+         auto a = f.pop_free();
+         a.value = i + 1;
+         f.push_value(std::move(a)); // Explicit move since we can't copy
+     }
+
+     auto b = f.frontPtr();
+     CHECK(*b == 1);
+     CHECK(f.numFilledSlots() == 10);
+     CHECK(f.numFreeSlots() == size-10);
+     f.next();
+     auto c = f.frontPtr();
+     CHECK(*c == 2);
+     CHECK(f.numFilledSlots() == 9);
+     CHECK(f.numFreeSlots() == size-9);
+ }

core/test/NDView.test.cpp

@@ -175,4 +175,20 @@ TEST_CASE("Retrieve shape"){
     REQUIRE(data.shape()[0] == 3);
     REQUIRE(data.shape()[1] == 4);
 
+}
+
+TEST_CASE("compare two views"){
+    std::vector<int> vec1;
+    for (int i = 0; i != 12; ++i) {
+        vec1.push_back(i);
+    }
+    NDView<int,2> view1(vec1.data(), Shape<2>{3,4});
+
+    std::vector<int> vec2;
+    for (int i = 0; i != 12; ++i) {
+        vec2.push_back(i);
+    }
+    NDView<int,2> view2(vec2.data(), Shape<2>{3,4});
+
+    REQUIRE(view1 == view2);
 }

core/test/ProducerConsumerQueue.test.cpp

@@ -1,49 +1,49 @@
-#include <catch2/catch_all.hpp>
-#include "aare/ProducerConsumerQueue.hpp"
+ #include <catch2/catch_all.hpp>
+ #include "aare/ProducerConsumerQueue.hpp"
 
-// using arve::SimpleQueue;
-TEST_CASE("push pop"){
+ // using arve::SimpleQueue;
+ TEST_CASE("push pop"){
 
-    folly::ProducerConsumerQueue<int> q(5); 
-    int a = 3;
-    int b = 8;
-    CHECK(q.sizeGuess() == 0);
-    CHECK(q.write(a));
-    CHECK(q.sizeGuess() == 1);
-    CHECK(q.write(b));
-    CHECK(q.sizeGuess() == 2);
-    int c = 0;
+     folly::ProducerConsumerQueue<int> q(5); 
+     int a = 3;
+     int b = 8;
+     CHECK(q.sizeGuess() == 0);
+     CHECK(q.write(a));
+     CHECK(q.sizeGuess() == 1);
+     CHECK(q.write(b));
+     CHECK(q.sizeGuess() == 2);
+     int c = 0;
 
-    CHECK(q.read(c));
-    CHECK(c == 3);
-    CHECK(q.sizeGuess() == 1);
-    CHECK(q.read(c));
-    CHECK(c == 8);
-    CHECK(q.sizeGuess() == 0);
-}
+     CHECK(q.read(c));
+     CHECK(c == 3);
+     CHECK(q.sizeGuess() == 1);
+     CHECK(q.read(c));
+     CHECK(c == 8);
+     CHECK(q.sizeGuess() == 0);
+ }
 
-TEST_CASE("Cannot push to a full queue"){
-    folly::ProducerConsumerQueue<int> q(3); 
-    int a = 3;
-    int b = 4;
-    int c = 0;
-    CHECK(q.write(a));
-    CHECK(q.write(b));
-    CHECK_FALSE(q.write(a));
+ TEST_CASE("Cannot push to a full queue"){
+     folly::ProducerConsumerQueue<int> q(3); 
+     int a = 3;
+     int b = 4;
+     int c = 0;
+     CHECK(q.write(a));
+     CHECK(q.write(b));
+     CHECK_FALSE(q.write(a));
 
-    //values are still ok
-    CHECK(q.read(c));
-    CHECK(c == 3);
-    CHECK(q.read(c));
-    CHECK(c == 4);
-}
+     //values are still ok
+     CHECK(q.read(c));
+     CHECK(c == 3);
+     CHECK(q.read(c));
+     CHECK(c == 4);
+ }
 
-TEST_CASE("Cannot pop from an empty queue"){
-    folly::ProducerConsumerQueue<int> q(2);
-    int a=0; 
-    CHECK_FALSE(q.read(a));
-}
+ TEST_CASE("Cannot pop from an empty queue"){
+     folly::ProducerConsumerQueue<int> q(2);
+     int a=0; 
+     CHECK_FALSE(q.read(a));
+ }
 
-// TEST_CASE("fail"){
-//     CHECK(false);
-// }
+ // TEST_CASE("fail"){
+ //     CHECK(false);
+ // }

data/jungfrau/read_frame.py

@@ -24,25 +24,26 @@
 # Read three frames from a jungfrau file with a single interface
 rows = 512
 cols = 1024
-frames = 3
+frames = 10
 
 data = np.zeros((frames,rows,cols), dtype = np.uint16)
 header = np.zeros(frames, dtype = header_dt)
 for file_id in range(4):
     file_name = 'jungfrau_single_d0_f{}_0.raw'.format(file_id)
     print("Reading file:", file_name)
     with open(file_name) as f:
-        for i in range(frames if file_id != 3 else 1):
-            header[i] = np.fromfile(f, dtype=header_dt, count = 1)
-            data[i] = np.fromfile(f, dtype=np.uint16,count = rows*cols).reshape(rows,cols)
+        for i in range(3 if file_id != 3 else 1):
+            header[i+file_id*3] = np.fromfile(f, dtype=header_dt, count = 1)
+            data[i+file_id*3] = np.fromfile(f, dtype=np.uint16,count = rows*cols).reshape(rows,cols)
 
 
-    for i in range(frames if file_id != 3 else 1 ):
-        print("frame:",i)
-        print(data[i][0,0],data[i][0,1],data[i][1,0],data[i][rows-1,cols-1])
-        print("")
+    # for i in range(frames if file_id != 3 else 1 ):
+    #     print("frame:",i)
+    #     print(header[i][0,0],data[i][0,1],data[i][1,0],data[i][rows-1,cols-1])
+    #     print("")
 
 
+print(header[1]["Frame Number"])
 #fig, ax = plt.subplots()
 #im = ax.imshow(data[0])
 #im.set_clim(2000,4000)