v1.0.0-rc.40
This commit is contained in:
+12
-63
@@ -89,10 +89,8 @@ TEST_CASE("JFJochReader_PixelMask", "[HDF5][Full]") {
|
||||
pixel_mask[x.GetPixelsNum() - 1] = 4;
|
||||
pixel_mask[0] = 256;
|
||||
|
||||
std::vector<int16_t> image(x.GetPixelsNum(), 0);
|
||||
|
||||
std::vector<uint16_t> image(x.GetPixelsNum(), 0);
|
||||
{
|
||||
|
||||
StartMessage start_message;
|
||||
x.FillMessage(start_message);
|
||||
start_message.pixel_mask["default"] = pixel_mask;
|
||||
@@ -100,18 +98,11 @@ TEST_CASE("JFJochReader_PixelMask", "[HDF5][Full]") {
|
||||
FileWriter file_set(start_message);
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.number = 0;
|
||||
|
||||
REQUIRE_NOTHROW(file_set.WriteHDF5(message));
|
||||
|
||||
|
||||
EndMessage end_message;
|
||||
end_message.max_image_number = 1;
|
||||
file_set.WriteHDF5(end_message);
|
||||
@@ -163,13 +154,7 @@ TEST_CASE("JFJochReader_DataI16", "[HDF5][Full]") {
|
||||
image[5678] = i;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.indexing_result = (i % 2 == 0);
|
||||
message.bkg_estimate = i * 345.6;
|
||||
@@ -243,13 +228,7 @@ TEST_CASE("JFJochReader_DataI16_OldMasterFormat", "[HDF5][Full]") {
|
||||
image[5678] = i;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.indexing_result = (i % 2 == 0);
|
||||
message.bkg_estimate = i * 345.6;
|
||||
@@ -325,13 +304,7 @@ TEST_CASE("JFJochReader_DataU16", "[HDF5][Full]") {
|
||||
image[5678] = i;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.indexing_result = (i % 2 == 0);
|
||||
message.bkg_estimate = i * 345.6;
|
||||
@@ -383,7 +356,7 @@ TEST_CASE("JFJochReader_DataI32", "[HDF5][Full]") {
|
||||
x.BitDepthImage(32).ImagesPerFile(1).SetFileWriterFormat(FileWriterFormat::NXmxVDS).PixelSigned(true);
|
||||
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
|
||||
|
||||
std::vector<uint32_t> image(x.GetPixelsNum());
|
||||
std::vector<int32_t> image(x.GetPixelsNum());
|
||||
image[0] = INT32_MAX;
|
||||
image[1] = INT32_MIN;
|
||||
image[2] = 456;
|
||||
@@ -399,13 +372,7 @@ TEST_CASE("JFJochReader_DataI32", "[HDF5][Full]") {
|
||||
image[5678] = i;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.number = i;
|
||||
|
||||
@@ -471,13 +438,7 @@ TEST_CASE("JFJochReader_DataU32", "[HDF5][Full]") {
|
||||
image[5678] = i;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.number = i;
|
||||
|
||||
@@ -543,23 +504,17 @@ TEST_CASE("JFJochReader_Summation", "[HDF5][Full]") {
|
||||
std::vector<SpotToSave> spots;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.spots = spots;
|
||||
|
||||
message.image.data = (uint8_t *) image_1.data();
|
||||
message.image = CompressedImage(image_1, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.number = 0;
|
||||
REQUIRE_NOTHROW(file_set.WriteHDF5(message));
|
||||
|
||||
message.image.data = (uint8_t *) image_2.data();
|
||||
message.image = CompressedImage(image_2, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.number = 1;
|
||||
REQUIRE_NOTHROW(file_set.WriteHDF5(message));
|
||||
|
||||
message.image.data = (uint8_t *) image_3.data();
|
||||
message.image = CompressedImage(image_3, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.number = 2;
|
||||
REQUIRE_NOTHROW(file_set.WriteHDF5(message));
|
||||
|
||||
@@ -618,13 +573,7 @@ TEST_CASE("JFJochReader_ROI", "[HDF5][Full]") {
|
||||
std::vector<SpotToSave> spots;
|
||||
|
||||
DataMessage message{};
|
||||
message.image.pixel_depth_bytes = x.GetByteDepthImage();
|
||||
message.image.pixel_is_signed = x.IsPixelSigned();
|
||||
message.image.algorithm = CompressionAlgorithm::NO_COMPRESSION;
|
||||
message.image.xpixel = x.GetXPixelsNum();
|
||||
message.image.ypixel = x.GetYPixelsNum();
|
||||
message.image.data = (uint8_t *) image.data();
|
||||
message.image.size = x.GetPixelsNum() * x.GetByteDepthImage();
|
||||
message.image = CompressedImage(image, x.GetXPixelsNum(), x.GetYPixelsNum());
|
||||
message.spots = spots;
|
||||
message.number = i;
|
||||
message.roi["beam"] = ROIMessage{
|
||||
|
||||
Reference in New Issue
Block a user