Files
leonarski_f 4809c1622c
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 16m43s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 28m46s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 32m5s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 39m44s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 5m7s
Build Packages / Create release (push) Successful in 8s
Build Packages / Build documentation (push) Successful in 49s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 22m30s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 31m54s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 11m29s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 23m51s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 26m7s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 29m38s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 28m6s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 29m44s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 33m22s
Build Packages / Generate python client (push) Successful in 47s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 34m6s
Build Packages / Unit tests (push) Successful in 1h2m47s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 35m59s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 34m8s
Build Packages / Validation Battery (push) Successful in 38m31s
v1.0.0-rc.187 (#98)
* Rugnux: Refinement several times faster, one protocol on the CPU and the GPU, parts of it on the Apple GPU; its random draws are the same on every platform.
* Rugnux: Refinement follows common practice: the free set decides only the restraint weights and the displacement model (isotropic, TLS or anisotropic, by Hamilton's test), everything else is decided on the working set; lower R-free for placed and predicted models.
* Rugnux: Restraint dictionaries via `--restraints` (or among the inputs) and more built-in ligands; a model whose space group is a subgroup of the data's is refined in its own group; reflections plus a model select `--mode refine` on their own.
* Rugnux: `-C` fixes the crystal system on the axes as typed; `-S` alone fixes the space group only, the cell is still found and reduced; a space group or cell stored in the input file is ignored, with a line in the log.
* Rugnux: More reliable multi-sweep merging; `--mode scale` merges several stills runs as one; `_plot.txt` and the report name each input; a second crystal form is reported for stills given a cell.
* jfjoch_broker (experimental): Live Rugnux on FPGA detectors (JUNGFRAU) takes the same path as a DECTRIS stream, rotation and serial alike, model step included, with analysis threads per GPU; frames waiting for the analysis can be viewed; no host stage drops a frame - a source faster than the analysis is held at the card.
* jfjoch_broker: Summation of more than 256 frames per image is split between the card and the host (`summation_mode` is then `hybrid`), and live Rugnux runs on such collections; pedestal runs take a receiver of their own.
* jfjoch_broker (experimental): `stills_downsample` analyses 1 of every N serial images (chosen by a hash; the first 2000 all; the others written without analysis; reset to 1 by `/initialize`); `max_spot_count` left out means 250 for per-image indexing and up to 1000 for live stills; the live status gives the merge before the model work, the fitted resolution and the anomalous peak height of each unexplained blob.
* jfjoch_broker: Without a `pcie` entry the broker runs on a mock of the card instead of the HLS simulation; its spot, ROI and azimuthal results are zero then.
* Web frontend: Redesigned Rugnux live page; Vite 8, TypeScript 6, Mol* 5.13 and dependency security updates.
* Tools: `jfjoch_fpga_stills_test` measures live stills on the cards with a stored dataset; `jfjoch_fpga_test` loses the HLS-simulation option.
* Other: FFTW no longer fetched or linked (the CPU FFT indexer keeps the name `FFTW`); PCIe driver now GPL-2.0-or-later and third-party notices complete; several crash fixes.

Reviewed-on: #98
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-11-19 20:49:28 +01:00

101 lines
4.5 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "ClashRelief.h"
#include "SideChainRotamers.h"
#include <algorithm>
#include <map>
#include <gemmi/modify.hpp>
#include <gemmi/neighbor.hpp>
namespace {
constexpr double REACH = 4.0; // A: the farthest pair that can overlap (OverlapOf)
} // namespace
std::vector<SideChainTurn> RelieveSideChainClashes(gemmi::Structure &st) {
std::vector<SideChainTurn> turned;
const gemmi::SpaceGroup *sg = st.find_spacegroup();
if (sg == nullptr || st.models.empty())
return turned;
gemmi::Model &model = st.models[0];
gemmi::UnitCell cell = st.cell;
cell.set_cell_images_from_spacegroup(sg);
// The atoms a LINK joins are no clash of each other.
std::vector<std::pair<const gemmi::Atom *, const gemmi::Atom *>> links;
for (const gemmi::Connection &conn : st.connections) {
const gemmi::CRA a = model.find_cra(conn.partner1), b = model.find_cra(conn.partner2);
if (a.atom != nullptr && b.atom != nullptr)
links.emplace_back(a.atom, b.atom);
}
// One pass over the model after another, until no side chain moves: a side chain turned out of a copy that the
// pass had still to turn made its choice against that copy's old place, so in the later passes every side chain
// turned so far chooses again, in the others' new places.
std::map<std::pair<size_t, size_t>, size_t> turned_index; // (chain, residue) -> entry in `turned`
for (int pass = 0; pass < 5; pass++) {
bool any = false;
// made afresh after each turn: the turn moves atoms the search has indexed
gemmi::NeighborSearch ns(model, cell, REACH + 1);
ns.populate(/*include_h=*/false);
for (size_t ci = 0; ci < model.chains.size(); ci++)
for (size_t ri = 0; ri < model.chains[ci].residues.size(); ri++) {
gemmi::Residue &res = model.chains[ci].residues[ri];
const std::optional<SideChain> sc = MakeSideChain(res);
if (!sc)
continue;
std::vector<const gemmi::Atom *> linked;
for (const auto &[a, b] : links)
for (const gemmi::Atom &x : res.atoms) {
if (&x == a)
linked.push_back(b);
if (&x == b)
linked.push_back(a);
}
auto overlap = [&](const std::vector<gemmi::Position> &p) {
return OverlapOf(ns, model, cell, res, static_cast<int>(ci), static_cast<int>(ri), *sc, p, linked);
};
const SideChainOverlap given = overlap(sc->pos);
const auto earlier = turned_index.find({ci, ri});
if (given.deepest < CLASH_RELIEF_OVERLAP && earlier == turned_index.end())
continue;
const std::vector<double> chi = sc->Chis();
SideChainOverlap best = given;
std::vector<double> best_chi = chi;
for (const std::vector<double> &chis : SideChainRotamers(res.name, sc->chi.size())) {
const SideChainOverlap o = overlap(sc->Build(chis));
if (o.sum < best.sum) {
best = o;
best_chi = chis;
}
}
if (!(best.sum < given.sum))
continue;
if (earlier == turned_index.end()) {
SideChainTurn t;
t.name = res.name + " " + model.chains[ci].name + res.seqid.str();
t.chi_before = chi;
t.overlap_before = given.deepest;
turned_index[{ci, ri}] = turned.size();
turned.push_back(t);
}
SideChainTurn &t = turned[turned_index[{ci, ri}]];
t.chi_after = best_chi;
t.overlap_after = best.deepest;
const std::vector<gemmi::Position> p = sc->Build(best_chi);
for (size_t i = 0; i < p.size(); i++)
res.atoms[i].pos = p[i];
// its hydrogens, where it has them, went with their heavy atoms only by name: they are placed anew
gemmi::remove_hydrogens(res);
any = true;
ns = gemmi::NeighborSearch(model, cell, REACH + 1);
ns.populate(/*include_h=*/false);
}
if (!any)
break;
}
return turned;
}