AcquisitionDeviceGroup: Used to simplify handling multiple aq devices

This commit is contained in:
2023-11-12 12:52:44 +01:00
parent a0c5223512
commit 3e4eb449de
22 changed files with 289 additions and 344 deletions
+6 -7
View File
@@ -50,15 +50,15 @@ TEST_CASE("JFJochReceiverTest_Raw_MockAcquisitionDevice", "[JFJochReceiver]") {
x.PedestalG0Frames(0).NumTriggers(1).UseInternalPacketGenerator(true)
.ImagesPerTrigger(100).DataFileCount(16).PhotonEnergy_keV(12.4).Compression(JFJochProtoBuf::NO_COMPRESSION);
std::vector<std::unique_ptr<AcquisitionDevice>> aq_devices;
AcquisitionDeviceGroup aq_devices;
for (int i = 0; i < x.GetDataStreamsNum(); i++) {
for (auto &j: test_frame)
j = dist(g1);
auto *test = new MockAcquisitionDevice(i, 64);
auto test = std::make_unique<MockAcquisitionDevice>(i, 64);
test->EnableLogging(&logger);
test->SetCustomInternalGeneratorFrame(test_frame);
aq_devices.emplace_back(test);
aq_devices.Add(std::move(test));
}
JFJochReceiverOutput output;
@@ -84,12 +84,11 @@ TEST_CASE("JFJochReceiverTest_Conversion_MockAcquisitionDevice", "[JFJochReceive
x.PedestalG0Frames(0).NumTriggers(1).UseInternalPacketGenerator(true).DataStreams(x.GetModulesNum())
.ImagesPerTrigger(32).DataFileCount(16).PhotonEnergy_keV(12.4).Compression(JFJochProtoBuf::BSHUF_ZSTD);
std::vector<std::unique_ptr<AcquisitionDevice>> aq_devices;
AcquisitionDeviceGroup aq_devices;
for (int i = 0; i < x.GetDataStreamsNum(); i++) {
AcquisitionDevice *test;
test = new MockAcquisitionDevice(i, 64);
auto test = std::make_unique<MockAcquisitionDevice>(i, 64);
test->EnableLogging(&logger);
aq_devices.emplace_back(test);
aq_devices.Add(std::move(test));
}
JFJochReceiverOutput output;