Rx roi (#428)

* roi structure expanded to have ymin and ymax * compile with 'detector roi' * wip * wip, rx_roi, rx_clearroi * wip rxroi * rxroi wip * wip rxroi * merge fix * wip * rx_roi works, impl wip, test * tests in, impl left * wip, rxroi impl * wip, rxroi impl * wip * setrx_Roi works, getrx_roi, wip * rx_roi impl done * wip, rxroi * wip, getrx_roi rxr ports * fix ports * wip * wip * fix positions on server side * wip * numports wip * wip * jungfrau top inner interface row increment * x, y detpos, wip * removed eiger row indices flipping in gui (bottom flipping maintained) * wip * wip, jungfrau numinterfaces2 * jungfrau virtual works * eiger, jungfrau, g2 virtual server works * eiger positions fix, wip * binaries in * minor printout * binaries in * merge fix * merge fix * removing getposition * setrxroi wip * set upto port * get messed, wip * roi multi to module works, wip * wip * roi dont return -1 * added rxroi metadata in master file * added rxroifromshm, not yet in detector * rx roi in gui with box, also for gap pixels (gappixels for jungfrau mess) * fix for segfault in gui with detaching roi box in gui * wip * m3 gui: slave timing modes should be discarded when squashing * fixed m3 virtual data, and fixed counters in gui asthetics * m3 roi works * wip, g2 * wip * handling g225um boards, and showing roi for gainplot as well * udpate python functions * fix for 1d and a2d roi written * fixed actual roi written to file * no virtual hdf5 when handling rx roi * test * minor * binarie in
2025-06-13 13:27:14 +02:00 · 2022-05-16 12:35:06 +02:00
parent 9808376207
commit fcc7f7aef8
53 changed files with 1713 additions and 859 deletions
--- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp
@ -440,6 +440,79 @@ TEST_CASE("rx_arping", "[.cmd][.rx]") {
    }
 }

+TEST_CASE("rx_roi", "[.cmd]") {
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
+        REQUIRE_THROWS(proxy.Call("rx_roi", {"5", "10"}, -1, PUT));
+    } else {
+        auto prev_val = det.getRxROI();
+        defs::xy detsize = det.getDetectrSize();
+
+        // 1d
+        if (det_type == defs::GOTTHARD || det_type == defs::GOTTHARD2 ||
+            det_type == defs::MYTHEN3) {
+            {
+                std::ostringstream oss;
+                proxy.Call("rx_roi", {"5", "10"}, -1, PUT, oss);
+                REQUIRE(oss.str() == "rx_roi [5, 10]\n");
+            }
+            {
+                std::ostringstream oss;
+                proxy.Call("rx_roi", {"10", "15"}, -1, PUT, oss);
+                REQUIRE(oss.str() == "rx_roi [10, 15]\n");
+            }
+            REQUIRE_THROWS(proxy.Call("rx_roi", {"-1", "-1"}, -1, PUT));
+            REQUIRE_THROWS(proxy.Call("rx_roi", {"10", "15", "25", "30"}, -1, PUT));
+        }
+        // 2d
+        else {
+            {
+                std::ostringstream oss;
+                proxy.Call("rx_roi", {"10", "15", "1", "5"}, -1, PUT, oss);
+                REQUIRE(oss.str() == "rx_roi [10, 15, 1, 5]\n");
+            }
+            {
+                std::ostringstream oss;
+                proxy.Call("rx_roi", {"10", "22", "18", "19"}, -1, PUT, oss);
+                REQUIRE(oss.str() == "rx_roi [10, 22, 18, 19]\n");
+            }
+            {
+                std::ostringstream oss;
+                proxy.Call("rx_roi", {"1", std::to_string(detsize.x - 5), "1", std::to_string(detsize.y - 5)}, -1, PUT, oss);
+                REQUIRE(oss.str() == std::string("rx_roi [1, ") + std::to_string(detsize.x - 5) + std::string(", ") + std::to_string(detsize.y - 5) + std::string(", 1]\n"));
+            }            
+            REQUIRE_THROWS(proxy.Call("rx_roi", {"-1", "-1", "-1", "-1"}, -1, PUT));
+        }
+
+        for (int i = 0; i != det.size(); ++i) {
+            det.setRxROI(prev_val);
+        }
+    }
+}
+
+TEST_CASE("rx_clearroi", "[.cmd]") {
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+
+    if (det_type == defs::CHIPTESTBOARD || det_type == defs::MOENCH) {
+        REQUIRE_THROWS(proxy.Call("rx_clearroi", {}, -1, PUT));
+    } else {
+        auto prev_val = det.getRxROI();
+        {
+            std::ostringstream oss;
+            proxy.Call("rx_clearroi", {}, -1, PUT, oss);
+            REQUIRE(oss.str() == "rx_clearroi successful\n");
+        }
+        for (int i = 0; i != det.size(); ++i) {
+            det.setRxROI(prev_val);
+        }
+    }
+}
+
 /* File */

 TEST_CASE("fformat", "[.cmd]") {