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 790a8be63..aaa397459 100644
--- a/broker/gen/model/Rugnux_live_status.h
+++ b/broker/gen/model/Rugnux_live_status.h
@@ -155,6 +155,13 @@ public:
bool dMinIsSet() const;
void unsetD_min();
///
{- "state": "Idle",
- "placed_model": true,
- "refined_model": true,
- "anomalous_map": true,
- "anomalous_signal": true,
- "model": {
- "placement": "string",
- "model_name": "string",
- "predicted": true,
- "reason": "string",
- "r_work": 0.1,
- "r_free": 0.1,
- "cc_model": 0.1,
- "fit_sigma": 0.1,
- "map_atom_sigma": 0.1,
- "rigid_body_angle_deg": 0.1,
- "rigid_body_shift_A": 0.1,
- "mr_decision": "string",
- "mr_space_group": "string",
- "copies": 0,
- "tf_z": 0.1,
- "rf_z": 0.1,
- "llg_z": 0.1,
- "mr_d_min": 0.1,
- "anomalous_site": "string",
- "anomalous_site_sigma": 0.1,
- "refinement": {
- "performed": true,
- "cancelled": true,
- "reason": "string",
- "on_gpu": true,
- "seconds": 0.1,
- "r_work": 0.1,
- "r_free": 0.1,
- "rmsd_bonds_A": 0.1,
- "rmsd_angles_deg": 0.1,
- "blob_count": 0,
- "waters_added": 0,
- "waters_removed": 0,
- "blobs": [
- {
- "kind": "WATER",
- "x": 0.1,
- "y": 0.1,
- "z": 0.1,
- "peak_sigma": 0.1,
- "volume_A3": 0.1,
- "nearest_atom": "string",
- "nearest_atom_distance_A": 0.1
}
]
}
}, - "stills": {
- "prepass": "Holding",
- "images_held": 0,
- "images_needed": 0,
- "prepass_s": 0.1,
- "file_beam_x_pxl": 0.1,
- "file_beam_y_pxl": 0.1,
- "file_distance_mm": 0.1,
- "beam_x_pxl": 0.1,
- "beam_y_pxl": 0.1,
- "distance_mm": 0.1,
- "shadow_pixels": 0,
- "bad_pixels": 0,
- "images_analysed": 0,
- "images_indexed": 0,
- "analysis_rate_hz": 0.1
}, - "shells_merge": "string",
- "shells": [
- {
- "d_min": 0.1,
- "d_max": 0.1,
- "n_obs": 0,
- "n_unique": 0,
- "completeness": 0.1,
- "multiplicity": 0.1,
- "i_over_sigma": 0.1,
- "r_meas": 0.1,
- "cc_half": 0.1,
- "cc_ref": 0.1,
- "r_split": 0.1,
- "r_free": 0.1
}
], - "overall": {
- "d_min": 0.1,
- "d_max": 0.1,
- "n_obs": 0,
- "n_unique": 0,
- "completeness": 0.1,
- "multiplicity": 0.1,
- "i_over_sigma": 0.1,
- "r_meas": 0.1,
- "cc_half": 0.1,
- "cc_ref": 0.1,
- "r_split": 0.1,
- "r_free": 0.1
}, - "frame_scales": [
- 0.1
], - "frame_ranges": [
- {
- "first_image": 0,
- "last_image": 0,
- "disposition": "downgraded",
- "reason": "string"
}
], - "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": [
- {
- "title": "string",
- "started_s": 0.1,
- "duration_s": 0.1,
- "notes": [
- "string"
]
}
], - "last_image_s": 0.1,
- "cut": "string",
- "cut_s": 0.1,
- "last_image_to_written_s": 0.1,
- "verdict": "string",
- "verdict_text": "string",
- "summary": [
- {
- "label": "string",
- "value": "string"
}
], - "warnings": [
- "string"
], - "triage": [
- {
- "label": "string",
- "codes": [
- "string"
], - "severity": "ok",
- "text": "string",
- "detail": "string"
}
]
}{- "state": "Idle",
- "placed_model": true,
- "refined_model": true,
- "anomalous_map": true,
- "anomalous_signal": true,
- "model": {
- "placement": "string",
- "model_name": "string",
- "predicted": true,
- "reason": "string",
- "r_work": 0.1,
- "r_free": 0.1,
- "cc_model": 0.1,
- "fit_sigma": 0.1,
- "map_atom_sigma": 0.1,
- "rigid_body_angle_deg": 0.1,
- "rigid_body_shift_A": 0.1,
- "mr_decision": "string",
- "mr_space_group": "string",
- "copies": 0,
- "tf_z": 0.1,
- "rf_z": 0.1,
- "llg_z": 0.1,
- "mr_d_min": 0.1,
- "anomalous_site": "string",
- "anomalous_site_sigma": 0.1,
- "refinement": {
- "performed": true,
- "cancelled": true,
- "reason": "string",
- "on_gpu": true,
- "seconds": 0.1,
- "r_work": 0.1,
- "r_free": 0.1,
- "rmsd_bonds_A": 0.1,
- "rmsd_angles_deg": 0.1,
- "blob_count": 0,
- "waters_added": 0,
- "waters_removed": 0,
- "blobs": [
- {
- "kind": "WATER",
- "x": 0.1,
- "y": 0.1,
- "z": 0.1,
- "peak_sigma": 0.1,
- "volume_A3": 0.1,
- "nearest_atom": "string",
- "nearest_atom_distance_A": 0.1
}
]
}
}, - "stills": {
- "prepass": "Holding",
- "images_held": 0,
- "images_needed": 0,
- "prepass_s": 0.1,
- "file_beam_x_pxl": 0.1,
- "file_beam_y_pxl": 0.1,
- "file_distance_mm": 0.1,
- "beam_x_pxl": 0.1,
- "beam_y_pxl": 0.1,
- "distance_mm": 0.1,
- "shadow_pixels": 0,
- "bad_pixels": 0,
- "images_analysed": 0,
- "images_indexed": 0,
- "analysis_rate_hz": 0.1
}, - "shells_merge": "string",
- "shells": [
- {
- "d_min": 0.1,
- "d_max": 0.1,
- "n_obs": 0,
- "n_unique": 0,
- "completeness": 0.1,
- "multiplicity": 0.1,
- "i_over_sigma": 0.1,
- "r_meas": 0.1,
- "cc_half": 0.1,
- "cc_ref": 0.1,
- "r_split": 0.1,
- "r_free": 0.1
}
], - "overall": {
- "d_min": 0.1,
- "d_max": 0.1,
- "n_obs": 0,
- "n_unique": 0,
- "completeness": 0.1,
- "multiplicity": 0.1,
- "i_over_sigma": 0.1,
- "r_meas": 0.1,
- "cc_half": 0.1,
- "cc_ref": 0.1,
- "r_split": 0.1,
- "r_free": 0.1
}, - "frame_scales": [
- 0.1
], - "frame_ranges": [
- {
- "first_image": 0,
- "last_image": 0,
- "disposition": "downgraded",
- "reason": "string"
}
], - "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": [
- {
- "title": "string",
- "started_s": 0.1,
- "duration_s": 0.1,
- "notes": [
- "string"
]
}
], - "last_image_s": 0.1,
- "cut": "string",
- "cut_s": 0.1,
- "last_image_to_written_s": 0.1,
- "verdict": "string",
- "verdict_text": "string",
- "summary": [
- {
- "label": "string",
- "value": "string"
}
], - "warnings": [
- "string"
], - "triage": [
- {
- "label": "string",
- "codes": [
- "string"
], - "severity": "ok",
- "text": "string",
- "detail": "string"
}
]
}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.