diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp index 387f72b56..76462e3c4 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp @@ -507,7 +507,9 @@ TEST_CASE("rx_roi", "[.cmdcall]") { // vector of rois // square brackets missing REQUIRE_THROWS(caller.call( - "rx_roi", {"[5, 20, -1, -1] 25, 30, -1, -1]"}, -1, PUT)); + "rx_roi", {"[5, 20, -1, -1]; 25, 30, -1, -1]"}, -1, PUT)); + REQUIRE_THROWS(caller.call( + "rx_roi", {"[5, 20, -1, -1]; [25, 30, -1, -1"}, -1, PUT)); // invalid roi, 4 parts expected REQUIRE_THROWS(caller.call( "rx_roi", {"[5, 20, -1] [25, 30, -1, -1]"}, -1, PUT)); @@ -599,7 +601,9 @@ TEST_CASE("rx_roi", "[.cmdcall]") { // vector of rois // square brackets missing REQUIRE_THROWS(caller.call( - "rx_roi", {"[5, 20, 20, 30] 25, 30, 14, 15]"}, -1, PUT)); + "rx_roi", {"[5, 20, 20, 30]; 25, 30, 14, 15]"}, -1, PUT)); + REQUIRE_THROWS(caller.call( + "rx_roi", {"[5, 20, 20, 30]; [25, 30, 14, 15"}, -1, PUT)); // invalid roi, 4 parts expected REQUIRE_THROWS(caller.call( "rx_roi", {"[5, 20, 20] [25, 30, 14, 15]"}, -1, PUT)); diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index a863e39d5..47e2b3d17 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -238,10 +238,6 @@ void DataProcessor::LinkFileInMaster(const std::string &masterFileName, const bool silentMode, std::mutex *hdf5LibMutex) { - /*if (!multiRoiMetadata.empty()) { - throw std::runtime_error( - "Should not be here, roi with hdf5 virtual should throw."); - }*/ std::string fname{virtualFileName}, masterfname{masterFileName}; // if no virtual file, link data file if (virtualFileName.empty()) {