FPGAAcquisitionDevice: Remove non-blocking mode

This commit is contained in:
2023-09-20 16:26:53 +02:00
parent 6cbd577824
commit 88e837a33a
6 changed files with 4 additions and 58 deletions
+2 -13
View File
@@ -21,7 +21,6 @@ TEST_CASE("JFJochReceiverTest_Raw", "[JFJochReceiver]") {
for (int i = 0; i < x.GetDataStreamsNum(); i++) {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -54,7 +53,6 @@ TEST_CASE("JFJochReceiverTest_Conversion", "[JFJochReceiver]") {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->EnableLogging(&logger);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -65,7 +63,7 @@ TEST_CASE("JFJochReceiverTest_Conversion", "[JFJochReceiver]") {
REQUIRE(output.efficiency() == 1.0);
REQUIRE(output.images_sent() == x.GetImageNum());
REQUIRE(!output.cancelled());
REQUIRE(!output.cancelled());
}
TEST_CASE("JFJochReceiverTest_Conversion_Bin2x2", "[JFJochReceiver]") {
@@ -82,7 +80,6 @@ TEST_CASE("JFJochReceiverTest_Conversion_Bin2x2", "[JFJochReceiver]") {
for (int i = 0; i < x.GetDataStreamsNum(); i++) {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->SetFPGANonBlockingMode(false);
test->EnableLogging(&logger);
aq_devices.emplace_back(test);
}
@@ -112,7 +109,6 @@ TEST_CASE("JFJochReceiverTest_ConversionOnCPU", "[JFJochReceiver]") {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->EnableLogging(&logger);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -123,7 +119,7 @@ TEST_CASE("JFJochReceiverTest_ConversionOnCPU", "[JFJochReceiver]") {
REQUIRE(output.efficiency() == 1.0);
REQUIRE(output.images_sent() == x.GetImageNum());
REQUIRE(!output.cancelled());
REQUIRE(!output.cancelled());
}
@@ -142,7 +138,6 @@ TEST_CASE("JFJochReceiverTest_ConversionOnCPU_Bin2x2", "[JFJochReceiver]") {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->EnableLogging(&logger);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -174,7 +169,6 @@ TEST_CASE("JFJochReceiverTest_Conversion_StorageCell", "[JFJochReceiver]") {
HLSSimulatedDevice *test;
test = new HLSSimulatedDevice(i, 64);
test->EnableLogging(&logger);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -219,7 +213,6 @@ TEST_CASE("JFJochReceiverTest_PedestalG1", "[JFJochReceiver]") {
test = new HLSSimulatedDevice(i, 64);
test->CreatePackets(x, 1, nframes, 0, pedestal_in.data(), false);
test->CreateFinalPacket(x);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -288,7 +281,6 @@ TEST_CASE("JFJochReceiverTest_PedestalG2_storage_cell", "[JFJochReceiver]") {
pedestal_in.data() + j * RAW_MODULE_SIZE, false);
}
test->CreateFinalPacket(x);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -343,7 +335,6 @@ TEST_CASE("JFJochReceiverTest_PedestalG0", "[JFJochReceiver]") {
test = new HLSSimulatedDevice(i, 64);
test->CreatePackets(x, 1, nframes, 0, pedestal_in.data(), false);
test->CreateFinalPacket(x);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
@@ -396,7 +387,6 @@ TEST_CASE("JFJochReceiverTest_PedestalG0_StorageCell", "[JFJochReceiver]") {
test->CreatePackets(x, i*4+4, 1, 0, pedestal_in_3.data(), false);
}
test->CreateFinalPacket(x);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
Logger logger("JFJochReceiverTest_PedestalG0_StorageCell");
@@ -478,7 +468,6 @@ TEST_CASE("JFJochReceiverTest_PacketLost_Raw", "[JFJochReceiver]") {
test->CreatePackets(x, 4, 1, 1, frame_in.data(), false);
test->CreateFinalPacket(x);
test->SetFPGANonBlockingMode(false);
aq_devices.emplace_back(test);
}
Logger logger("JFJochReceiverTest_PacketLost_Raw");