Fixes to version 1.0.0-rc.18

2024-10-17 16:29:38 +02:00
parent 3d9c93c32a
commit c9eb2ca65d
6 changed files with 136 additions and 136 deletions
@@ -784,57 +784,3 @@ TEST_CASE("JFJochReceiverTest_EIGER_conversion", "[JFJochReceiver]") {

    REQUIRE(!output.status.cancelled);
 }
-
-#include "../image_pusher/HDF5FilePusher.h"
-
-TEST_CASE("JFJochIntegrationTest_HDF5FilePusher", "[JFJochReceiver]") {
-    Logger logger("JFJochIntegrationTest_HDF5FilePusher");
-
-    RegisterHDF5Filter();
-
-    const uint16_t nthreads = 4;
-
-    DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
-    experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true).ImagesPerFile(2)
-            .FilePrefix("lyso_test_HDF5FilePusher").JungfrauConvPhotonCnt(false)
-            .DetectorDistance_mm(75).BeamY_pxl(1136).BeamX_pxl(1090).PhotonEnergy_keV(12.4)
-            .SetUnitCell(UnitCell{.a = 36.9, .b = 78.95, .c = 78.95, .alpha =90, .beta = 90, .gamma = 90});
-    PixelMask pixel_mask(experiment);
-
-    // Load example image
-    HDF5ReadOnlyFile data("../../tests/test_data/compression_benchmark.h5");
-    HDF5DataSet dataset(data, "/entry/data/data");
-    HDF5DataSpace file_space(dataset);
-
-    REQUIRE(file_space.GetDimensions()[2] == experiment.GetXPixelsNum());
-    REQUIRE(file_space.GetDimensions()[1] == experiment.GetYPixelsNum());
-    std::vector<int16_t> image_conv (file_space.GetDimensions()[1] * file_space.GetDimensions()[2]);
-
-    std::vector<hsize_t> start = {4,0,0};
-    std::vector<hsize_t> file_size = {1, file_space.GetDimensions()[1], file_space.GetDimensions()[2]};
-    dataset.ReadVector(image_conv, start, file_size);
-
-    std::vector<int16_t> image_raw_geom(experiment.GetModulesNum() * RAW_MODULE_SIZE);
-    ConvertedToRawGeometry(experiment, image_raw_geom.data(), image_conv.data());
-    logger.Info("Loaded image");
-
-    // Setup acquisition device
-    AcquisitionDeviceGroup aq_devices;
-    std::unique_ptr<HLSSimulatedDevice> test = std::make_unique<HLSSimulatedDevice>(0, 64);
-    for (int m = 0; m < experiment.GetModulesNum(); m++)
-        test->SetInternalGeneratorFrame((uint16_t *) image_raw_geom.data() + m * RAW_MODULE_SIZE, m);
-
-    aq_devices.Add(std::move(test));
-
-    HDF5FilePusher pusher;
-
-    JFJochReceiverService service(aq_devices, logger, pusher);
-    service.NumThreads(nthreads);
-
-    service.Start(experiment, pixel_mask, nullptr);
-    auto receiver_out = service.Stop();
-
-    CHECK(receiver_out.efficiency == 1.0);
-    CHECK(receiver_out.status.images_sent == experiment.GetImageNum());
-    CHECK(!receiver_out.status.cancelled);
-}