Files
Jungfraujoch/broker/ModulePlacementConvert.cpp
leonarski_f 3f8c72cd1e
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m9s
Build Packages / Generate python client (push) Successful in 31s
Build Packages / Validation Battery (push) Successful in 47m56s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 26m51s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 10m33s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m49s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 30m10s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 32m0s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 32m49s
Build Packages / Create release (push) Successful in 8s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m57s
Build Packages / Build documentation (push) Successful in 47s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 29m33s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 21m36s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 24m26s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 30m56s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 32m3s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 30m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 28m52s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 25m22s
Build Packages / Unit tests (push) Successful in 1h44m43s
v1.0.0-rc.182 (#93)
* Rugnux: Fixed indexing of stills of a centred lattice with a known cell.
* jfjoch_broker (experimental): Live Rugnux processing of serial collections.
* Rugnux: Stills detector modules are placed from the data and written to `<prefix>_module_placement.json`; `--panel-refine` replaces `--refine-modules`.
* Rugnux: More reliable rotation processing - indexing, monoclinic setting, space-group choice and refinement of multi-domain twins.

Reviewed-on: #93
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-04 11:13:33 +01:00

88 lines
3.2 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "ModulePlacementConvert.h"
namespace model = org::openapitools::server::model;
namespace {
DetectorModuleGeometry::Direction Convert(const model::Detector_module_direction &input) {
switch (input.getValue()) {
case model::Detector_module_direction::eDetector_module_direction::XN:
return DetectorModuleGeometry::Direction::Xneg;
case model::Detector_module_direction::eDetector_module_direction::YP:
return DetectorModuleGeometry::Direction::Ypos;
case model::Detector_module_direction::eDetector_module_direction::YN:
return DetectorModuleGeometry::Direction::Yneg;
default:
return DetectorModuleGeometry::Direction::Xpos;
}
}
model::Detector_module_direction Convert(DetectorModuleGeometry::Direction input) {
model::Detector_module_direction d;
switch (input) {
case DetectorModuleGeometry::Direction::Xneg:
d.setValue(model::Detector_module_direction::eDetector_module_direction::XN);
break;
case DetectorModuleGeometry::Direction::Ypos:
d.setValue(model::Detector_module_direction::eDetector_module_direction::YP);
break;
case DetectorModuleGeometry::Direction::Yneg:
d.setValue(model::Detector_module_direction::eDetector_module_direction::YN);
break;
default:
d.setValue(model::Detector_module_direction::eDetector_module_direction::XP);
break;
}
return d;
}
} // namespace
ModulePlacement Convert(const model::Detector_module_placement &input) {
ModulePlacement p;
p.x0 = input.getX0();
p.y0 = input.getY0();
p.fast = Convert(input.getFastAxis());
p.slow = Convert(input.getSlowAxis());
p.x0_plane = input.getX0Plane();
p.y0_plane = input.getY0Plane();
const auto f = input.getFastStep(), s = input.getSlowStep();
p.fast_step = {f.at(0), f.at(1)};
p.slow_step = {s.at(0), s.at(1)};
return p;
}
model::Detector_module_placement ConvertPlacement(const ModulePlacement &input) {
model::Detector_module_placement m;
m.setX0(input.x0);
m.setY0(input.y0);
m.setFastAxis(Convert(input.fast));
m.setSlowAxis(Convert(input.slow));
m.setX0Plane(input.x0_plane);
m.setY0Plane(input.y0_plane);
m.setFastStep({input.fast_step[0], input.fast_step[1]});
m.setSlowStep({input.slow_step[0], input.slow_step[1]});
return m;
}
std::vector<ModulePlacement> ParseModulePlacement(const std::string &json_text) {
const auto list = nlohmann::json::parse(json_text).at("module_placement")
.get<std::vector<model::Detector_module_placement>>();
std::vector<ModulePlacement> out;
for (const auto &e: list) {
e.validate();
out.push_back(Convert(e));
}
return out;
}
std::string ModulePlacementJson(const DetectorModules &modules) {
std::vector<model::Detector_module_placement> list;
for (const auto &m: modules.Get())
list.push_back(ConvertPlacement(PlacementOf(m)));
return nlohmann::json{{"module_placement", list}}.dump(2) + "\n";
}