diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp index 27e5e89c2..42c811bef 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp @@ -260,6 +260,26 @@ TEST_CASE("ctb_acquire_check_file_size", "[.cmdcall]") { test_ctb_acquire_with_receiver(test_ctb_config, num_frames_to_acquire, det, caller); } + { + testCtbAcquireInfo test_ctb_config; + test_ctb_config.readout_mode = defs::TRANSCEIVER_ONLY; + test_ctb_config.dbit_offset = 16; + test_ctb_config.dbit_list.clear(); + test_ctb_config.dbit_reorder = true; + set_ctb_config_state(det, test_ctb_config); + test_ctb_acquire_with_receiver(test_ctb_config, + num_frames_to_acquire, det, caller); + } + { + testCtbAcquireInfo test_ctb_config; + test_ctb_config.readout_mode = defs::ANALOG_ONLY; + test_ctb_config.dbit_offset = 16; + test_ctb_config.dbit_list.clear(); + test_ctb_config.dbit_reorder = true; + set_ctb_config_state(det, test_ctb_config); + test_ctb_acquire_with_receiver(test_ctb_config, + num_frames_to_acquire, det, caller); + } } } diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp index b59083add..bd9c4a04e 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp @@ -57,11 +57,16 @@ TEST_CASE("eiger_acquire_check_file_size", "[.cmdcall]") { test_frames_caught(det, num_frames_to_acquire); // check file size (assuming local pc) - // pixels_row_per_chip * pixels_col_per_chip * num_chips * - // bytes_per_pixel - size_t expected_image_size = 256 * 256 * 2 * 2; - test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, - expected_image_size); + { + detParameters par(det_type); + // data split into half due to 2 udp interfaces per half module + int num_chips = (par.nChipX / 2); + int bytes_per_pixel = (dynamic_range / 8); + size_t expected_image_size = + par.nChanX * par.nChanY * num_chips * bytes_per_pixel; + test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, + expected_image_size); + } // restore previous state set_file_state(det, prev_file_info); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp index a747c46dd..70b781640 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp @@ -58,11 +58,14 @@ TEST_CASE("gotthard2_acquire_check_file_size", "[.cmdcall]") { test_frames_caught(det, num_frames_to_acquire); // check file size (assuming local pc) - // num_channels * num_chips * bytes_per_pixel * num_frames - size_t expected_image_size = 128 * 10 * 2; - test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, - expected_image_size); - + { + detParameters par(det_type); + int bytes_per_pixel = det.getDynamicRange().squash() / 8; + size_t expected_image_size = + par.nChanX * par.nChipX * bytes_per_pixel; + test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, + expected_image_size); + } // restore previous state set_file_state(det, prev_file_info); set_common_acquire_config_state(det, prev_det_config_info); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp index 413937632..253fa0c49 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp @@ -52,17 +52,16 @@ TEST_CASE("jungfrau_acquire_check_file_size", "[.cmdcall]") { test_frames_caught(det, num_frames_to_acquire); // check file size (assuming local pc) - size_t expected_image_size = 0; - // pixels_row_per_chip * pixels_col_per_chip * num_chips * - // bytes_per_pixel - if (num_udp_interfaces == 1) { - expected_image_size = 256 * 256 * 8 * 2; - } else { - expected_image_size = 256 * 256 * 4 * 2; + { + detParameters par(det_type); + int bytes_per_pixel = det.getDynamicRange().squash() / 8; + // if 2 udp interfaces, data split into half + size_t expected_image_size = (par.nChanX * par.nChanY * par.nChipX * + par.nChipY * bytes_per_pixel) / + num_udp_interfaces; + test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, + expected_image_size); } - test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, - expected_image_size); - // restore previous state set_file_state(det, prev_file_info); set_common_acquire_config_state(det, prev_det_config_info); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp index 577a2f3b2..f3bb026a9 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp @@ -52,15 +52,16 @@ TEST_CASE("moench_acquire_check_file_size", "[.cmdcall]") { test_frames_caught(det, num_frames_to_acquire); // check file size (assuming local pc) - size_t expected_image_size = 0; - // pixels_row * pixels_col * bytes_per_pixel - if (num_udp_interfaces == 1) { - expected_image_size = 400 * 400 * 2; - } else { - expected_image_size = 400 * 200 * 2; + { + detParameters par(det_type); + int bytes_per_pixel = det.getDynamicRange().squash() / 8; + // if 2 udp interfaces, data split into half + size_t expected_image_size = (par.nChanX * par.nChanY * par.nChipX * + par.nChipY * bytes_per_pixel) / + num_udp_interfaces; + test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, + expected_image_size); } - test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, - expected_image_size); // restore previous state set_file_state(det, prev_file_info); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp index ec1a68ef5..7e7b5ca2b 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp @@ -45,8 +45,9 @@ TEST_CASE("mythen3_acquire_check_file_size", "[.cmdcall]") { set_common_acquire_config_state(det, det_config); // set default specific det type config - det.setDynamicRange(16); - int test_counter_mask = 0x1; + int test_dynamic_range = 16; + det.setDynamicRange(test_dynamic_range); + int test_counter_mask = 0x3; int num_counters = __builtin_popcount(test_counter_mask); det.setCounterMask(test_counter_mask); @@ -57,10 +58,16 @@ TEST_CASE("mythen3_acquire_check_file_size", "[.cmdcall]") { test_frames_caught(det, num_frames_to_acquire); // check file size (assuming local pc) - // num_channels * num_chips * num_counters - size_t expected_image_size = 128 * 10 * num_counters * 2; - test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, - expected_image_size); + { + detParameters par(det_type); + int bytes_per_pixel = test_dynamic_range / 8; + int num_channels_per_counter = par.nChanX / 3; + size_t expected_image_size = num_channels_per_counter * + num_counters * par.nChipX * + bytes_per_pixel; + test_acquire_binary_file_size(test_file_info, num_frames_to_acquire, + expected_image_size); + } // restore previous state set_file_state(det, prev_file_info);