All checks were successful
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m23s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m32s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m15s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m13s
Build Packages / build:rpm (rocky8) (push) Successful in 9m10s
Build Packages / build:rpm (rocky9) (push) Successful in 9m58s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m52s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m42s
Build Packages / Unit tests (push) Successful in 1h12m44s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m30s
This is an UNSTABLE release. This version significantly rewrites code to predict reflection position and integrate them, especially in case of rotation crystallography. If things go wrong with analysis, it is better to revert to 1.0.0-rc.123. * jfjoch_broker: Improve refection position prediction and Bragg integration code. * jfjoch_broker: Align with XDS way of calculating Lorentz correction and general notation. * jfjoch_writer: Fix saving mosaicity properly in HDF5 file. * jfjoch_viewer: Introduce high-dynamic range mode for images * jfjoch_viewer: Ctrl+mouse wheel has exponential change in foreground (+/-15%) * jfjoch_viewer: Zoom-in numbers have better readability Reviewed-on: #31 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
140 lines
5.6 KiB
C++
140 lines
5.6 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "BraggIntegrate2D.h"
|
|
|
|
template<class T>
|
|
void IntegrateReflection(Reflection &r, const T *image, size_t xpixel, size_t ypixel,
|
|
int64_t special_value, int64_t saturation,
|
|
float r_3, float r_1_sq, float r_2_sq, float r_3_sq) {
|
|
|
|
int64_t x0 = std::floor(r.predicted_x - r_3 - 1.0);
|
|
int64_t x1 = std::ceil(r.predicted_x + r_3 + 1.0);
|
|
int64_t y0 = std::floor(r.predicted_y - r_3 - 1.0);
|
|
int64_t y1 = std::ceil(r.predicted_y + r_3 + 1.0);
|
|
if (x0 < 0)
|
|
x0 = 0;
|
|
if (y0 < 0)
|
|
y0 = 0;
|
|
if (x1 >= xpixel)
|
|
x1 = xpixel - 1;
|
|
if (y1 >= ypixel)
|
|
y1 = ypixel - 1;
|
|
|
|
int64_t I_sum = 0;
|
|
int64_t bkg_sum = 0;
|
|
int64_t bkg_npixel = 0;
|
|
int64_t I_npixel_inner = 0;
|
|
int64_t I_npixel_integrated = 0;
|
|
|
|
for (int64_t y = y0; y <= y1; y++) {
|
|
for (int64_t x = x0; x <= x1; x++) {
|
|
float dist_sq = (x - r.predicted_x) * (x - r.predicted_x) + (y - r.predicted_y) * (y - r.predicted_y);
|
|
|
|
if (dist_sq < r_1_sq)
|
|
I_npixel_inner++;
|
|
|
|
if (image[y * xpixel + x] == special_value || image[y * xpixel + x] == saturation)
|
|
continue;
|
|
|
|
if (dist_sq < r_1_sq) {
|
|
I_sum += image[y * xpixel + x];
|
|
I_npixel_integrated++;
|
|
} else if (dist_sq >= r_2_sq && dist_sq < r_3_sq) {
|
|
bkg_sum += image[y * xpixel + x];
|
|
bkg_npixel++;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ((I_npixel_integrated == I_npixel_inner) && (bkg_npixel > 5)) {
|
|
r.bkg = static_cast<float>(bkg_sum) / static_cast<float>(bkg_npixel);
|
|
r.I = static_cast<float>(I_sum) - static_cast<float>(I_npixel_integrated) * r.bkg;
|
|
// minimum sigma is 1!
|
|
if (I_sum >= 1)
|
|
r.sigma = std::sqrt(static_cast<float>(I_sum));
|
|
else
|
|
r.sigma = 1;
|
|
r.observed = true;
|
|
} else {
|
|
r.I = 0;
|
|
r.bkg = 0;
|
|
r.observed = false;
|
|
}
|
|
}
|
|
|
|
#include <iostream>
|
|
|
|
template<class T>
|
|
std::vector<Reflection> IntegrateInternal(const DiffractionExperiment &experiment,
|
|
const CompressedImage &image,
|
|
const std::vector<Reflection> &predicted,
|
|
size_t npredicted,
|
|
int64_t special_value,
|
|
int64_t saturation,
|
|
int64_t image_number) {
|
|
|
|
std::vector<Reflection> ret;
|
|
ret.reserve(npredicted);
|
|
|
|
auto settings = experiment.GetBraggIntegrationSettings();
|
|
auto geom = experiment.GetDiffractionGeometry();
|
|
|
|
std::vector<uint8_t> buffer;
|
|
auto ptr = reinterpret_cast<const T *>(image.GetUncompressedPtr(buffer));
|
|
|
|
const float r_3 = settings.GetR3();
|
|
const float r_1_sq = settings.GetR1() * settings.GetR1();
|
|
const float r_2_sq = settings.GetR2() * settings.GetR2();
|
|
const float r_3_sq = settings.GetR3() * settings.GetR3();
|
|
|
|
const Coord S0 = geom.GetScatteringVector();
|
|
Coord m2 = Coord(0,0,0); // zero vector
|
|
if (experiment.GetGoniometer().has_value())
|
|
m2 = experiment.GetGoniometer()->GetAxis().Normalize();
|
|
|
|
for (int i = 0; i < npredicted; i++) {
|
|
auto r = predicted.at(i);
|
|
IntegrateReflection(r, ptr, image.GetWidth(), image.GetHeight(), special_value, saturation,
|
|
r_3, r_1_sq, r_2_sq, r_3_sq);
|
|
if (r.observed) {
|
|
if (experiment.GetPolarizationFactor())
|
|
r.rlp *= geom.CalcAzIntPolarizationCorr(r.predicted_x, r.predicted_y,
|
|
experiment.GetPolarizationFactor().value());
|
|
r.I *= r.rlp;
|
|
r.bkg *= r.rlp;
|
|
r.sigma *= r.rlp;
|
|
r.image_number = static_cast<float>(image_number);
|
|
ret.emplace_back(r);
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
std::vector<Reflection> BraggIntegrate2D(const DiffractionExperiment &experiment,
|
|
const CompressedImage &image,
|
|
const std::vector<Reflection> &predicted,
|
|
size_t npredicted,
|
|
int64_t image_number) {
|
|
if (image.GetCompressedSize() == 0 || predicted.empty())
|
|
return {};
|
|
|
|
switch (image.GetMode()) {
|
|
case CompressedImageMode::Int8:
|
|
return IntegrateInternal<int8_t>(experiment, image, predicted, npredicted, INT8_MIN, INT8_MAX, image_number);
|
|
case CompressedImageMode::Int16:
|
|
return IntegrateInternal<int16_t>(experiment, image, predicted, npredicted, INT16_MIN, INT16_MAX, image_number);
|
|
case CompressedImageMode::Int32:
|
|
return IntegrateInternal<int32_t>(experiment, image, predicted, npredicted, INT32_MIN, INT32_MAX, image_number);
|
|
case CompressedImageMode::Uint8:
|
|
return IntegrateInternal<uint8_t>(experiment, image, predicted, npredicted, UINT8_MAX, UINT8_MAX, image_number);
|
|
case CompressedImageMode::Uint16:
|
|
return IntegrateInternal<uint16_t>(experiment, image, predicted, npredicted, UINT16_MAX, UINT16_MAX, image_number);
|
|
case CompressedImageMode::Uint32:
|
|
return IntegrateInternal<uint16_t>(experiment, image, predicted, npredicted, UINT32_MAX, UINT32_MAX, image_number);
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Image mode not supported");
|
|
}
|
|
}
|