mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 38 Wiki Activity

PreviewImage: remove mutex

Browse Source
This commit is contained in:
leonarski_f
2024-05-23 22:58:52 +02:00
parent 500222bdcc
commit f85b87bfd2
10 changed files with 181 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/JPEGTest.cpp
View File

@@ -24,7 +24,19 @@ TEST_CASE("JPEGTest","[JPEG]") {
f.write(s.data(), s.size());
}
TEST_CASE("PreviewImage_NotConfigured","[JPEG]") {
std::vector<int16_t> image_conv_2(67878);
std::vector<SpotToSave> spots;
PreviewImage image;
REQUIRE_THROWS(image.UpdateImage(image_conv_2.data(), spots));
REQUIRE(image.GenerateJPEG(PreviewJPEGSettings()).empty());
}
TEST_CASE("PreviewImage_GenerateJPEG","[JPEG]") {
RegisterHDF5Filter();
DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true)
.FilePrefix("lyso_test_min_pix_2").ConversionOnFPGA(false)
@@ -57,7 +69,8 @@ TEST_CASE("PreviewImage_GenerateJPEG","[JPEG]") {
{.x = 800, .y = 1000, .indexed = false},
{.x = 1200, .y = 500, .indexed = true}
};
PreviewImage image(experiment);
PreviewImage image;
image.Configure(experiment);
PreviewJPEGSettings preview_settings{
.saturation_value = 5,
@@ -69,7 +82,6 @@ TEST_CASE("PreviewImage_GenerateJPEG","[JPEG]") {
image.UpdateImage(image_conv_2.data(), spots);
std::string s;
REQUIRE_NOTHROW(s = image.GenerateJPEG(preview_settings));
std::ofstream f("lyso_diff.jpeg", std::ios::binary);
@@ -77,6 +89,8 @@ TEST_CASE("PreviewImage_GenerateJPEG","[JPEG]") {
}
TEST_CASE("PreviewImage_GenerateJPEG_ROI","[JPEG]") {
RegisterHDF5Filter();
DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true)
.FilePrefix("lyso_test_min_pix_2").ConversionOnFPGA(false)
@@ -111,7 +125,8 @@ TEST_CASE("PreviewImage_GenerateJPEG_ROI","[JPEG]") {
{.x = 800, .y = 1000, .indexed = false},
{.x = 1200, .y = 500, .indexed = true}
};
PreviewImage image(experiment);
PreviewImage image;
image.Configure(experiment);
image.UpdateImage(image_conv_2.data(), spots);
PreviewJPEGSettings preview_settings{
@@ -128,6 +143,8 @@ TEST_CASE("PreviewImage_GenerateJPEG_ROI","[JPEG]") {
}
TEST_CASE("PreviewImage_GenerateJPEG_resolution","[JPEG]") {
RegisterHDF5Filter();
DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true)
.FilePrefix("lyso_test_min_pix_2").ConversionOnFPGA(false)
@@ -153,7 +170,8 @@ TEST_CASE("PreviewImage_GenerateJPEG_resolution","[JPEG]") {
RawToConvertedGeometry(experiment, image_conv_2.data(), image_raw_geom.data());
std::vector<SpotToSave> spots = {};
PreviewImage image(experiment);
PreviewImage image;
image.Configure(experiment);
image.UpdateImage(image_conv_2.data(), spots);
PreviewJPEGSettings preview_settings{