The rc178 branch continued after #88 was squash-merged; this is its content fromb9ada7914(the tree #88 squashed) to094eee31a, as one change on main. The individual commits stay on the rc178 branch: - still battery: --cold evicts each set's input from the page cache; Alvra pixel masks; manifest fixes - AGIPD: converter to one rigid panel per module, int16 photons, mask folded in; still battery reads the converted sets - DetectorModules: panel look-up by id, plane -> panel, plane bounds and a per-pixel walk; mask size checked - tests: [PanelLayout] equivalence harness, stacked vs assembled panel layout - Dense per-pixel maps through the panel table (panel layout stage 1) - Panel id on spots and the panel table in the start message - Viewer and preview show a panel detector as it lies on the detector plane - Panel layout stage 3: per-panel spot finding (CPU+GPU, CCL) and raster algorithms on the plane raster - Panel layout stage 2: prediction and Bragg integration through the panel table - XTC reader: frames handed up as stored, streams indexed in parallel - XFEL reader: integer frames stay integer, one gain, placement by panel - EXTERNAL_TEST_DATA_STILLS.md: images used vs the entry for every set; drop "Not in the battery" - still battery: EuXFEL sets read the depositors' Cheetah CXI files directly; AGIPD converter removed - float32_to_int16.py: a non-finite pixel becomes -32768, the int16 error marker, not a zero count - CrystFEL geometry: read the pixel masks and bad regions instead of ignoring them - Panel layout stage 5: the XFEL reader hands up the stored frame and its panel table - Panel table persisted in NXmx; modulation grid and pre-scan memo key on the plane - still battery: Alvra sets take their pixel mask from the CrystFEL geometry, not --mask-good - still battery: take the deposited model as mmCIF where the RCSB has no PDB-format file - still battery: dimple gets PDB-format coordinates converted from an mmCIF-only deposition - stills fixed cost: geometry refinement and pre-scan do the same work in less wall time - stills geometry sample and trial spot finding run as many workers as the image pass - Stills integration: background ring reach measured on empty apertures, radial curvature from the whole frame - StillsPartialityRefine: the partiality width is the run's, measured on the crystals, not the prediction window's - MergeOnTheFly: capture term and multiplicative outlier band for the stills merge (both opt-in) - Stills given a cell: the written cell is the mean over the frames that are merged - Stills: the radial curvature correction decided per run on the same empty apertures - StillsPartialityRefine: measure the run width only on shells with signal - Stills pre-scan: report the paired z of the radial-correction comparison - module placement: the five concurrent fits each keep every thread - still battery: score R-free against the deposited data through the same dimple protocol - still battery: the R-free target is the lower of the deposition's dimple and published values - Stills: background clip follows the radial curve; signal disk from the lattice spacing - Stills keep an overloaded observation as a lower bound instead of dropping it - Stills: drop the lattice-spacing signal disk; the correction decision back on the plain clip - battery: R-free against the deposition without refinement only, one protocol for rotation and stills - still battery: EuXFEL sets run on a 2,000-image subset for now - stills geometry refinement: fit the detector distance and the cell together - stills geometry refinement: a distance given with --detector-distance is held in the joint fit - Metal integration engine: back to its panel-s5 kernels; Mac stills keep the old clip, no saturation count - Metal integration test: the CPU comparison runs on a rotation experiment - Stills: kept overloads go back to the drop where they are not concentrated at low resolution - stills distance search: an absolute 30-3000 mm scan, a sample found without d-limits, the fit iterated - battery results: XFEL still battery 20261022-1358 on rc1780cf62452c- 12 sets, cold, R_free unrefined - battery results: still summary gains the resolution of our merge and of the deposition - Pre-scan masks a pixel at the saturation limit on most frames, as one holding the error value - Stills keep an overload as a lower bound only where it has pixels at the limit; run-level gate removed - XFEL reader: a per-frame mask is read the way the frames are, its chunk inflated outside the HDF5 lock - stills distance search: every centre scanned with a wider acceptance, a larger sample where nothing indexes - rugnux usage: --beam-center-check describes the absolute 30-3000 mm stills distance scan, not the old 60-160 % grid - stills: detector tilt refined in the geometry pre-pass, kept where held-out frames agree - CLAUDE.md: the changelog is written once, just before the merge into main - condensed one-liners of what users get - broker: serve the placed model and its maps of the last rugnux live run (/rugnux/model.cif, /rugnux/map.ccp4) - frontend: Mol* viewer of the placed model and its density on the Rugnux live page - writer: _model.cif from rugnux live keeps the input model's metadata, as the served model.cif does - rugnux live maps: one unit cell centred on the model; the viewer opens on all of it - Anomalous difference map: ANOM/PHANOM in _maps.mtz, /rugnux/map.ccp4?type=anom, a magenta mesh in the viewer - Mol* viewer: open with the maps drawn within 10 A of the centre of view - Mol* viewer: aaredb's structure-viewer setup, on a black stage - rugnux: the gain of a stills file that states none is read off its single-photon peak where the background resolves photons - Mol* viewer: in line with AareDB's StructureView at its current head (8ece2c2) - ACKNOWLEDGEMENT: the web frontend's Mol* viewer follows AareDB's setup (G. Gotthard, PSI) - stills tilt decision: the modules stay where the run placed them - still battery: no distance pins and no per-set tuning flags; gain from the data except where a file's baseline hides it - battery results: rc178 6f6f69 - full still battery and full rotation battery with REFMAC - Bragg integration: a CCD rotation sweep's sigmas at the measured gain, intensities in photons - BackgroundGain: the gain of a frame that resolves photons is the spacing of its photon peaks, so a baseline left in the frame no longer hides it - ShadowFinder: measure the background's azimuthal modulation instead of predicting it from the polarization - BackgroundGain: one gain estimate for rotation and stills; the still battery no longer gives EuXFEL 152 its gain - ShadowFinder: measure the modulation robustly under a wide one-sided shadow - ShadowFinderTest: a one-sided shadow is not fitted as part of the background's modulation - ShadowFinder: back to the predicted polarization factor, in the plane the background shows - MXAnalysisAfterFPGA: the Bragg engine's edge mask in the image's layout, so raw / untransformed FPGA runs start again - battery results: still battery on rc178 e54f55 replaces the earlier rc178 still tables - XFELReader: per-frame mask and photon conversion without a library call or a branch per pixel - stills geometry trial: the hypotheses a search asks are indexed side by side - stills tilt decision: the fits start beside the pre-scan and the geometry trial - XFELReader: a deflated frame is inflated and converted a piece at a time, while it is in the cache - XFELReader: a byte-shuffled frame is unshuffled a piece at a time, a whole pixel per step - GeometryRefiner: residuals carry only the blocks a fit moves; beam and distance one block - GeometryRefiner: a spot's residual differentiates its observed and predicted halves apart - docs: EXTERNAL_TEST_DATA lists every open-arm battery set, with corrected values and counts - battery: doc_check.py cross-checks the manifests against the dataset pages - stills module placement: the placement fit gets half the threads, each held-out fit an eighth - still battery: the EuXFEL sets run on all their frames, as the published still runs did - battery results: still battery on rc178 a0ce6c, cold on a quiet machine, replaces the earlier rc178 table - macOS build: explicit size_t in the XFEL reader's row bounds; parentheses in the CPU preprocessor's select Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu
123 lines
6.6 KiB
C++
123 lines
6.6 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "WriteModel.h"
|
|
|
|
#include <algorithm>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
|
|
#include <gemmi/to_mmcif.hpp> // make_mmcif_document
|
|
#include <gemmi/to_cif.hpp> // write_cif_to_stream
|
|
#include <gemmi/to_pdb.hpp> // write_pdb
|
|
#include <gemmi/polyheur.hpp> // setup_entities
|
|
|
|
#include "../common/Logger.h"
|
|
|
|
namespace {
|
|
|
|
// Do the coordinates of a model built in `coordinates_group` obey `label` as well? They do when every
|
|
// operation of `label` is one of theirs, i.e. when `label` is a subgroup: the file then holds more
|
|
// than one asymmetric unit of it, which is allowed and is what a model always does in P1. They do not
|
|
// when `label` has an operation of its own, and then the label is a lie a reader acts on - it
|
|
// generates atoms from that operation, and the crystal it builds is not the one in the file.
|
|
bool coordinates_obey(const gemmi::SpaceGroup &coordinates_group, const gemmi::SpaceGroup &label) {
|
|
const std::vector<gemmi::Op> coordinate_ops = coordinates_group.operations().all_ops_sorted();
|
|
const std::vector<gemmi::Op> label_ops = label.operations().all_ops_sorted();
|
|
return std::includes(coordinate_ops.begin(), coordinate_ops.end(),
|
|
label_ops.begin(), label_ops.end());
|
|
}
|
|
|
|
// `placed` in `cell`, labelled with `space_group` wherever its coordinates obey it (see WritePlacedModel).
|
|
// takes_model_group: the model's own group was kept instead.
|
|
gemmi::Structure LabelledModel(const gemmi::Structure &placed, const UnitCell &cell,
|
|
const gemmi::SpaceGroup &space_group, bool &takes_model_group) {
|
|
gemmi::Structure st = placed;
|
|
// The cell is the data's, taken from the same value the reflection files are written from: the
|
|
// coordinates were re-fractionalized into it and genuinely sit there.
|
|
//
|
|
// The group is the data's too wherever the coordinates obey it, which is the ordinary case and the
|
|
// one that matters - the label then matches the .mtz beside it, the enantiomorph in particular,
|
|
// since --model can adopt the model's and that is neither the data's original label nor,
|
|
// necessarily, the one the input model arrived with. Where they do not obey it the model's own
|
|
// group is written instead. Data merged in a supergroup of the model's - a run that over-merged
|
|
// across a pseudo-symmetry twofold, or a hand the model's fit did not earn - would otherwise put
|
|
// operations on the file that its contents contradict, and a refinement program expands them: the
|
|
// structure it refines is not the model, and it says so nowhere. A pair whose two files disagree
|
|
// is worth a warning; a coordinate file that is quietly wrong on its own is not worth writing.
|
|
const gemmi::SpaceGroup *model_group = st.find_spacegroup();
|
|
takes_model_group = model_group != nullptr && !coordinates_obey(*model_group, space_group);
|
|
st.cell = cell;
|
|
st.spacegroup_hm = (takes_model_group ? *model_group : space_group).xhm();
|
|
st.setup_cell_images();
|
|
return st;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void WritePlacedModel(const gemmi::Structure &placed,
|
|
const UnitCell &cell,
|
|
const gemmi::SpaceGroup &space_group,
|
|
const std::string &output_prefix,
|
|
Logger &logger) {
|
|
const std::string cif_path = output_prefix + "_model.cif";
|
|
// PDB as well as mmCIF, because the fragment-screening tools this file exists for take a PDB:
|
|
// PanDDA's per-dataset input is <name>.pdb beside <name>.mtz, and dimple produces the same pair.
|
|
// Same coordinates, same frame, both formats - a PDB cannot hold every cell, so it is written
|
|
// when it can be and skipped, with a line saying so, when it cannot.
|
|
const std::string pdb_path = output_prefix + "_model.pdb";
|
|
|
|
bool takes_model_group = false;
|
|
gemmi::Structure st = LabelledModel(placed, cell, space_group, takes_model_group);
|
|
const gemmi::SpaceGroup &label = takes_model_group ? *st.find_spacegroup() : space_group;
|
|
// Fills in entity types and label_asym_id for a model read from a PDB, which carries neither.
|
|
// Both are no-ops where the input already had them, i.e. for an mmCIF input.
|
|
// setup_entities and make_mmcif_document can both throw, and this runs BEFORE the reflection files
|
|
// are written: a convenience deliverable must not be able to take the run's actual output with it.
|
|
// The map writer does the same.
|
|
try {
|
|
gemmi::setup_entities(st);
|
|
std::ofstream os(cif_path);
|
|
gemmi::cif::write_cif_to_stream(os, gemmi::make_mmcif_document(st));
|
|
if (!os) {
|
|
logger.Error("Model validation: cannot write the placed model to {}", cif_path);
|
|
return;
|
|
}
|
|
} catch (const std::exception &e) {
|
|
logger.Warning("Model validation: could not write the placed model to {} ({})",
|
|
cif_path, e.what());
|
|
return;
|
|
}
|
|
bool pdb_written = false;
|
|
try {
|
|
std::ofstream os(pdb_path);
|
|
gemmi::write_pdb(st, os);
|
|
pdb_written = static_cast<bool>(os);
|
|
} catch (const std::exception &e) {
|
|
logger.Warning("Model validation: the placed model could not also be written as PDB ({}); "
|
|
"{} has it", e.what(), cif_path);
|
|
}
|
|
if (!takes_model_group) {
|
|
logger.Info("Model validation: the model as placed against these data written to {}{} "
|
|
"(cell and space group {} as in the reflection files)",
|
|
cif_path, pdb_written ? " and " + pdb_path : "", space_group.short_name());
|
|
} else {
|
|
logger.Warning("Model validation: the model as placed written to {}{} in ITS OWN space group "
|
|
"{}, not the {} the reflection files carry - its coordinates do not obey {}, so "
|
|
"the two files describe the same crystal in different symmetry and cannot be "
|
|
"refined against each other as they stand",
|
|
cif_path, pdb_written ? " and " + pdb_path : "",
|
|
label.short_name(), space_group.short_name(), space_group.short_name());
|
|
}
|
|
}
|
|
|
|
std::string PlacedModelMmcif(const gemmi::Structure &placed, const UnitCell &cell,
|
|
const gemmi::SpaceGroup &space_group) {
|
|
bool takes_model_group = false;
|
|
gemmi::Structure st = LabelledModel(placed, cell, space_group, takes_model_group);
|
|
gemmi::setup_entities(st);
|
|
std::ostringstream os;
|
|
gemmi::cif::write_cif_to_stream(os, gemmi::make_mmcif_document(st));
|
|
return os.str();
|
|
}
|