75e401f0e5
Build Packages / Unit tests (push) Successful in 1h31m59s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 8m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m56s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m24s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 10m27s
Build Packages / build:rpm (rocky8) (push) Successful in 9m20s
Build Packages / build:rpm (rocky9) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 9m54s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m38s
Build Packages / DIALS test (push) Successful in 12m13s
Build Packages / XDS test (durin plugin) (push) Successful in 7m8s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m8s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m50s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * jfjoch_broker: Add EXPERIMENTAL pixelrefine mode for image processing * jfjoch_broker: Allow to load user mask from 8-bit and 16-bit TIFF files * jfjoch_broker: Add ROI calculation in non-FPGA workflow * jfjoch_broker: Fixes to TCP image pusher * jfjoch_broker: Remove NUMA bindings * jfjoch_broker: Improvements to indexing * jfjoch_broker: For PSI EIGER, trimming energies are taken from the detector configuration (now compulsory) instead of hardcoded values * jfjoch_writer: Save ROI definitions and the per-pixel ROI bitmap in the master file; azimuthal ROIs support phi (angular) sectors * jfjoch_viewer: Major redesign with dockable panels and saved layouts, plus on-canvas creation/move/resize of box, circle and azimuthal ROIs * jfjoch_viewer: Run jfjoch_process reprocessing jobs from inside the GUI and overlay per-run results Reviewed-on: #63
97 lines
2.8 KiB
C++
97 lines
2.8 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 "ROIMap.h"
|
|
#include "JFJochException.h"
|
|
|
|
std::vector<uint16_t> ROIMap::GetROIMap(const DiffractionGeometry &geom, size_t xpixel, size_t ypixel) const {
|
|
std::vector<uint16_t> map(xpixel * ypixel, 0);
|
|
std::vector<float> resolution_map(xpixel * ypixel, 0);
|
|
std::vector<float> phi_map;
|
|
if (!rois.azimuthal.empty()) {
|
|
phi_map.resize(xpixel * ypixel, 0);
|
|
for (int y = 0; y < ypixel; y++) {
|
|
for (int x = 0; x < xpixel; x++) {
|
|
resolution_map[y * xpixel + x] = geom.PxlToRes(static_cast<float>(x), static_cast<float>(y));
|
|
phi_map[y * xpixel + x] = geom.Phi_rad(static_cast<float>(x), static_cast<float>(y))
|
|
* 180.0f / static_cast<float>(PI);
|
|
}
|
|
}
|
|
}
|
|
|
|
uint16_t roi_id = 0;
|
|
|
|
for (const auto & box : rois.boxes) {
|
|
box.MarkROI(map, roi_id, xpixel, ypixel, resolution_map, phi_map);
|
|
roi_id++;
|
|
}
|
|
|
|
for (const auto & circle : rois.circles) {
|
|
circle.MarkROI(map, roi_id, xpixel, ypixel, resolution_map, phi_map);
|
|
roi_id++;
|
|
}
|
|
|
|
for (const auto &az : rois.azimuthal) {
|
|
az.MarkROI(map, roi_id, xpixel, ypixel, resolution_map, phi_map);
|
|
roi_id++;
|
|
}
|
|
|
|
return map;
|
|
}
|
|
|
|
std::map<std::string, uint16_t> ROIMap::GetROINameMap() const {
|
|
std::map<std::string, uint16_t> roi_name_map;
|
|
|
|
uint16_t roi_id = 0;
|
|
|
|
for (auto & box : rois.boxes) {
|
|
roi_name_map[box.GetName()] = roi_id;
|
|
roi_id++;
|
|
}
|
|
|
|
for (auto & circle : rois.circles) {
|
|
roi_name_map[circle.GetName()] = roi_id;
|
|
roi_id++;
|
|
}
|
|
|
|
for (auto & az : rois.azimuthal) {
|
|
roi_name_map[az.GetName()] = roi_id;
|
|
roi_id++;
|
|
}
|
|
return roi_name_map;
|
|
}
|
|
|
|
void ROIMap::SetROI(const ROIDefinition &input) {
|
|
if (input.boxes.size() + input.circles.size() + input.azimuthal.size() > roi_limit)
|
|
throw JFJochException(JFJochExceptionCategory::ArrayOutOfBounds, "Limit of box ROIs exceeded");
|
|
|
|
rois = input;
|
|
}
|
|
|
|
const ROIDefinition &ROIMap::GetROIDefinition() const {
|
|
return rois;
|
|
}
|
|
|
|
bool ROIMap::empty() const {
|
|
return rois.boxes.empty() && rois.circles.empty() && rois.azimuthal.empty();
|
|
}
|
|
|
|
size_t ROIMap::size() const {
|
|
return rois.boxes.size() + rois.circles.size() + rois.azimuthal.size();
|
|
}
|
|
|
|
std::vector<ROIConfig> ROIMap::ExportMetadata() const {
|
|
std::vector<ROIConfig> ret;
|
|
for (auto &r : rois.boxes)
|
|
ret.emplace_back(r.ExportMetadata());
|
|
|
|
for (auto &r : rois.circles)
|
|
ret.emplace_back(r.ExportMetadata());
|
|
|
|
for (auto &r : rois.azimuthal)
|
|
ret.emplace_back(r.ExportMetadata());
|
|
|
|
return ret;
|
|
}
|