diff --git a/broker/OpenAPIConvert.cpp b/broker/OpenAPIConvert.cpp
index 992b031b4..07a92ed97 100644
--- a/broker/OpenAPIConvert.cpp
+++ b/broker/OpenAPIConvert.cpp
@@ -1449,6 +1449,8 @@ org::openapitools::server::model::Rugnux_live_status Convert(const RugnuxLiveSna
blob.setNearestAtom(b.nearest_atom);
if (b.nearest_atom_distance_A)
blob.setNearestAtomDistanceA(*b.nearest_atom_distance_A);
+ if (b.anomalous_sigma)
+ blob.setAnomalousSigma(*b.anomalous_sigma);
blobs.push_back(blob);
}
refinement.setBlobs(blobs);
diff --git a/broker/gen/model/Rugnux_live_blob.cpp b/broker/gen/model/Rugnux_live_blob.cpp
index 187896f0b..984f1ee11 100644
--- a/broker/gen/model/Rugnux_live_blob.cpp
+++ b/broker/gen/model/Rugnux_live_blob.cpp
@@ -30,6 +30,8 @@ Rugnux_live_blob::Rugnux_live_blob()
m_Nearest_atom = "";
m_Nearest_atom_distance_A = 0.0;
m_Nearest_atom_distance_AIsSet = false;
+ m_Anomalous_sigma = 0.0;
+ m_Anomalous_sigmaIsSet = false;
}
@@ -52,7 +54,7 @@ bool Rugnux_live_blob::validate(std::stringstream& msg, const std::string& pathP
bool success = true;
const std::string _pathPrefix = pathPrefix.empty() ? "Rugnux_live_blob" : pathPrefix;
-
+
return success;
}
@@ -83,7 +85,10 @@ bool Rugnux_live_blob::operator==(const Rugnux_live_blob& rhs) const
&&
- ((!nearestAtomDistanceAIsSet() && !rhs.nearestAtomDistanceAIsSet()) || (nearestAtomDistanceAIsSet() && rhs.nearestAtomDistanceAIsSet() && getNearestAtomDistanceA() == rhs.getNearestAtomDistanceA()))
+ ((!nearestAtomDistanceAIsSet() && !rhs.nearestAtomDistanceAIsSet()) || (nearestAtomDistanceAIsSet() && rhs.nearestAtomDistanceAIsSet() && getNearestAtomDistanceA() == rhs.getNearestAtomDistanceA())) &&
+
+
+ ((!anomalousSigmaIsSet() && !rhs.anomalousSigmaIsSet()) || (anomalousSigmaIsSet() && rhs.anomalousSigmaIsSet() && getAnomalousSigma() == rhs.getAnomalousSigma()))
;
}
@@ -105,6 +110,8 @@ void to_json(nlohmann::json& j, const Rugnux_live_blob& o)
j["nearest_atom"] = o.m_Nearest_atom;
if(o.nearestAtomDistanceAIsSet())
j["nearest_atom_distance_A"] = o.m_Nearest_atom_distance_A;
+ if(o.anomalousSigmaIsSet())
+ j["anomalous_sigma"] = o.m_Anomalous_sigma;
}
@@ -122,6 +129,11 @@ void from_json(const nlohmann::json& j, Rugnux_live_blob& o)
j.at("nearest_atom_distance_A").get_to(o.m_Nearest_atom_distance_A);
o.m_Nearest_atom_distance_AIsSet = true;
}
+ if(j.find("anomalous_sigma") != j.end())
+ {
+ j.at("anomalous_sigma").get_to(o.m_Anomalous_sigma);
+ o.m_Anomalous_sigmaIsSet = true;
+ }
}
@@ -198,6 +210,23 @@ void Rugnux_live_blob::unsetNearest_atom_distance_A()
{
m_Nearest_atom_distance_AIsSet = false;
}
+double Rugnux_live_blob::getAnomalousSigma() const
+{
+ return m_Anomalous_sigma;
+}
+void Rugnux_live_blob::setAnomalousSigma(double const value)
+{
+ m_Anomalous_sigma = value;
+ m_Anomalous_sigmaIsSet = true;
+}
+bool Rugnux_live_blob::anomalousSigmaIsSet() const
+{
+ return m_Anomalous_sigmaIsSet;
+}
+void Rugnux_live_blob::unsetAnomalous_sigma()
+{
+ m_Anomalous_sigmaIsSet = false;
+}
} // namespace org::openapitools::server::model
diff --git a/broker/gen/model/Rugnux_live_blob.h b/broker/gen/model/Rugnux_live_blob.h
index a56f3c977..142f860a2 100644
--- a/broker/gen/model/Rugnux_live_blob.h
+++ b/broker/gen/model/Rugnux_live_blob.h
@@ -100,6 +100,13 @@ public:
void setNearestAtomDistanceA(double const value);
bool nearestAtomDistanceAIsSet() const;
void unsetNearest_atom_distance_A();
+ ///
{- "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"
}
]
}{- "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,
- "anomalous_sigma": 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.