detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-16 09:31:19 +01:00
Code Issues Actions Packages Releases Activity

minor

Browse Source
This commit is contained in:
maliakal_d
2025-07-01 14:55:40 +02:00
parent f42609b66f
commit e274524c55
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp
View File

@@ -507,7 +507,9 @@ TEST_CASE("rx_roi", "[.cmdcall]") {
// vector of rois // vector of rois
// square brackets missing // square brackets missing
REQUIRE_THROWS(caller.call( 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 // invalid roi, 4 parts expected
REQUIRE_THROWS(caller.call( REQUIRE_THROWS(caller.call(
"rx_roi", {"[5, 20, -1] [25, 30, -1, -1]"}, -1, PUT)); "rx_roi", {"[5, 20, -1] [25, 30, -1, -1]"}, -1, PUT));
@@ -599,7 +601,9 @@ TEST_CASE("rx_roi", "[.cmdcall]") {
// vector of rois // vector of rois
// square brackets missing // square brackets missing
REQUIRE_THROWS(caller.call( 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 // invalid roi, 4 parts expected
REQUIRE_THROWS(caller.call( REQUIRE_THROWS(caller.call(
"rx_roi", {"[5, 20, 20] [25, 30, 14, 15]"}, -1, PUT)); "rx_roi", {"[5, 20, 20] [25, 30, 14, 15]"}, -1, PUT));

4
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -238,10 +238,6 @@ void DataProcessor::LinkFileInMaster(const std::string &masterFileName,
const bool silentMode, const bool silentMode,
std::mutex *hdf5LibMutex) { 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}; std::string fname{virtualFileName}, masterfname{masterFileName};
// if no virtual file, link data file // if no virtual file, link data file
if (virtualFileName.empty()) { if (virtualFileName.empty()) {