diff --git a/tests/FPGAIntegrationTest.cpp b/tests/FPGAIntegrationTest.cpp index 2fd84c79..a959ec9d 100644 --- a/tests/FPGAIntegrationTest.cpp +++ b/tests/FPGAIntegrationTest.cpp @@ -87,21 +87,19 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_custom_frame", "[FPGA][Ful } TEST_CASE("HLS_C_Simulation_check_raw", "[FPGA][Full]") { - std::vector raw_frames(RAW_MODULE_SIZE*20); + std::vector raw_frames(RAW_MODULE_SIZE); - for (int i = 0; i < 20; i++) { - LoadBinaryFile("../../tests/test_data/mod5_raw" + std::to_string(i)+".bin", raw_frames.data() + i * RAW_MODULE_SIZE, RAW_MODULE_SIZE); - } + LoadBinaryFile("../../tests/test_data/mod5_raw0.bin", raw_frames.data(), RAW_MODULE_SIZE); const uint16_t nmodules = 4; DiffractionExperiment x((DetectorGeometry(nmodules))); uint16_t data[4096]; x.Mode(DetectorMode::Raw); - x.PedestalG0Frames(0).ImagesPerTrigger(5).NumTriggers(1); + x.PedestalG0Frames(0).ImagesPerTrigger(1).NumTriggers(1); HLSSimulatedDevice test(0, 64); - test.CreateJFPackets(x, 1, 5, 0, raw_frames.data()); + test.CreateJFPackets(x, 1, 1, 0, raw_frames.data()); test.CreateFinalPacket(x); REQUIRE_NOTHROW(test.StartAction(x)); REQUIRE_NOTHROW(test.WaitForActionComplete()); @@ -111,15 +109,14 @@ TEST_CASE("HLS_C_Simulation_check_raw", "[FPGA][Full]") { REQUIRE_NOTHROW(test.OutputStream().read()); REQUIRE(test.OutputStream().size() == 0); - REQUIRE(test.GetBytesReceived() == 5 * 128 * JUNGFRAU_PACKET_SIZE_BYTES); + REQUIRE(test.GetBytesReceived() == 128 * JUNGFRAU_PACKET_SIZE_BYTES); uint64_t diffs = 0; - for (int image = 0; image < 5; image++) { - for (int j = 0; j < RAW_MODULE_SIZE; j++) { - if (raw_frames[image*RAW_MODULE_SIZE+j] != ((uint16_t *) test.GetDeviceOutput(image, 0)->pixels)[j]) { - diffs++; - std::cout << raw_frames[image*RAW_MODULE_SIZE+j] << " " << ((uint16_t *) test.GetDeviceOutput(image, 0)->pixels)[j] << std::endl; - } + + for (int j = 0; j < RAW_MODULE_SIZE; j++) { + if (raw_frames[j] != ((uint16_t *) test.GetDeviceOutput(0, 0)->pixels)[j]) { + diffs++; + std::cout << raw_frames[j] << " " << ((uint16_t *) test.GetDeviceOutput(0, 0)->pixels)[j] << std::endl; } } @@ -919,13 +916,11 @@ TEST_CASE("HLS_C_Simulation_check_2_trigger_convert", "[FPGA][Full]") { LoadBinaryFile("../../tests/test_data/mod5_pedeG1.bin", pedestal_g1.data(), RAW_MODULE_SIZE); LoadBinaryFile("../../tests/test_data/mod5_pedeG2.bin", pedestal_g2.data(), RAW_MODULE_SIZE); - std::vector raw_frames(RAW_MODULE_SIZE*20); - std::vector conv_frames(RAW_MODULE_SIZE*20); + std::vector raw_frames(RAW_MODULE_SIZE); + std::vector conv_frames(RAW_MODULE_SIZE); - for (int i = 0; i < 20; i++) { - LoadBinaryFile("../../tests/test_data/mod5_raw" + std::to_string(i)+".bin", raw_frames.data() + i * RAW_MODULE_SIZE, RAW_MODULE_SIZE); - LoadBinaryFile("../../tests/test_data/mod5_conv" + std::to_string(i)+".bin", conv_frames.data() + i * RAW_MODULE_SIZE, RAW_MODULE_SIZE); - } + LoadBinaryFile("../../tests/test_data/mod5_raw0.bin", raw_frames.data(), RAW_MODULE_SIZE); + LoadBinaryFile("../../tests/test_data/mod5_conv0.bin", conv_frames.data(), RAW_MODULE_SIZE); const uint16_t nmodules = 4; DiffractionExperiment x((DetectorGeometry(nmodules))); @@ -933,7 +928,7 @@ TEST_CASE("HLS_C_Simulation_check_2_trigger_convert", "[FPGA][Full]") { uint16_t data[4096]; x.Mode(DetectorMode::Conversion); - x.PedestalG0Frames(0).NumTriggers(2).ImagesPerTrigger(5); + x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1); HLSSimulatedDevice test(0, 64); @@ -946,7 +941,7 @@ TEST_CASE("HLS_C_Simulation_check_2_trigger_convert", "[FPGA][Full]") { REQUIRE_NOTHROW(test.InitializeCalibration(x, c)); // send some frames without trigger (to be ignored) - test.CreateJFPackets(x, 1, 10, 0, raw_frames.data()); + test.CreateJFPackets(x, 1, 1, 0, raw_frames.data()); test.CreateFinalPacket(x); REQUIRE_NOTHROW(test.StartAction(x)); @@ -961,25 +956,23 @@ TEST_CASE("HLS_C_Simulation_check_2_trigger_convert", "[FPGA][Full]") { REQUIRE((uint64_t) test.GetDeviceOutput(0,0)->pixels % 128 == 0); REQUIRE(test.Counters().GetSlowestFrameNumber() == 0); - REQUIRE(test.Counters().GetCurrFrameNumber(0) == 9); + REQUIRE(test.Counters().GetCurrFrameNumber(0) == 0); REQUIRE_NOTHROW(test.OutputStream().read()); REQUIRE(test.OutputStream().size() == 0); - REQUIRE(test.GetBytesReceived()== 128 * 10 * JUNGFRAU_PACKET_SIZE_BYTES); + REQUIRE(test.GetBytesReceived()== 128 * JUNGFRAU_PACKET_SIZE_BYTES); double mean_error = 0.0; - for (int image = 0; image < 10; image++) { - auto img = test.GetDeviceOutput(image, 0)->pixels; - for (int j = 0; j < RAW_MODULE_SIZE; j++) { - if ((img[j] < 30000) && (img[j] > -30000)) { - float diff = (conv_frames[image * RAW_MODULE_SIZE + j] - (float) img[j]); - mean_error += diff * diff; - } + auto img = test.GetDeviceOutput(0, 0)->pixels; + for (int j = 0; j < RAW_MODULE_SIZE; j++) { + if ((img[j] < 30000) && (img[j] > -30000)) { + float diff = (conv_frames[j] - (float) img[j]); + mean_error += diff * diff; } } - mean_error = sqrt(mean_error/ (10*RAW_MODULE_SIZE)); + mean_error = sqrt(mean_error/ (RAW_MODULE_SIZE)); std::cout << "Mean error " << mean_error << std::endl; REQUIRE(mean_error < 0.30); } diff --git a/tests/test_data/mod5_conv1.bin b/tests/test_data/mod5_conv1.bin deleted file mode 100644 index eeceeb9b..00000000 Binary files a/tests/test_data/mod5_conv1.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv10.bin b/tests/test_data/mod5_conv10.bin deleted file mode 100644 index f5570526..00000000 Binary files a/tests/test_data/mod5_conv10.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv11.bin b/tests/test_data/mod5_conv11.bin deleted file mode 100644 index e25ab1a7..00000000 Binary files a/tests/test_data/mod5_conv11.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv12.bin b/tests/test_data/mod5_conv12.bin deleted file mode 100644 index 4a7e57ea..00000000 Binary files a/tests/test_data/mod5_conv12.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv13.bin b/tests/test_data/mod5_conv13.bin deleted file mode 100644 index 641f9b09..00000000 Binary files a/tests/test_data/mod5_conv13.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv14.bin b/tests/test_data/mod5_conv14.bin deleted file mode 100644 index 922e9197..00000000 Binary files a/tests/test_data/mod5_conv14.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv15.bin b/tests/test_data/mod5_conv15.bin deleted file mode 100644 index f9d41daf..00000000 Binary files a/tests/test_data/mod5_conv15.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv16.bin b/tests/test_data/mod5_conv16.bin deleted file mode 100644 index 2194640f..00000000 Binary files a/tests/test_data/mod5_conv16.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv17.bin b/tests/test_data/mod5_conv17.bin deleted file mode 100644 index 0c076c63..00000000 Binary files a/tests/test_data/mod5_conv17.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv18.bin b/tests/test_data/mod5_conv18.bin deleted file mode 100644 index c1f78459..00000000 Binary files a/tests/test_data/mod5_conv18.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv19.bin b/tests/test_data/mod5_conv19.bin deleted file mode 100644 index 578764b6..00000000 Binary files a/tests/test_data/mod5_conv19.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv2.bin b/tests/test_data/mod5_conv2.bin deleted file mode 100644 index e280dad1..00000000 Binary files a/tests/test_data/mod5_conv2.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv3.bin b/tests/test_data/mod5_conv3.bin deleted file mode 100644 index 2bf5b6a4..00000000 Binary files a/tests/test_data/mod5_conv3.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv4.bin b/tests/test_data/mod5_conv4.bin deleted file mode 100644 index bf7e8aa4..00000000 Binary files a/tests/test_data/mod5_conv4.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv5.bin b/tests/test_data/mod5_conv5.bin deleted file mode 100644 index ffae8b4e..00000000 Binary files a/tests/test_data/mod5_conv5.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv6.bin b/tests/test_data/mod5_conv6.bin deleted file mode 100644 index 6ccfbf05..00000000 Binary files a/tests/test_data/mod5_conv6.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv7.bin b/tests/test_data/mod5_conv7.bin deleted file mode 100644 index e7d84be0..00000000 Binary files a/tests/test_data/mod5_conv7.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv8.bin b/tests/test_data/mod5_conv8.bin deleted file mode 100644 index 99efd95b..00000000 Binary files a/tests/test_data/mod5_conv8.bin and /dev/null differ diff --git a/tests/test_data/mod5_conv9.bin b/tests/test_data/mod5_conv9.bin deleted file mode 100644 index e097a02f..00000000 Binary files a/tests/test_data/mod5_conv9.bin and /dev/null differ diff --git a/tests/test_data/mod5_pedeG0_RMS.bin b/tests/test_data/mod5_pedeG0_RMS.bin deleted file mode 100644 index 02207fc3..00000000 Binary files a/tests/test_data/mod5_pedeG0_RMS.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw1.bin b/tests/test_data/mod5_raw1.bin deleted file mode 100644 index a4d4f3fc..00000000 Binary files a/tests/test_data/mod5_raw1.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw10.bin b/tests/test_data/mod5_raw10.bin deleted file mode 100644 index 4c774c32..00000000 Binary files a/tests/test_data/mod5_raw10.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw11.bin b/tests/test_data/mod5_raw11.bin deleted file mode 100644 index 5dfc8254..00000000 Binary files a/tests/test_data/mod5_raw11.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw12.bin b/tests/test_data/mod5_raw12.bin deleted file mode 100644 index a8976655..00000000 Binary files a/tests/test_data/mod5_raw12.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw13.bin b/tests/test_data/mod5_raw13.bin deleted file mode 100644 index 3d830cec..00000000 Binary files a/tests/test_data/mod5_raw13.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw14.bin b/tests/test_data/mod5_raw14.bin deleted file mode 100644 index 957a7110..00000000 Binary files a/tests/test_data/mod5_raw14.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw15.bin b/tests/test_data/mod5_raw15.bin deleted file mode 100644 index caccb14f..00000000 Binary files a/tests/test_data/mod5_raw15.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw16.bin b/tests/test_data/mod5_raw16.bin deleted file mode 100644 index db304a7f..00000000 Binary files a/tests/test_data/mod5_raw16.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw17.bin b/tests/test_data/mod5_raw17.bin deleted file mode 100644 index 72c3e3b7..00000000 Binary files a/tests/test_data/mod5_raw17.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw18.bin b/tests/test_data/mod5_raw18.bin deleted file mode 100644 index fe77ae4a..00000000 Binary files a/tests/test_data/mod5_raw18.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw19.bin b/tests/test_data/mod5_raw19.bin deleted file mode 100644 index 2162fddc..00000000 Binary files a/tests/test_data/mod5_raw19.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw2.bin b/tests/test_data/mod5_raw2.bin deleted file mode 100644 index 5df02c60..00000000 Binary files a/tests/test_data/mod5_raw2.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw3.bin b/tests/test_data/mod5_raw3.bin deleted file mode 100644 index dd617c16..00000000 Binary files a/tests/test_data/mod5_raw3.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw4.bin b/tests/test_data/mod5_raw4.bin deleted file mode 100644 index 663b2b4d..00000000 Binary files a/tests/test_data/mod5_raw4.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw5.bin b/tests/test_data/mod5_raw5.bin deleted file mode 100644 index 03213047..00000000 Binary files a/tests/test_data/mod5_raw5.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw6.bin b/tests/test_data/mod5_raw6.bin deleted file mode 100644 index f79e2a7f..00000000 Binary files a/tests/test_data/mod5_raw6.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw7.bin b/tests/test_data/mod5_raw7.bin deleted file mode 100644 index 0fe4e69b..00000000 Binary files a/tests/test_data/mod5_raw7.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw8.bin b/tests/test_data/mod5_raw8.bin deleted file mode 100644 index 7bfdd1b3..00000000 Binary files a/tests/test_data/mod5_raw8.bin and /dev/null differ diff --git a/tests/test_data/mod5_raw9.bin b/tests/test_data/mod5_raw9.bin deleted file mode 100644 index 95093598..00000000 Binary files a/tests/test_data/mod5_raw9.bin and /dev/null differ