leonarski_f
5d9e1be814
M_PI is a POSIX <math.h> extension that MSVC does not define without _USE_MATH_DEFINES. std::numbers::pi (introduced in the viewer guard commit) is C++20, but CUDA here is compiled as C++17 (CMAKE_CUDA_STANDARD 17) and several common/ headers are pulled into .cu device translation units, so std::numbers is not available there. Add common/JFJochMath.h with a dependency-free `constexpr double PI` that works in host code (including MSVC), in CUDA device code, and under C++17/20, and use it everywhere: - common/ and image_analysis/ (incl. CUDA .cu): 78 M_PI occurrences, 22 files - broker/OpenAPIConvert.cpp - viewer/: the 5 files that used std::numbers::pi now use PI, for one consistent convention across the codebase Verified to build: JFJochImageAnalysis (incl. CUDA), jfjoch_viewer, JFJochBroker. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochMath.h"
|
|
#include "ROIAzimuthal.h"
|
|
#include "JFJochException.h"
|
|
|
|
ROIAzimuthal::ROIAzimuthal(const std::string &in_name, float in_d_min_A, float in_d_max_A)
|
|
: ROIElement(in_name) {
|
|
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::CheckROI(int64_t x, int64_t y, float resolution) const {
|
|
return (resolution >= d_min_A && resolution <= d_max_A);
|
|
}
|
|
|
|
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}
|
|
};
|
|
}
|