leonarski_f
eadbce51bd
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m48s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m35s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m2s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m58s
Build Packages / build:rpm (rocky8) (push) Successful in 13m0s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m58s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m29s
Build Packages / XDS test (durin plugin) (push) Successful in 7m30s
Build Packages / Generate python client (push) Successful in 39s
Build Packages / Build documentation (push) Successful in 51s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m11s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m55s
Build Packages / build:rpm (rocky9) (push) Successful in 12m15s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m11s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m33s
Build Packages / DIALS test (push) Successful in 12m0s
Build Packages / Unit tests (push) Successful in 57m36s
The phi bounds were stored as plain floats internally but passed through std::optional in the constructor, which obscured the intent. Take them as float arguments defaulting to 0 instead. The convention is explicit: phi_min == phi_max means the full ring (all angles), a sector wraps across 0 when phi_min > phi_max, and otherwise phi_min <= phi_max. The "both bounds or none" rule belongs at the API/file boundary (OpenAPIConvert, reader), not in the core class, so it lives there now. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
81 lines
2.3 KiB
C++
81 lines
2.3 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <cmath>
|
|
#include "JFJochMath.h"
|
|
#include "ROIAzimuthal.h"
|
|
#include "JFJochException.h"
|
|
|
|
static float NormalizePhi_deg(float phi) {
|
|
phi = std::fmod(phi, 360.0f);
|
|
if (phi < 0)
|
|
phi += 360.0f;
|
|
return phi;
|
|
}
|
|
|
|
ROIAzimuthal::ROIAzimuthal(const std::string &in_name, float in_d_min_A, float in_d_max_A,
|
|
float in_phi_min_deg, float in_phi_max_deg)
|
|
: ROIElement(in_name),
|
|
phi_min_deg(NormalizePhi_deg(in_phi_min_deg)),
|
|
phi_max_deg(NormalizePhi_deg(in_phi_max_deg)) {
|
|
if ((in_d_min_A <= 0) || (in_d_max_A <= 0))
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Resolution cannot be zero or negative");
|
|
if (in_d_min_A > in_d_max_A) {
|
|
d_max_A = in_d_min_A;
|
|
d_min_A = in_d_max_A;
|
|
} else {
|
|
d_max_A = in_d_max_A;
|
|
d_min_A = in_d_min_A;
|
|
}
|
|
}
|
|
|
|
float ROIAzimuthal::GetDMin_A() const {
|
|
return d_min_A;
|
|
}
|
|
|
|
float ROIAzimuthal::GetDMax_A() const {
|
|
return d_max_A;
|
|
}
|
|
|
|
bool ROIAzimuthal::HasPhi() const {
|
|
return phi_min_deg != phi_max_deg;
|
|
}
|
|
|
|
float ROIAzimuthal::GetPhiMin_deg() const {
|
|
return phi_min_deg;
|
|
}
|
|
|
|
float ROIAzimuthal::GetPhiMax_deg() const {
|
|
return phi_max_deg;
|
|
}
|
|
|
|
bool ROIAzimuthal::CheckROI(int64_t x, int64_t y, float resolution, float phi_deg) const {
|
|
if (resolution < d_min_A || resolution > d_max_A)
|
|
return false;
|
|
if (phi_min_deg == phi_max_deg)
|
|
return true; // full ring: all angles
|
|
if (phi_min_deg <= phi_max_deg)
|
|
return (phi_deg >= phi_min_deg) && (phi_deg <= phi_max_deg);
|
|
return (phi_deg >= phi_min_deg) || (phi_deg <= phi_max_deg); // sector wraps across 0
|
|
}
|
|
|
|
float ROIAzimuthal::GetQMax_recipA() const {
|
|
return 2.0f * PI / d_min_A;
|
|
}
|
|
|
|
float ROIAzimuthal::GetQMin_recipA() const {
|
|
return 2.0f * PI / d_max_A;
|
|
}
|
|
|
|
ROIConfig ROIAzimuthal::ExportMetadata() const {
|
|
double qmin = GetQMin_recipA();
|
|
double qmax = GetQMax_recipA();
|
|
return ROIConfig{
|
|
.type = ROIConfig::ROIType::Azim,
|
|
.name = name,
|
|
.azim = ROIConfigAzim{.qmin = qmin, .qmax = qmax,
|
|
.phi_min = phi_min_deg, .phi_max = phi_max_deg}
|
|
};
|
|
}
|