diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp index bae930389..992b031b4 100644 --- a/broker/OpenAPIConvert.cpp +++ b/broker/OpenAPIConvert.cpp @@ -1322,6 +1322,8 @@ org::openapitools::server::model::Rugnux_live_status Convert(const RugnuxLiveSna ret.setSpaceGroup(input.space_group); if (input.d_min) ret.setDMin(input.d_min.value()); + if (input.resolution_fit) + ret.setResolutionFit(input.resolution_fit.value()); if (input.isa) ret.setIsa(input.isa.value()); if (input.stills) { diff --git a/broker/gen/model/Rugnux_live_status.cpp b/broker/gen/model/Rugnux_live_status.cpp index 0eb575857..cbf60a6ee 100644 --- a/broker/gen/model/Rugnux_live_status.cpp +++ b/broker/gen/model/Rugnux_live_status.cpp @@ -38,6 +38,8 @@ Rugnux_live_status::Rugnux_live_status() m_Space_groupIsSet = false; m_D_min = 0.0; m_D_minIsSet = false; + m_Resolution_fit = 0.0; + m_Resolution_fitIsSet = false; m_Isa = 0.0; m_IsaIsSet = false; m_Probe = ""; @@ -149,7 +151,7 @@ bool Rugnux_live_status::validate(std::stringstream& msg, const std::string& pat } } - + if (stepProgressIsSet()) { const float& value = m_Step_progress; @@ -304,6 +306,9 @@ bool Rugnux_live_status::operator==(const Rugnux_live_status& rhs) const ((!dMinIsSet() && !rhs.dMinIsSet()) || (dMinIsSet() && rhs.dMinIsSet() && getDMin() == rhs.getDMin())) && + ((!resolutionFitIsSet() && !rhs.resolutionFitIsSet()) || (resolutionFitIsSet() && rhs.resolutionFitIsSet() && getResolutionFit() == rhs.getResolutionFit())) && + + ((!isaIsSet() && !rhs.isaIsSet()) || (isaIsSet() && rhs.isaIsSet() && getIsa() == rhs.getIsa())) && (getProbe() == rhs.getProbe()) @@ -397,6 +402,8 @@ void to_json(nlohmann::json& j, const Rugnux_live_status& o) j["space_group"] = o.m_Space_group; if(o.dMinIsSet()) j["d_min"] = o.m_D_min; + if(o.resolutionFitIsSet()) + j["resolution_fit"] = o.m_Resolution_fit; if(o.isaIsSet()) j["isa"] = o.m_Isa; j["probe"] = o.m_Probe; @@ -482,6 +489,11 @@ void from_json(const nlohmann::json& j, Rugnux_live_status& o) j.at("d_min").get_to(o.m_D_min); o.m_D_minIsSet = true; } + if(j.find("resolution_fit") != j.end()) + { + j.at("resolution_fit").get_to(o.m_Resolution_fit); + o.m_Resolution_fitIsSet = true; + } if(j.find("isa") != j.end()) { j.at("isa").get_to(o.m_Isa); @@ -738,6 +750,23 @@ void Rugnux_live_status::unsetD_min() { m_D_minIsSet = false; } +double Rugnux_live_status::getResolutionFit() const +{ + return m_Resolution_fit; +} +void Rugnux_live_status::setResolutionFit(double const value) +{ + m_Resolution_fit = value; + m_Resolution_fitIsSet = true; +} +bool Rugnux_live_status::resolutionFitIsSet() const +{ + return m_Resolution_fitIsSet; +} +void Rugnux_live_status::unsetResolution_fit() +{ + m_Resolution_fitIsSet = false; +} double Rugnux_live_status::getIsa() const { return m_Isa; diff --git a/broker/gen/model/Rugnux_live_status.h b/broker/gen/model/Rugnux_live_status.h index 4bb87eb98..aaa397459 100644 --- a/broker/gen/model/Rugnux_live_status.h +++ b/broker/gen/model/Rugnux_live_status.h @@ -113,7 +113,7 @@ public: bool shellsMergeIsSet() const; void unsetShells_merge(); /// - /// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of `_report.txt`. Rotation: once the run is over; serial: at each provisional merge and at the end. `overall` is the same table's \"Overall\" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. + /// Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of `_report.txt`. Rotation: once the collection is scaled and merged (before the model work), again at the end; serial: at each provisional merge and at the end. `overall` is the same table's \"Overall\" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. /// std::vector getShells() const; void setShells(std::vector const& value); @@ -141,21 +141,28 @@ public: bool frameRangesIsSet() const; void unsetFrame_ranges(); /// - /// Space group of the result (the summary's \"Space group\" row); absent until the run is over + /// Space group of the result (the summary's \"Space group\" row); absent until the collection is scaled and merged /// std::string getSpaceGroup() const; void setSpaceGroup(std::string const& value); bool spaceGroupIsSet() const; void unsetSpace_group(); /// - /// High-resolution limit of the merge, in Angstrom; absent until the run is over, or without a merge + /// High-resolution limit of the merge, in Angstrom; absent until the collection is scaled and merged, or without a merge /// double getDMin() const; void setDMin(double const value); bool dMinIsSet() const; void unsetD_min(); /// - /// ISa of the error model; absent until the run is over, or where it was not determined + /// Where the CC1/2 fall-off is fitted, in Angstrom: the resolution to quote. The written range (`d_min`) deliberately reaches one shell beyond it. Absent without a fit (a serial merge's `d_min` is the fit itself). + /// + double getResolutionFit() const; + void setResolutionFit(double const value); + bool resolutionFitIsSet() const; + void unsetResolution_fit(); + /// + /// ISa of the error model; absent until the collection is scaled and merged, or where it was not determined /// double getIsa() const; void setIsa(double const value); @@ -306,6 +313,8 @@ protected: bool m_Space_groupIsSet; double m_D_min; bool m_D_minIsSet; + double m_Resolution_fit; + bool m_Resolution_fitIsSet; double m_Isa; bool m_IsaIsSet; std::string m_Probe; diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index a7464ef6e..36dfec97a 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -3344,7 +3344,8 @@ components: type: array description: | Merging statistics by resolution shell of the latest merge, coarse to fine, as the shell table of - `_report.txt`. Rotation: once the run is over; serial: at each provisional merge and at the end. + `_report.txt`. Rotation: once the collection is scaled and merged (before the model work), again at + the end; serial: at each provisional merge and at the end. `overall` is the same table's "Overall" row (whole-merge completeness, multiplicity, I/sigma, CC1/2, R_meas or R_split, CCref, and the R-free of the final model - refined where rugnux refined it, as `model.refinement.r_free`, else as placed, as `model.r_free`), present with `shells`. @@ -3371,15 +3372,21 @@ components: $ref: '#/components/schemas/rugnux_live_frame_range' space_group: type: string - description: Space group of the result (the summary's "Space group" row); absent until the run is over + description: Space group of the result (the summary's "Space group" row); absent until the collection is scaled and merged d_min: type: number format: double - description: High-resolution limit of the merge, in Angstrom; absent until the run is over, or without a merge + description: High-resolution limit of the merge, in Angstrom; absent until the collection is scaled and merged, or without a merge + resolution_fit: + type: number + format: double + description: | + Where the CC1/2 fall-off is fitted, in Angstrom: the resolution to quote. The written range (`d_min`) + deliberately reaches one shell beyond it. Absent without a fit (a serial merge's `d_min` is the fit itself). isa: type: number format: double - description: ISa of the error model; absent until the run is over, or where it was not determined + description: ISa of the error model; absent until the collection is scaled and merged, or where it was not determined probe: type: string description: Answer of the early lattice probe on the first 60 degrees; empty until it answers, and the run's own lattice once the run has indexed diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 016f2833b..71a30dce6 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -892,7 +892,7 @@ and validation of every following rugnux live collection, until it is removed wi
Authorizations:
bearerAuth

Responses

Response samples

Content type
application/json
{
  • "state": "Idle",
  • "placed_model": true,
  • "refined_model": true,
  • "anomalous_map": true,
  • "anomalous_signal": true,
  • "model": {
    },
  • "stills": {
    },
  • "shells_merge": "string",
  • "shells": [
    ],
  • "overall": {
    },
  • "frame_scales": [
    ],
  • "frame_ranges": [
    ],
  • "space_group": "string",
  • "d_min": 0.1,
  • "isa": 0.1,
  • "probe": "string",
  • "probe_s": 0.1,
  • "start_to_first_image_s": 0.1,
  • "message": "string",
  • "images_expected": 0,
  • "expected_collection_s": 0.1,
  • "images_received": 0,
  • "elapsed_s": 0.1,
  • "step_progress": 1,
  • "steps": [
    ],
  • "last_image_s": 0.1,
  • "cut": "string",
  • "cut_s": 0.1,
  • "last_image_to_written_s": 0.1,
  • "verdict": "string",
  • "verdict_text": "string",
  • "summary": [
    ],
  • "warnings": [
    ],
  • "triage": [
    ]
}

Clear the live rugnux result of the last collection

Puts /rugnux/status back to Idle with nothing of the last run - its merge, model, maps, steps and notes - +

http://localhost:5232/rugnux/status

Response samples

Content type
application/json
{
  • "state": "Idle",
  • "placed_model": true,
  • "refined_model": true,
  • "anomalous_map": true,
  • "anomalous_signal": true,
  • "model": {
    },
  • "stills": {
    },
  • "shells_merge": "string",
  • "shells": [
    ],
  • "overall": {
    },
  • "frame_scales": [
    ],
  • "frame_ranges": [
    ],
  • "space_group": "string",
  • "d_min": 0.1,
  • "resolution_fit": 0.1,
  • "isa": 0.1,
  • "probe": "string",
  • "probe_s": 0.1,
  • "start_to_first_image_s": 0.1,
  • "message": "string",
  • "images_expected": 0,
  • "expected_collection_s": 0.1,
  • "images_received": 0,
  • "elapsed_s": 0.1,
  • "step_progress": 1,
  • "steps": [
    ],
  • "last_image_s": 0.1,
  • "cut": "string",
  • "cut_s": 0.1,
  • "last_image_to_written_s": 0.1,
  • "verdict": "string",
  • "verdict_text": "string",
  • "summary": [
    ],
  • "warnings": [
    ],
  • "triage": [
    ]
}

Clear the live rugnux result of the last collection

Puts /rugnux/status back to Idle with nothing of the last run - its merge, model, maps, steps and notes - as before any collection. The collection's images, plots and the rugnux live settings are kept. Can be only run when Jungfraujoch is not collecting data.

Responses