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

@@ -26,7 +26,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index", "[JFJochReceiver]
DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true).ImagesPerFile(2)
.FilePrefix("lyso_test").JungfrauConvPhotonCnt(false).HDF5MasterFormatVersion(2).OverwriteExistingFiles(true)
.FilePrefix("lyso_test").JungfrauConvPhotonCnt(false).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).OverwriteExistingFiles(true)
.DetectorDistance_mm(75).BeamY_pxl(1136).BeamX_pxl(1090).IncidentEnergy_keV(12.4)
.SetUnitCell(UnitCell{.a = 36.9, .b = 78.95, .c = 78.95, .alpha =90, .beta = 90, .gamma = 90});
PixelMask pixel_mask(experiment);
@@ -111,7 +111,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_min_pix_2", "[JFJoc
DiffractionExperiment experiment(DetectorGeometry(8,2,8,36));
experiment.ImagesPerTrigger(5).NumTriggers(1).UseInternalPacketGenerator(true).OverwriteExistingFiles(true)
.FilePrefix("lyso_test_min_pix_2").JungfrauConvPhotonCnt(false).HDF5MasterFormatVersion(2)
.FilePrefix("lyso_test_min_pix_2").JungfrauConvPhotonCnt(false).HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS)
.DetectorDistance_mm(75).BeamY_pxl(1136).BeamX_pxl(1090).IncidentEnergy_keV(12.4)
.SetUnitCell(UnitCell{.a = 36.9, .b = 78.95, .c = 78.95, .alpha =90, .beta = 90, .gamma = 90})
.PixelSigned(true);
@@ -211,7 +211,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_ROI", "[JFJochReceiver]") {
.FilePrefix("lyso_test_roi").JungfrauConvPhotonCnt(false)
.DetectorDistance_mm(75).BeamY_pxl(1136).BeamX_pxl(1090).IncidentEnergy_keV(12.4)
.SetUnitCell(UnitCell{.a = 36.9, .b = 78.95, .c = 78.95, .alpha =90, .beta = 90, .gamma = 90})
.HDF5MasterFormatVersion(2).PixelSigned(true).OverwriteExistingFiles(true);
.HDF5MasterFormatVersion(FileWriterFileFormat::NXmxVDS).PixelSigned(true).OverwriteExistingFiles(true);
PixelMask pixel_mask(experiment);
@@ -244,19 +244,21 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_ROI", "[JFJochReceiver]") {
}
}
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");
auto mask = pixel_mask.GetMaskRaw();
uint64_t sat_pixels = 0;
uint64_t err_pixels = 0;
for (const auto &i: image_raw_geom) {
if (i == INT16_MAX)
sat_pixels++;
else if (i == INT16_MIN)
err_pixels++;
for (int i = 0; i < image_raw_geom.size(); i++) {
if (mask[i] == 0) {
if (image_raw_geom[i] == INT16_MAX)
sat_pixels++;
else if (image_raw_geom[i] == INT16_MIN)
err_pixels++;
}
}
// Setup acquisition device