Wire the recently-added stills knobs into jfjoch_viewer - they were reachable only from the rugnux CLI, and the viewer had silently diverged from the CLI once --refine-geometry became default-on for stills-with-cell. - Stills geometry-refinement two-pass (--refine-geometry): a checkbox + frame count in the reprocessing-job dialog, offered (and defaulted on, matching the CLI) only for a stills-with-cell run; wired into ProcessConfig and the "Copy command" generator (joined =N, or =off to reproduce opting out of the CLI default-on). - Stills partiality (--still-partiality) checkbox in Bragg integration and the partiality-uncertainty merge term (--partiality-uncertainty) in Scaling, both mirrored in the command-line generator. Rename the "best per-image refinement" mode from "multi" to "flex" everywhere: GeomRefinementAlgorithmEnum::Flex, CLI -r flex (with "multi" kept as a hidden back-compat alias), OpenAPI enum "Flex" + regenerated C++/TS clients, viewer combo, frontend dropdown, and the stored HDF5 string. "multi" collides with CrystFEL's multi-lattice sense; "flex" = let the pipeline decide. The API now carries a dedicated Flex value instead of masquerading as BeamCenter. Also fix a pre-existing bug in Convert(IndexingSettings): OrientationOnly was missing from the outbound switch and serialized as an invalid API value. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
129 lines
4.6 KiB
C++
129 lines
4.6 KiB
C++
/**
|
|
* Jungfraujoch
|
|
* API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates. # License Clarification While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing. This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL. This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms.
|
|
*
|
|
* The version of the OpenAPI document: 1.0.0-rc.159
|
|
* Contact: filip.leonarski@psi.ch
|
|
*
|
|
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
|
|
* https://openapi-generator.tech
|
|
* Do not edit the class manually.
|
|
*/
|
|
|
|
|
|
#include "Geom_refinement_algorithm.h"
|
|
#include "Helpers.h"
|
|
#include <stdexcept>
|
|
#include <sstream>
|
|
|
|
namespace org::openapitools::server::model
|
|
{
|
|
|
|
Geom_refinement_algorithm::Geom_refinement_algorithm()
|
|
{
|
|
|
|
}
|
|
|
|
void Geom_refinement_algorithm::validate() const
|
|
{
|
|
std::stringstream msg;
|
|
if (!validate(msg))
|
|
{
|
|
throw org::openapitools::server::helpers::ValidationException(msg.str());
|
|
}
|
|
}
|
|
|
|
bool Geom_refinement_algorithm::validate(std::stringstream& msg) const
|
|
{
|
|
return validate(msg, "");
|
|
}
|
|
|
|
bool Geom_refinement_algorithm::validate(std::stringstream& msg, const std::string& pathPrefix) const
|
|
{
|
|
bool success = true;
|
|
const std::string _pathPrefix = pathPrefix.empty() ? "Geom_refinement_algorithm" : pathPrefix;
|
|
|
|
|
|
if (m_value == Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED)
|
|
{
|
|
success = false;
|
|
msg << _pathPrefix << ": has no value;";
|
|
}
|
|
|
|
return success;
|
|
}
|
|
|
|
bool Geom_refinement_algorithm::operator==(const Geom_refinement_algorithm& rhs) const
|
|
{
|
|
return
|
|
getValue() == rhs.getValue()
|
|
|
|
;
|
|
}
|
|
|
|
bool Geom_refinement_algorithm::operator!=(const Geom_refinement_algorithm& rhs) const
|
|
{
|
|
return !(*this == rhs);
|
|
}
|
|
|
|
void to_json(nlohmann::json& j, const Geom_refinement_algorithm& o)
|
|
{
|
|
j = nlohmann::json::object();
|
|
|
|
switch (o.getValue())
|
|
{
|
|
case Geom_refinement_algorithm::eGeom_refinement_algorithm::INVALID_VALUE_OPENAPI_GENERATED:
|
|
j = "INVALID_VALUE_OPENAPI_GENERATED";
|
|
break;
|
|
case Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER:
|
|
j = "BeamCenter";
|
|
break;
|
|
case Geom_refinement_algorithm::eGeom_refinement_algorithm::ORIENTATIONONLY:
|
|
j = "OrientationOnly";
|
|
break;
|
|
case Geom_refinement_algorithm::eGeom_refinement_algorithm::FLEX:
|
|
j = "Flex";
|
|
break;
|
|
case Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE:
|
|
j = "None";
|
|
break;
|
|
}
|
|
}
|
|
|
|
void from_json(const nlohmann::json& j, Geom_refinement_algorithm& o)
|
|
{
|
|
|
|
auto s = j.get<std::string>();
|
|
if (s == "BeamCenter") {
|
|
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::BEAMCENTER);
|
|
}
|
|
else if (s == "OrientationOnly") {
|
|
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::ORIENTATIONONLY);
|
|
}
|
|
else if (s == "Flex") {
|
|
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::FLEX);
|
|
}
|
|
else if (s == "None") {
|
|
o.setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm::NONE);
|
|
} else {
|
|
std::stringstream ss;
|
|
ss << "Unexpected value " << s << " in json"
|
|
<< " cannot be converted to enum of type"
|
|
<< " Geom_refinement_algorithm::eGeom_refinement_algorithm";
|
|
throw std::invalid_argument(ss.str());
|
|
}
|
|
|
|
}
|
|
|
|
Geom_refinement_algorithm::eGeom_refinement_algorithm Geom_refinement_algorithm::getValue() const
|
|
{
|
|
return m_value;
|
|
}
|
|
void Geom_refinement_algorithm::setValue(Geom_refinement_algorithm::eGeom_refinement_algorithm value)
|
|
{
|
|
m_value = value;
|
|
}
|
|
|
|
} // namespace org::openapitools::server::model
|
|
|