Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 11m6s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m27s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m54s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m25s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m5s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m33s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m19s
Build Packages / build:rpm (rocky8) (push) Successful in 12m23s
Build Packages / build:rpm (rocky9) (push) Successful in 13m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m30s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m55s
Build Packages / DIALS test (push) Successful in 13m42s
Build Packages / XDS test (durin plugin) (push) Successful in 9m26s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m41s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m12s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Build documentation (push) Successful in 52s
Build Packages / Create release (push) Skipped
Build Packages / build:viewer-tgz:cpu (push) Successful in 5m29s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m12s
Build Packages / build:windows:cuda (push) Successful in 18m36s
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * rugnux: Add `--model model.pdb` - score the merged data against an atomic model and compute initial maps. It reports R-work/R-free (scaling the model to the observed amplitudes with an overall scale, an anisotropic B and a flat bulk solvent - the standard few-parameter model, so a batch of maps stays directly comparable) and writes 2Fo-Fc / Fo-Fc electron-density maps (CCP4) plus a map-coefficient MTZ. The structure itself is not refined; the model is only re-fractionalised into the data cell. * rugnux: The merged reflection output now carries French-Wilson amplitudes (|F| and its sigma) next to the intensities - MTZ `F`/`SIGF`, mmCIF `_refln.F_meas_au`, and the text HKL - computed with the correct centric/acentric Wilson prior and epsilon multiplicity, so a downstream program (e.g. phenix.refine) can refine against amplitudes. The intensity columns are unchanged. * rugnux: R-free test-set flags are now assigned deterministically and consistently across symmetry - a Bijvoet pair I(+)/I(-) is never split between the work and free sets, and the assignment is a reproducible per-hkl hash that depends only on the reflection index, so every dataset of one crystal form gets the same ~5% free set (what a multi-dataset campaign such as PanDDA needs). On small data the fraction is floored so the test set stays large enough for a stable R-free (~500 reflections, capped at 10%); it stays flat at 5% on ordinary data. When a reference MTZ carries a `FreeR_flag` column its test set is imported instead, letting a whole campaign inherit one shared free set. * rugnux: A reference MTZ (`--reference-mtz`) can now fix the space group and cell for rotation data too (previously rejected), without being used to scale - the rotation merge stays self-consistent. When the crystal has an indexing (merohedral) ambiguity - a lattice symmetry higher than its Laue symmetry, e.g. P3/P4/P6/C2 - the reference also resolves it: each candidate reindexing (identity plus the twin-law cosets of the metric symmetry) is scored by its intensity correlation against the reference and the data are re-merged in the best-correlating one. This is a metric-preserving relabelling of hkl (the cell is unchanged) and a no-op for a holohedral crystal such as lysozyme. * rugnux: `--model` validation now aligns the data to the model before scoring - the observed reflections are reindexed into the model's enantiomorph when the two differ only by hand (indistinguishable from merged intensities). A merohedral indexing ambiguity is resolved against the reference MTZ when one is given (so a whole campaign shares one indexing convention); only with a model and no reference does validation fall back to fitting each candidate reindexing and keeping the lowest R-free. * rugnux: De-novo symmetry - recover a genuine high-symmetry group whose data are imperfectly scaled. Such a merge's within-orbit chi² lands just past the self-consistency bound (each real symmetry step adds a little systematic scatter), right where a merohedral twin also lands, so the chi² ratio alone cannot separate them. The candidate is now rescued when the extra intensity-proportional systematic error it invokes stays small relative to the confirmed subgroup - a genuine symmetry step gains multiplicity without inflating the merge error model's b, whereas a twin forces non-equivalent reflections together and b balloons. Fixes cubic insulin (I23 instead of I222) with no change to any other crystal in the test battery, including the twins that must stay in their lower symmetry. * Docs: Document the French-Wilson amplitude estimation, R-free flagging, reference-based space-group/ambiguity resolution, and model-based validation/maps in CPU_DATA_ANALYSIS.md. * Frontend: The status-bar pill now shows a progress bar during detector calibration (previously only during measurement), and the calibration state and its button are labelled "Calibration"/"CALIBRATE" (the internal `Pedestal` state name is unchanged for back-compatibility).Reviewed-on: #69 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
194 lines
7.6 KiB
C++
194 lines
7.6 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "LoadFCalcFromMtz.h"
|
|
|
|
#include <cmath>
|
|
#include <cstdint>
|
|
#include <limits>
|
|
#include <sstream>
|
|
#include <stdexcept>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <gemmi/mtz.hpp>
|
|
#include <gemmi/symmetry.hpp>
|
|
|
|
namespace {
|
|
|
|
// Reference intensities can come from a calculated structure factor F-model (squared to an
|
|
// intensity), or from a merged/observed mean-intensity column (used directly - this is what lets
|
|
// reference-based scaling be self-seeded from the data's own previous merge). column_with_one_of_labels would
|
|
// hide which label matched, so the priority list is walked explicitly to record the choice.
|
|
const gemmi::Mtz::Column* SelectDefaultColumn(const gemmi::Mtz& mtz, bool& square) {
|
|
if (const auto* col = mtz.column_with_label("F-model", nullptr, 'F')) {
|
|
square = true;
|
|
return col;
|
|
}
|
|
for (const char* label : {"IMEAN", "I", "IOBS", "Iobs", "I-obs"}) {
|
|
if (const auto* col = mtz.column_with_label(label, nullptr, 'J')) {
|
|
square = false;
|
|
return col;
|
|
}
|
|
}
|
|
for (const auto& c : mtz.columns)
|
|
if (c.type == 'J') {
|
|
square = false;
|
|
return &c;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ReferenceMtzData LoadReferenceMtz(const std::string& path,
|
|
const std::optional<std::string>& column) {
|
|
gemmi::Mtz mtz;
|
|
mtz.read_file_gz(path, true);
|
|
|
|
ReferenceMtzData out;
|
|
|
|
// Columns the caller may pick as reference intensities/structure factors.
|
|
for (const auto& c : mtz.columns)
|
|
if (c.type == 'J' || c.type == 'F')
|
|
out.candidate_columns.push_back({c.label, c.type});
|
|
|
|
const gemmi::Mtz::Column* col = nullptr;
|
|
if (column) {
|
|
col = mtz.column_with_label(*column, nullptr);
|
|
if (col == nullptr)
|
|
throw std::runtime_error("Reference MTZ has no column '" + *column + "'");
|
|
out.squared = (col->type == 'F');
|
|
out.default_column = false;
|
|
} else {
|
|
col = SelectDefaultColumn(mtz, out.squared);
|
|
if (col == nullptr)
|
|
throw std::runtime_error("MTZ has no F-model or intensity (J) column to use as reference");
|
|
out.default_column = true;
|
|
}
|
|
out.used_column = col->label;
|
|
out.used_column_type = col->type;
|
|
|
|
// Optional cross-validation flags: a campaign shares ONE test set, so if the reference carries a
|
|
// FreeR flag we import it and every dataset can inherit the same free reflections.
|
|
const gemmi::Mtz::Column* free_col = nullptr;
|
|
for (const char* label : {"FreeR_flag", "FREE", "FREER", "RFREE", "R-free-flags", "FreeRflag"})
|
|
if ((free_col = mtz.column_with_label(label, nullptr, 'I')) != nullptr)
|
|
break;
|
|
|
|
// Cell and space group the reference was recorded in, for display and the consistency check.
|
|
const gemmi::UnitCell& gc = mtz.get_cell();
|
|
const bool cell_valid = gc.a > 0 && gc.b > 0 && gc.c > 0;
|
|
if (cell_valid)
|
|
out.cell = UnitCell{static_cast<float>(gc.a), static_cast<float>(gc.b), static_cast<float>(gc.c),
|
|
static_cast<float>(gc.alpha), static_cast<float>(gc.beta),
|
|
static_cast<float>(gc.gamma)};
|
|
if (mtz.spacegroup != nullptr) {
|
|
out.space_group_number = mtz.spacegroup->number;
|
|
out.space_group_name = mtz.spacegroup->short_name();
|
|
out.point_group = mtz.spacegroup->point_group_hm();
|
|
}
|
|
|
|
out.reflections.reserve(static_cast<std::size_t>(mtz.nreflections));
|
|
std::vector<int> raw_free; // raw FreeR value, aligned with out.reflections
|
|
if (free_col != nullptr)
|
|
raw_free.reserve(static_cast<std::size_t>(mtz.nreflections));
|
|
|
|
const std::size_t stride = mtz.columns.size();
|
|
double d_min = std::numeric_limits<double>::max();
|
|
double d_max = 0.0;
|
|
|
|
for (int i = 0; i < mtz.nreflections; ++i) {
|
|
const float v = (*col)[static_cast<std::size_t>(i)];
|
|
if (std::isnan(v))
|
|
continue;
|
|
|
|
const std::size_t row = static_cast<std::size_t>(i) * stride;
|
|
MergedReflection r;
|
|
r.h = static_cast<int32_t>(mtz.data[row + 0]);
|
|
r.k = static_cast<int32_t>(mtz.data[row + 1]);
|
|
r.l = static_cast<int32_t>(mtz.data[row + 2]);
|
|
r.I = out.squared ? v * v : v;
|
|
r.sigma = NAN;
|
|
|
|
if (cell_valid) {
|
|
r.d = static_cast<float>(gc.calculate_d({{r.h, r.k, r.l}}));
|
|
if (std::isfinite(r.d) && r.d > 0.0f) {
|
|
d_min = std::min<double>(d_min, r.d);
|
|
d_max = std::max<double>(d_max, r.d);
|
|
}
|
|
}
|
|
|
|
out.reflections.emplace_back(r);
|
|
if (free_col != nullptr) {
|
|
const float f = (*free_col)[static_cast<std::size_t>(i)];
|
|
raw_free.push_back(std::isnan(f) ? -1 : static_cast<int>(std::lround(f)));
|
|
}
|
|
}
|
|
|
|
if (d_max > 0.0) {
|
|
out.d_min = d_min;
|
|
out.d_max = d_max;
|
|
}
|
|
|
|
// Set the free flag from the raw column. The CCP4/refmac convention is that the test set is
|
|
// flag 0 (this also handles the historical 0-19 thin-shell format, where 0 is ~5%). If flag 0
|
|
// would instead be the majority (a phenix-style file where 1 marks free), take the complement.
|
|
if (free_col != nullptr && !raw_free.empty()) {
|
|
std::size_t zeros = 0;
|
|
for (int f : raw_free)
|
|
if (f == 0)
|
|
++zeros;
|
|
const bool free_is_zero = zeros * 2 <= raw_free.size();
|
|
for (std::size_t j = 0; j < out.reflections.size(); ++j) {
|
|
const bool is_free = (raw_free[j] == 0) == free_is_zero;
|
|
out.reflections[j].rfree_flag = is_free;
|
|
if (is_free)
|
|
++out.n_free;
|
|
}
|
|
out.has_free_flags = true;
|
|
out.free_column = free_col->label;
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
std::string ReferenceConsistencyWarning(const ReferenceMtzData& reference,
|
|
const std::optional<UnitCell>& data_cell,
|
|
std::optional<int> data_space_group_number) {
|
|
std::vector<std::string> issues;
|
|
|
|
if (reference.cell && data_cell) {
|
|
const auto& r = *reference.cell;
|
|
const auto& d = *data_cell;
|
|
auto rel = [](float x, float y) { return y != 0.0f ? std::abs(x - y) / std::abs(y) : 0.0f; };
|
|
const bool len_off = rel(r.a, d.a) > 0.02f || rel(r.b, d.b) > 0.02f || rel(r.c, d.c) > 0.02f;
|
|
const bool ang_off = std::abs(r.alpha - d.alpha) > 1.5f || std::abs(r.beta - d.beta) > 1.5f
|
|
|| std::abs(r.gamma - d.gamma) > 1.5f;
|
|
if (len_off || ang_off) {
|
|
std::ostringstream ss;
|
|
ss.setf(std::ios::fixed);
|
|
ss.precision(2);
|
|
ss << "unit cell differs (reference " << r.a << " " << r.b << " " << r.c << " "
|
|
<< r.alpha << " " << r.beta << " " << r.gamma << ", data " << d.a << " " << d.b
|
|
<< " " << d.c << " " << d.alpha << " " << d.beta << " " << d.gamma << ")";
|
|
issues.push_back(ss.str());
|
|
}
|
|
}
|
|
|
|
if (!reference.point_group.empty() && data_space_group_number) {
|
|
const auto* sg = gemmi::find_spacegroup_by_number(*data_space_group_number);
|
|
if (sg != nullptr && reference.point_group != sg->point_group_hm())
|
|
issues.push_back("point group differs (reference " + reference.point_group + ", data "
|
|
+ std::string(sg->point_group_hm()) + ")");
|
|
}
|
|
|
|
if (issues.empty())
|
|
return {};
|
|
|
|
std::string out = "reference may not match the data: ";
|
|
for (std::size_t i = 0; i < issues.size(); ++i)
|
|
out += (i ? "; " : "") + issues[i];
|
|
return out;
|
|
}
|