Build Packages / Create release (push) Successful in 9s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m8s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m12s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 20m56s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 22m4s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 26m57s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 28m24s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 27m58s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 29m29s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 18m23s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m55s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / Build documentation (push) Successful in 1m32s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 27m20s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m27s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 32m41s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 34m46s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 37m25s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 35m56s
Build Packages / Unit tests (push) Successful in 2h8m44s
Build Packages / Validation Battery (push) Successful in 33m35s
* jfjoch_broker: Optional live Rugnux analysis of DECTRIS rotation collections inside the broker, with merged data, maps and the placed model written beside the master file, the rotation lattice in the scan result, and a "Rugnux live" tab and dashboard row in the web frontend. * Rugnux: Faster processing, with molecular replacement and model validation spread over several GPUs and run on the Apple GPU on macOS. * Rugnux: The polarization stated in miniCBF and d*TREK headers is used, twinned crystals' space groups are decided more reliably, and a run that finds no lattice still reports every image. Reviewed-on: #86 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
292 lines
13 KiB
C++
292 lines
13 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochBrokerParser.h"
|
|
#include "../common/NetworkAddressConvert.h"
|
|
#include "../image_pusher/ZMQStream2Pusher.h"
|
|
#include "../image_pusher/CBORFilePusher.h"
|
|
#include "../image_pusher/HDF5FilePusher.h"
|
|
#include "OpenAPIConvert.h"
|
|
#include "Detector_type.h"
|
|
#include "../image_pusher/NonePusher.h"
|
|
#include "../image_pusher/TCPStreamPusher.h"
|
|
|
|
DetectorGeometryModular ParseStandardDetectorGeometry(const org::openapitools::server::model::Detector &j) {
|
|
auto s = j.getStandardGeometry();
|
|
return DetectorGeometryModular(s.getNmodules(), s.getModulesInRow(), s.getGapX(), s.getGapY(), j.isMirrorY());
|
|
}
|
|
|
|
DetectorModuleGeometry::Direction Convert(const org::openapitools::server::model::Detector_module_direction& d) {
|
|
switch (d.getValue()) {
|
|
case org::openapitools::server::model::Detector_module_direction::eDetector_module_direction::XP:
|
|
return DetectorModuleGeometry::Direction::Xpos;
|
|
case org::openapitools::server::model::Detector_module_direction::eDetector_module_direction::XN:
|
|
return DetectorModuleGeometry::Direction::Xneg;
|
|
case org::openapitools::server::model::Detector_module_direction::eDetector_module_direction::YP:
|
|
return DetectorModuleGeometry::Direction::Ypos;
|
|
case org::openapitools::server::model::Detector_module_direction::eDetector_module_direction::YN:
|
|
return DetectorModuleGeometry::Direction::Yneg;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "invalid detector direction");
|
|
}
|
|
}
|
|
|
|
DetectorType Convert(const org::openapitools::server::model::Detector_type &d) {
|
|
switch (d.getValue()) {
|
|
case org::openapitools::server::model::Detector_type::eDetector_type::EIGER:
|
|
return DetectorType::EIGER;
|
|
case org::openapitools::server::model::Detector_type::eDetector_type::JUNGFRAU:
|
|
return DetectorType::JUNGFRAU;
|
|
case org::openapitools::server::model::Detector_type::eDetector_type::DECTRIS:
|
|
return DetectorType::DECTRIS;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "invalid detector type");
|
|
}
|
|
}
|
|
|
|
DetectorGeometryModular ParseCustomDetectorGeometry(const org::openapitools::server::model::Detector &j) {
|
|
std::vector<DetectorModuleGeometry> modules;
|
|
for (const auto &iter: j.getCustomGeometry()) {
|
|
auto fast = Convert(iter.getFastAxis());
|
|
auto slow = Convert(iter.getSlowAxis());
|
|
modules.emplace_back(iter.getX0(), iter.getY0(), fast, slow);
|
|
}
|
|
return DetectorGeometryModular(modules, j.isMirrorY());
|
|
}
|
|
|
|
|
|
DetectorGeometryModular ParseDetectorGeometry(const org::openapitools::server::model::Detector &d) {
|
|
if (d.standardGeometryIsSet() && d.customGeometryIsSet())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Need to set EITHER standard or custom geometry");
|
|
|
|
if (d.standardGeometryIsSet())
|
|
return ParseStandardDetectorGeometry(d);
|
|
else if (d.customGeometryIsSet())
|
|
return ParseCustomDetectorGeometry(d);
|
|
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Need to set EITHER standard or custom geometry");
|
|
}
|
|
|
|
DetectorSetup ParseDetectorSetup(const org::openapitools::server::model::Detector &d) {
|
|
DetectorType detector_type = Convert(d.getType());
|
|
|
|
if (detector_type == DetectorType::DECTRIS) {
|
|
std::string hostname;
|
|
if (d.getHostname().size() > 1)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"DECTRIS detector requires single hostname (or none)");
|
|
else if (d.getHostname().size() == 1)
|
|
hostname = d.getHostname()[0];
|
|
|
|
DetectorSetup setup = DetDECTRIS(1,1, d.getDescription(), hostname);
|
|
|
|
if (d.roiModeIsSet())
|
|
setup.DECTRISROI(d.getRoiMode());
|
|
|
|
return setup;
|
|
}
|
|
|
|
DetectorGeometryModular geom = ParseDetectorGeometry(d);
|
|
|
|
DetectorSetup setup(geom, detector_type, d.getDescription(), d.getHostname());
|
|
|
|
auto calib = d.getCalibrationFile();
|
|
auto trim_energies = d.getTrimEnergiesEV();
|
|
if (!calib.empty()) {
|
|
switch (detector_type) {
|
|
case DetectorType::EIGER:
|
|
setup.SetTrimFiles(calib);
|
|
if (trim_energies.empty())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Trimming energies not provided");
|
|
setup.TrimEnergies_eV(trim_energies);
|
|
break;
|
|
case DetectorType::JUNGFRAU:
|
|
setup.LoadGain(calib);
|
|
break;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Detector type not supported");
|
|
}
|
|
}
|
|
|
|
switch (detector_type) {
|
|
case DetectorType::EIGER:
|
|
case DetectorType::JUNGFRAU:
|
|
setup.PixelSize_um(75.0f);
|
|
break;
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Detector type not supported");
|
|
}
|
|
if (d.highVoltageVIsSet())
|
|
setup.HighVoltage(d.getHighVoltageV());
|
|
|
|
setup.UDPInterfaceCount(d.getUdpInterfaceCount())
|
|
.SerialNumber(d.getSerialNumber())
|
|
.ModuleSync(d.isModuleSync())
|
|
.MirrorY(d.isMirrorY());
|
|
|
|
// Only override the sensor from the request when it explicitly sets these. The API model defaults
|
|
// them (320 um / Si) with IsSet=false, so an unconditional set would clobber the detector-reported
|
|
// value (DECTRIS SIMPLON read) or a detector-specific default with 320 um (highVoltageV above is
|
|
// guarded the same way).
|
|
if (d.sensorThicknessUmIsSet())
|
|
setup.SensorThickness_um(d.getSensorThicknessUm());
|
|
if (d.sensorMaterialIsSet())
|
|
setup.SensorMaterial(d.getSensorMaterial());
|
|
|
|
if (d.readoutTimeNsIsSet())
|
|
setup.ReadOutTime(std::chrono::nanoseconds(d.getReadoutTimeNs()));
|
|
|
|
if (d.baseDataIpv4AddressIsSet())
|
|
setup.BaseIPv4Addr(d.getBaseDataIpv4Address());
|
|
if (d.txDelayIsSet())
|
|
setup.TxDelay(d.getTxDelay());
|
|
|
|
if (d.minCountTimeNsIsSet())
|
|
setup.MinCountTime(std::chrono::nanoseconds(d.getMinCountTimeNs()));
|
|
|
|
if (d.minFrameTimeNsIsSet())
|
|
setup.MinFrameTime(std::chrono::nanoseconds(d.getMinFrameTimeNs()));
|
|
|
|
if (d.defaultSettingsIsSet())
|
|
setup.DefaultSettings(Convert(d.getDefaultSettings()));
|
|
|
|
if (d.tempThresoldDegCIsSet())
|
|
setup.TempThreshold_degC(d.getTempThresoldDegC());
|
|
|
|
return setup;
|
|
}
|
|
|
|
void ParseFacilityConfiguration(const org::openapitools::server::model::Jfjoch_settings &j, DiffractionExperiment &experiment) {
|
|
if (j.instrumentIsSet())
|
|
experiment.ImportInstrumentMetadata(Convert(j.getInstrument()));
|
|
|
|
if (j.fileWriterIsSet())
|
|
experiment.ImportFileWriterSettings(Convert(j.getFileWriter()));
|
|
|
|
if (j.detectorSettingsIsSet())
|
|
experiment.ImportDetectorSettings(Convert(j.getDetectorSettings()));
|
|
|
|
if (j.azimIntIsSet())
|
|
experiment.ImportAzimuthalIntegrationSettings(Convert(j.getAzimInt()));
|
|
|
|
if (j.imageFormatIsSet())
|
|
experiment.ImportImageFormatSettings(Convert(j.getImageFormat()));
|
|
|
|
if (j.indexingIsSet())
|
|
experiment.ImportIndexingSettings(Convert(j.getIndexing()));
|
|
|
|
if (j.braggIntegrationIsSet())
|
|
experiment.ImportBraggIntegrationSettings(Convert(j.getBraggIntegration()));
|
|
else
|
|
// A config with no bragg_integration block still has to bootstrap a concrete max_hkl, or the
|
|
// predictor falls back to deriving the hkl cube from the refined cell and a live acquisition's
|
|
// per-image cost is decided by whichever crystal is mounted. None of the shipped configs sets
|
|
// the block, so this is the normal path online.
|
|
experiment.ImportBraggIntegrationSettings(
|
|
BraggIntegrationSettings().MaxHKL(BRAGG_ONLINE_DEFAULT_MAX_HKL));
|
|
|
|
if (j.darkMaskIsSet())
|
|
experiment.ImportDarkMaskSettings(Convert(j.getDarkMask()));
|
|
}
|
|
|
|
std::unique_ptr<ImagePusher> ParseZMQImagePusher(const org::openapitools::server::model::Jfjoch_settings &j) {
|
|
if (!j.zeromqIsSet())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "ZeroMQ settings must be provided");
|
|
|
|
std::optional<int32_t> send_buffer_size;
|
|
if (j.getZeromq().sendBufferSizeIsSet())
|
|
send_buffer_size = j.getZeromq().getSendBufferSize();
|
|
|
|
std::optional<int32_t> send_watermark;
|
|
if (j.getZeromq().sendWatermarkIsSet())
|
|
send_watermark = j.getZeromq().getSendWatermark();
|
|
|
|
auto tmp = std::make_unique<ZMQStream2Pusher>(j.getZeromq().getImageSocket(),
|
|
send_watermark,
|
|
send_buffer_size);
|
|
|
|
if (j.getZeromq().writerNotificationSocketIsSet())
|
|
tmp->WriterNotificationSocket(j.getZeromq().getWriterNotificationSocket());
|
|
return std::move(tmp);
|
|
}
|
|
|
|
std::unique_ptr<ImagePusher> ParseTCPImagePusher(const org::openapitools::server::model::Jfjoch_settings &j) {
|
|
if (!j.tcpIsSet())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "TCP/IP Socket settings must be provided");
|
|
|
|
std::optional<int32_t> send_buffer_size;
|
|
if (j.getTcp().sendBufferSizeIsSet())
|
|
send_buffer_size = j.getTcp().getSendBufferSize();
|
|
|
|
auto tmp = std::make_unique<TCPStreamPusher>(j.getTcp().getImageSocket(), j.getTcp().getNwriters(), send_buffer_size);
|
|
|
|
// Optional liveness/backpressure tuning; unset -> keep the pusher's built-in defaults.
|
|
if (j.getTcp().peerLivenessTimeoutMsIsSet() && j.getTcp().getPeerLivenessTimeoutMs() > 0)
|
|
tmp->SetPeerLivenessTimeout(std::chrono::milliseconds(j.getTcp().getPeerLivenessTimeoutMs()));
|
|
if (j.getTcp().maxBackpressureTimeoutMsIsSet() && j.getTcp().getMaxBackpressureTimeoutMs() > 0)
|
|
tmp->SetMaxBackpressureTimeout(std::chrono::milliseconds(j.getTcp().getMaxBackpressureTimeoutMs()));
|
|
|
|
return std::move(tmp);
|
|
}
|
|
|
|
std::unique_ptr<ImagePusher> ParseImagePusher(const org::openapitools::server::model::Jfjoch_settings &j) {
|
|
switch (j.getImagePusher().getValue()) {
|
|
case org::openapitools::server::model::Image_pusher_type::eImage_pusher_type::ZEROMQ:
|
|
return ParseZMQImagePusher(j);
|
|
case org::openapitools::server::model::Image_pusher_type::eImage_pusher_type::TCP:
|
|
return ParseTCPImagePusher(j);
|
|
case org::openapitools::server::model::Image_pusher_type::eImage_pusher_type::HDF5:
|
|
return std::make_unique<HDF5FilePusher>();
|
|
case org::openapitools::server::model::Image_pusher_type::eImage_pusher_type::NONE:
|
|
return std::make_unique<NonePusher>();
|
|
case org::openapitools::server::model::Image_pusher_type::eImage_pusher_type::CBOR:
|
|
return std::make_unique<CBORFilePusher>();
|
|
default:
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Invalid value");
|
|
}
|
|
}
|
|
|
|
void ParseAcquisitionDeviceGroup(const org::openapitools::server::model::Jfjoch_settings &input,
|
|
AcquisitionDeviceGroup &aq_devices) {
|
|
if (!input.pcieIsSet())
|
|
aq_devices.AddHLSDevice(256);
|
|
else for (auto &p: input.getPcie()) {
|
|
std::optional<uint32_t> ipv4_addr = {};
|
|
if (p.ipv4IsSet())
|
|
ipv4_addr = IPv4AddressFromStr(p.getIpv4());
|
|
aq_devices.AddPCIeDevice(p.getBlk(), ipv4_addr);
|
|
}
|
|
}
|
|
|
|
void ParseReceiverSettings(const org::openapitools::server::model::Jfjoch_settings &input, JFJochReceiverService &service) {
|
|
// Using default in case
|
|
service.NumThreads(input.getReceiverThreads());
|
|
|
|
if (input.zeromqPreviewIsSet()) {
|
|
service.PreviewSocket(input.getZeromqPreview().getSocketAddress());
|
|
service.PreviewSocketSettings(Convert(input.getZeromqPreview()));
|
|
}
|
|
|
|
if (input.zeromqMetadataIsSet()) {
|
|
service.MetadataSocket(input.getZeromqMetadata().getSocketAddress());
|
|
service.MetadataSocketSettings(Convert(input.getZeromqMetadata()));
|
|
}
|
|
}
|
|
|
|
void ParseRugnuxSettings(const org::openapitools::server::model::Jfjoch_settings &input, JFJochServices &services) {
|
|
if (input.rugnuxIsSet())
|
|
services.SetRugnuxLive(RugnuxLiveSettings{
|
|
.enable = input.getRugnux().isEnable(),
|
|
.reserved_cpus = input.getRugnux().getReservedCpus(),
|
|
.deadline_s = input.getRugnux().getDeadlineS()
|
|
});
|
|
}
|
|
|
|
SpotFindingSettings ParseSpotFindingSettings(const org::openapitools::server::model::Jfjoch_settings &input) {
|
|
if (input.spotFindingIsSet())
|
|
return Convert(input.getSpotFinding());
|
|
return SpotFindingSettings();
|
|
} |