v1.0.0-rc.34

This commit is contained in:
2025-04-14 11:52:06 +02:00
parent 708b5fbc4b
commit b0607ab3ca
238 changed files with 4590 additions and 1329 deletions

View File

@@ -150,7 +150,7 @@ TEST_CASE("JFJochReader_DataI16", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test09").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(2).PixelSigned(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(true);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
std::vector<int16_t> image(x.GetPixelsNum());
@@ -195,6 +195,8 @@ TEST_CASE("JFJochReader_DataI16", "[HDF5][Full]") {
REQUIRE_NOTHROW(reader.ReadFile("test09_master.h5"));
auto dataset = reader.GetStartMessage();
CHECK(dataset->number_of_images == 4);
REQUIRE(dataset->spot_count.size() == 4);
REQUIRE(dataset->bkg_estimate.size() == 4);
REQUIRE_THROWS(reader.LoadImage(4));
@@ -227,7 +229,7 @@ TEST_CASE("JFJochReader_DataI16_OldMasterFormat", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test15").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(1).PixelSigned(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxLegacy).PixelSigned(true);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
std::vector<int16_t> image(x.GetPixelsNum());
@@ -244,6 +246,7 @@ TEST_CASE("JFJochReader_DataI16_OldMasterFormat", "[HDF5][Full]") {
for (int i = 0; i < x.GetImageNum(); i++) {
std::vector<SpotToSave> spots;
spots.push_back(SpotToSave{.x = 1, .y = 2, .intensity = 376, .indexed = true});
image[5678] = i;
DataMessage message{};
@@ -272,8 +275,8 @@ TEST_CASE("JFJochReader_DataI16_OldMasterFormat", "[HDF5][Full]") {
REQUIRE_NOTHROW(reader.ReadFile("test15_master.h5"));
auto dataset = reader.GetStartMessage();
CHECK(dataset->number_of_images == 4);
REQUIRE(dataset->spot_count.empty());
REQUIRE(dataset->bkg_estimate.empty());
REQUIRE(dataset->spot_count.size() == 4);
REQUIRE(dataset->bkg_estimate.size() == 4);
REQUIRE_THROWS(reader.LoadImage(4));
@@ -287,6 +290,13 @@ TEST_CASE("JFJochReader_DataI16_OldMasterFormat", "[HDF5][Full]") {
CHECK(reader_image->image[2] == image[2]);
CHECK(reader_image->image[3] == image[3]);
CHECK(reader_image->image[5678] == i);
REQUIRE(reader_image->spots.size() == 1);
CHECK(reader_image->spots[0].x == 1);
CHECK(reader_image->spots[0].y == 2);
CHECK(reader_image->spots[0].intensity == 376);
CHECK(reader_image->spots[0].indexed == true);
CHECK(dataset->indexing_result[i] == (i % 2 == 0));
CHECK(dataset->bkg_estimate[i] == Catch::Approx(i * 345.6));
}
}
remove("test15_master.h5");
@@ -303,7 +313,7 @@ TEST_CASE("JFJochReader_DataU16", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test10").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(2).PixelSigned(false);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(false);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
std::vector<uint16_t> image(x.GetPixelsNum());
@@ -377,7 +387,7 @@ TEST_CASE("JFJochReader_DataI32", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test11").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(32).ImagesPerFile(1).HDF5MasterFormatVersion(2).PixelSigned(true);
x.BitDepthImage(32).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(true);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
std::vector<uint32_t> image(x.GetPixelsNum());
@@ -447,7 +457,7 @@ TEST_CASE("JFJochReader_DataU32", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test12").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(32).ImagesPerFile(1).HDF5MasterFormatVersion(2).PixelSigned(false);
x.BitDepthImage(32).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(false);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
std::vector<uint32_t> image(x.GetPixelsNum());
@@ -521,7 +531,7 @@ TEST_CASE("JFJochReader_ROI", "[HDF5][Full]") {
DiffractionExperiment x(DetectorGeometry(1));
x.FilePrefix("test25").ImagesPerTrigger(4).OverwriteExistingFiles(true);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(2).PixelSigned(false);
x.BitDepthImage(16).ImagesPerFile(1).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(false);
x.Compression(CompressionAlgorithm::NO_COMPRESSION);
x.ROI().SetROI(ROIDefinition{