From 94cc5d726744893166c40ff996575a759963389e Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 5 Oct 2026 07:03:45 +0200 Subject: [PATCH 1/8] Anisotropy: a cubic result carries a principal frame, so its French-Wilson tensor is zero, not NaN In a cubic Laue class AnalyzeAnisotropy returns before any fit with the eigenvalues set to zero but the eigenvectors left at their NaN defaults. AnisotropyTensorHKL multiplies them (0 * NaN), so the anisotropic French-Wilson prior of 4979f8aa6 was NaN for every cubic data set: every shell mean became NaN and the second French-Wilson pass rewrote all weak amplitudes from a NaN prior (on 5epe the weak-reflection F rose by 2% at low and 14% at high resolution against the merge-time pass, IMEAN unchanged). The cubic result now carries the crystal axes as its (arbitrary) principal frame, so the tensor is zero and the prior isotropic, as the commit intended. The second pass otherwise sees exactly the merge-time pass's input (same reflections, d range, shells and space group; checked on 5epe), so in non-cubic groups the difference between the two passes is the tensor alone. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01K5K8jvPPbmCrbqnWkddTuB --- image_analysis/scale_merge/AnisotropyAnalysis.cpp | 8 +++++++- tests/AnisotropyAnalysisTest.cpp | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/image_analysis/scale_merge/AnisotropyAnalysis.cpp b/image_analysis/scale_merge/AnisotropyAnalysis.cpp index 51abe2bdb..ce8546b5f 100644 --- a/image_analysis/scale_merge/AnisotropyAnalysis.cpp +++ b/image_analysis/scale_merge/AnisotropyAnalysis.cpp @@ -1222,7 +1222,13 @@ AnisotropyResult AnalyzeAnisotropy(const std::vector &merged, result.delta_b = 0.0; result.delta_b_linear = 0.0; result.delta_b_flat = 0.0; - result.eigenvalue[0] = result.eigenvalue[1] = result.eigenvalue[2] = 0.0; + // Every frame is a principal frame of a zero tensor; the crystal axes are given, so that the + // tensor built from it (AnisotropyTensorHKL, the French-Wilson prior) is zero and not NaN. + for (int n = 0; n < 3; ++n) { + result.eigenvalue[n] = 0.0; + for (int j = 0; j < 3; ++j) + result.eigenvector[n][j] = n == j ? 1.0 : 0.0; + } result.verdict = AnisotropyVerdict::NotDetected; result.band = "no anisotropy is possible in this Laue class"; return result; diff --git a/tests/AnisotropyAnalysisTest.cpp b/tests/AnisotropyAnalysisTest.cpp index 3a0fe01f5..fef49078c 100644 --- a/tests/AnisotropyAnalysisTest.cpp +++ b/tests/AnisotropyAnalysisTest.cpp @@ -116,6 +116,11 @@ TEST_CASE("Anisotropy is exactly zero in a cubic Laue class", "[anisotropy]") { CHECK(result.n_free_parameters == 0); CHECK(result.delta_b == 0.0); CHECK(result.verdict == AnisotropyVerdict::NotDetected); + // The French-Wilson prior takes this tensor: it must be the isotropic one, zero, not NaN. + const gemmi::Mat33 q = AnisotropyTensorHKL(result, cell); + for (int i = 0; i < 3; ++i) + for (int j = 0; j < 3; ++j) + CHECK(q[i][j] == 0.0); } // The tensor itself: put a known deviatoric B into a tetragonal merge and read it back. The From 7eb8e93a0afc4daea730ff6efc19ea885bc4119a Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 5 Oct 2026 07:56:32 +0200 Subject: [PATCH 2/8] Rugnux --model: report the anomalous map's mean height at the model's anomalous scatterers ANOMALOUS_SCATTERER_MEAN_SIGMA= is the anomalous difference map, read at every model atom from phosphorus up (S of Met/Cys, metals, Cl, I) with the same cubic interpolation as ANOMALOUS_SITE_*, averaged in map sigma; ANOMALOUS_SCATTERERS= is their count. One number for the anomalous signal of a merge that does not depend on which ten atoms come out on top - what the battery tracks for the long-wavelength standard-protein sets. A new key only: no report version bump. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01K5K8jvPPbmCrbqnWkddTuB --- docs/CHANGELOG.md | 1 + docs/CPU_DATA_ANALYSIS_DECISIONS.md | 2 +- docs/RUGNUX_ADVANCED.md | 4 +++- rugnux/ModelValidation.cpp | 11 +++++++++++ rugnux/ModelValidation.h | 4 ++++ rugnux/ResultReport.cpp | 4 ++++ 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 26eb487a0..01ecc7c53 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -13,6 +13,7 @@ * Rugnux keeps the screw axes it found when a higher point group is adopted after the twin-law check, instead of writing the group without screws (e.g. P 4 2 2 for P4_2 2_1 2). * Rugnux drops a rotation reflection whose spot held a saturated (overloaded) pixel, as XDS does, and reports the count as `OBSERVATIONS_REJECTED_OVERLOAD=`. * Rugnux fits a rotation sweep's per-frame scale on the partial reflections, even with few reflections per frame, when scaling from the fulls alone leaves no measurable error model. +* `rugnux --model` reports the anomalous difference map's mean height at the model's anomalous scatterers (phosphorus and heavier) as `ANOMALOUS_SCATTERER_MEAN_SIGMA=`, with their count as `ANOMALOUS_SCATTERERS=`. * Rugnux names glide planes in groups without a centre of symmetry (e.g. I-42d, Fdd2), reports a group with the same absences (C2/c and Cc) as an alternative, and states how the centre was decided (`SPACE_GROUP_CENTRE`, `CENTRE_STATISTICS_*`). ### 1.0.0-rc.173 diff --git a/docs/CPU_DATA_ANALYSIS_DECISIONS.md b/docs/CPU_DATA_ANALYSIS_DECISIONS.md index 418fdcad3..d65b82d62 100644 --- a/docs/CPU_DATA_ANALYSIS_DECISIONS.md +++ b/docs/CPU_DATA_ANALYSIS_DECISIONS.md @@ -239,7 +239,7 @@ $ over the acentric reflections that have both hands (a centric reflection has no anomalous difference, only noise). Turning the model phase back by 90° is what makes the anomalous scattering, which is 90° out of phase with the normal scattering, add up in the real part: the map's peaks then sit on the anomalous scatterers. It is written as `_anom.ccp4`. Its hand is the one §14.6 settled: with the mates the wrong way round every peak becomes a trough, so a map of clean peaks is itself a check that the frame is right. -Rather than searching the map for blobs and leaving a list of coordinates, the map is read **at the model's own atom centres** (hydrogens excluded — they scatter no anomalous signal), and the ten highest, in units of the map's r.m.s., are reported in the log and as `ANOMALOUS_SITE_01`…`ANOMALOUS_SITE_10` in the results report. Each site is therefore named — the atom, residue and chain it belongs to — which is what says *what* carries the signal, not just where it is. The reading is cubic, not linear: the map is sampled every $d_\mathrm{min}/3$, and a peak that sharp read by trilinear interpolation comes out up to a quarter low — unevenly enough to reorder the sites. This reading is the one ANODE reports. +Rather than searching the map for blobs and leaving a list of coordinates, the map is read **at the model's own atom centres** (hydrogens excluded — they scatter no anomalous signal), and the ten highest, in units of the map's r.m.s., are reported in the log and as `ANOMALOUS_SITE_01`…`ANOMALOUS_SITE_10` in the results report. Each site is therefore named — the atom, residue and chain it belongs to — which is what says *what* carries the signal, not just where it is. The reading is cubic, not linear: the map is sampled every $d_\mathrm{min}/3$, and a peak that sharp read by trilinear interpolation comes out up to a quarter low — unevenly enough to reorder the sites. This reading is the one ANODE reports. The same reading averaged over the model's **anomalous scatterers** — every atom from phosphorus ($Z = 15$) up: the S of Met and Cys, metals, Cl, I — is reported as `ANOMALOUS_SCATTERER_MEAN_SIGMA` (with their count, `ANOMALOUS_SCATTERERS`): one number for how much anomalous signal the merge carries, which does not depend on which ten atoms happen to come out on top. Below phosphorus (C, N, O, Na, Mg) $f''$ is a fraction of sulfur's at any wavelength these data are taken at, and counting those atoms would only dilute the mean with noise. Because the map is built on the model's phases and the data's own indexing, it is also the only test of whether the two agree about the **hand** (§14.6). A model and a dataset in opposite hands turn every anomalous peak into a trough, so a map whose deepest hole at an atom is both deeper than $5\sigma$ and deeper than its highest peak says so, and the run reports it as a warning naming that atom. It is not repaired by reindexing: that would make the two agree by construction and destroy the evidence for which of the model and the data is in the wrong hand. Note that R-free cannot see this at all — a mirrored model gives R-free to four decimal places unchanged, and an exactly inverted anomalous map. diff --git a/docs/RUGNUX_ADVANCED.md b/docs/RUGNUX_ADVANCED.md index 91b37e740..cdd3e8d38 100644 --- a/docs/RUGNUX_ADVANCED.md +++ b/docs/RUGNUX_ADVANCED.md @@ -154,7 +154,9 @@ It also writes the σA-weighted maps `_2fofc.ccp4` (2mFo−DF `_fofc.ccp4` (mFo−DFc), and the map-coefficient MTZ `_maps.mtz`, next to the merged reflections — and, where the merge kept the Bijvoet split (a rotation merge always does), `_anom.ccp4`, the anomalous difference map whose strongest sites the report names -(`ANOMALOUS_SITE_01`…`10`). The structure itself is not refined; the model is re-fractionalized into +(`ANOMALOUS_SITE_01`…`10`), and the map's mean height at the model's anomalous scatterers - every +atom from phosphorus up - as one number for the anomalous signal (`ANOMALOUS_SCATTERER_MEAN_SIGMA`). +The structure itself is not refined; the model is re-fractionalized into the data cell and then placed as **one rigid body**, so a deposited model from a crystal that is not quite isomorphous still sits where the density is. The placement runs on the GPU where there is one and on the CPU otherwise, with nothing to set; the two agree to rounding, not bit for bit. diff --git a/rugnux/ModelValidation.cpp b/rugnux/ModelValidation.cpp index a44bda1c1..c5b370888 100644 --- a/rugnux/ModelValidation.cpp +++ b/rugnux/ModelValidation.cpp @@ -80,6 +80,10 @@ constexpr double ANOMALOUS_INVERSION_SIGMA = 5.0; // signal is there and what carries it; a full site list is what the map file is for. constexpr size_t MAX_ANOMALOUS_SITES = 10; +// The lightest element counted as an anomalous scatterer: phosphorus. Below it (C, N, O, Na, Mg) f'' +// is a fraction of sulfur's at any wavelength these data are taken at. +constexpr int ANOMALOUS_SCATTERER_MIN_Z = 15; + // How many random placements of the same model the real fit is compared against. The verdict is // (real - mean)/sd of this sample, so what matters is not the mean but how well the SPREAD is // pinned: the relative error on an sd from n draws is 1/sqrt(2(n-1)), and a sample that happens to @@ -1290,6 +1294,7 @@ ModelValidationResult Validate(const std::vector &merged, const gemmi::Grid grid = map_from_coefficients(mapanom); const double rms = write_ccp4(grid, output_prefix + "_anom.ccp4"); std::vector sites; + double scatterer_sum = 0; for (gemmi::Model &m : st.models) for (gemmi::Chain &ch : m.chains) for (gemmi::Residue &r : ch.residues) @@ -1300,7 +1305,13 @@ ModelValidationResult Validate(const std::vector &merged, r.seqid.str()), rms > 0 ? grid.interpolate_value(a.pos, MAP_INTERPOLATION_ORDER) / rms : 0.0}); + if (a.element.atomic_number() >= ANOMALOUS_SCATTERER_MIN_Z) { + scatterer_sum += sites.back().sigma; + result.anomalous_scatterers++; + } } + if (result.anomalous_scatterers > 0) + result.anomalous_scatterer_mean_sigma = scatterer_sum / result.anomalous_scatterers; std::sort(sites.begin(), sites.end(), [](const auto &x, const auto &y) { return x.sigma > y.sigma; }); diff --git a/rugnux/ModelValidation.h b/rugnux/ModelValidation.h index 6c47a1443..1198ccaa2 100644 --- a/rugnux/ModelValidation.h +++ b/rugnux/ModelValidation.h @@ -119,6 +119,10 @@ struct ModelValidationResult { }; std::vector anomalous_sites; int anomalous_pairs = 0; // Bijvoet pairs the anomalous map was computed from + // The same map's mean height at the model's anomalous scatterers - every atom from phosphorus up + // (S of Met/Cys, metals, Cl, I, ...) - one number for how much anomalous signal the data carry. + int anomalous_scatterers = 0; + double anomalous_scatterer_mean_sigma = NAN; // Set when the anomalous map is inverted at the model's atoms - deeper troughs than peaks - which // says the data and the model are in opposite hands. Named so the report can quote the evidence. diff --git a/rugnux/ResultReport.cpp b/rugnux/ResultReport.cpp index 411d9b803..f2ae32d06 100644 --- a/rugnux/ResultReport.cpp +++ b/rugnux/ResultReport.cpp @@ -2118,6 +2118,10 @@ ReportDocument BuildReportDocument(const std::string &output_prefix, } if (!mv.anomalous_sites.empty()) { Add(s, KeyInt("ANOMALOUS_BIJVOET_PAIRS", mv.anomalous_pairs)); + if (mv.anomalous_scatterers > 0) { + Add(s, KeyInt("ANOMALOUS_SCATTERERS", mv.anomalous_scatterers)); + Add(s, KeyReal("ANOMALOUS_SCATTERER_MEAN_SIGMA", mv.anomalous_scatterer_mean_sigma, "{:.2f}")); + } for (size_t i = 0; i < mv.anomalous_sites.size(); i++) // Two digits so the ten keys are the same width and the values line up. Add(s, KeyText(fmt::format("ANOMALOUS_SITE_{:02}", i + 1).c_str(), From 442cf8889d14d19c8d905562ece9155fde43b941 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Mon, 5 Oct 2026 08:47:21 +0200 Subject: [PATCH 3/8] Battery: in-house standard proteins carry a reference model for R-free and anomalous signal Each lysozyme, thaumatin, insulin, cytochrome c and myoglobin set names the PDB entry of its crystal form in a `model` field; the runner fetches it like an open-arm deposition and passes it to --model, so the row carries rfree, rmodel_shell_scaled, rfree_deposited/rfree_ratio and the new anom_sigma (ANOMALOUS_SCATTERER_MEAN_SIGMA) - an external yardstick beside the XDS statistics. Reported only: the arm's scoring is unchanged, and the processing is identical with and without the model (19 sets vs all2-full: same space group modulo the model's enantiomorph label, d_min, R_meas, CC1/2, ISa, cell and REFRES table). depdata_check stays open-arm only. Models, chosen by cell/space group and confirmed by rugnux --model: 4AXT lysozyme (6G8A, the coordinates beside the data, has c 2% short: R-free +0.04), 5A47 thaumatin (6G89 +0.06), 2BN3 cubic and 4E7T rhombohedral insulin (bovine; pig 9INS +0.07, human 1MSO +0.08), 4DC8 horse heart myoglobin (b 28.8, not sperm whale's 30.8; 5ZZE equal), 6FF5 bovine cytochrome c - our crystals are a primitive relative of its H32 form (pseudo-centring TNCS), so R-free ~0.49 but the heme iron is the top anomalous peak; 8RKP, the cytochrome c' beside the data, does not fit at all (R-free 0.63, nothing at the iron). Run 20261005-0735_2624a6_inhouse-model (19 sets): R-free 0.18-0.30 on the good sets, 0.37-0.57 on the ISa~2 powder/split myoglobin sweeps and ~0.49 on cytochrome c; anom_sigma rises with wavelength (thaumatin 2.3 at 16 keV, 6.7 at 6.5 keV, 8.9 at 3.8 keV). Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01K5K8jvPPbmCrbqnWkddTuB --- tools/battery/README.md | 30 ++++++++++++---- tools/battery/battery.py | 21 ++++++----- tools/battery/inhouse.json | 74 +++++++++++++++++++------------------- tools/battery/report.py | 15 ++++++-- tools/battery/score.py | 8 +++-- 5 files changed, 91 insertions(+), 57 deletions(-) diff --git a/tools/battery/README.md b/tools/battery/README.md index c1201ab80..0c122bbf1 100644 --- a/tools/battery/README.md +++ b/tools/battery/README.md @@ -15,7 +15,7 @@ run needed): `cd tools/battery && python3 test_score.py`. | arm | datasets | reference | manifest | |---|---|---|---| | **open** | public PDB depositions of raw diffraction data, plus a few published small-molecule sets | the deposited space group, cell and resolution | `open.json` (committed) | -| **inhouse** | standard test crystals measured at the SLS (lysozyme, thaumatin, insulin, cytochrome C, myoglobin), small-molecule standards (aspirin, citric acid, HEPES, YAG, L-cystine), plus no-crystal controls | XDS, from the `CORRECT.LP` beside each dataset; for the small molecules the space group is the literature's (`ref_override`), as XDS reports only Sohncke groups; L-cystine, which XDS does not index, has only the literature reference | `inhouse.json` (committed) | +| **inhouse** | standard test crystals measured at the SLS (lysozyme, thaumatin, insulin, cytochrome C, myoglobin), small-molecule standards (aspirin, citric acid, HEPES, YAG, L-cystine), plus no-crystal controls | XDS, from the `CORRECT.LP` beside each dataset (the standard proteins also carry a reference model for R-free, reported only: `--model` below); for the small molecules the space group is the literature's (`ref_override`), as XDS reports only Sohncke groups; L-cystine, which XDS does not index, has only the literature reference | `inhouse.json` (committed) | | **private** | user data | XDS, like inhouse | outside the repository; the local site config gives its path | Scoring checks these things in order, and the first one that fails decides the verdict: did it @@ -84,7 +84,7 @@ Every set runs **once**, with one command per arm: | arm (reference) | command | |---|---| | open (deposition) | `rugnux -o p --no-export-unmerged --model `; sets without a deposited model (small molecules, unpublished sets, or coordinates that cannot be downloaded) run the same command without `--model` | -| inhouse, private (XDS) | `rugnux -o p --no-export-unmerged [-A] --report-resolution , ` | +| inhouse, private (XDS) | `rugnux -o p --no-export-unmerged [-A] --report-resolution , [--model ] `; `--model` where the set names one (the in-house standard proteins, below) | Neither `--model` nor `--report-resolution` changes the processing: the merged reflections, the resolution cut and every decision are the same with and without them (verified bit for bit). So @@ -103,6 +103,23 @@ the reference: A model that fits may put its enantiomorph on the space-group label; the scorer reads the data's own determination instead (`SOHNCKE_SPACE_GROUP` where `SPACE_GROUP_ENANTIOMORPH` is `ASSUMED_FROM_MODEL`) and keeps the label in `sg_label`. +- **`--model`** (in-house standard proteins): a set may name the PDB entry of its crystal form in + its `model` field; it is fetched and cached like an open-arm entry and passed to `--model`, so + the row carries the same model fields (`rfree`, `rmodel_shell_scaled`, `rfree_deposited`, + `rfree_ratio`, `anom_sigma`, ...) - quality on an external yardstick beside the XDS statistics. + They are reported, never scored: the arm is scored against XDS exactly as without them. One + entry per crystal form, chosen by cell and space group and confirmed by `rugnux --model` on our + sets (R-free of the placed model, not refined): + + | sets | model | why | + |---|---|---| + | `lyso*` (P4₃2₁2) | 4AXT | hen egg-white lysozyme, 1.1 Å, 100 K, a 78.2 c 37.5 - the middle of our sets' cells (76.9-78.4 / 37.0-37.9); rugnux re-fractionalises the model into the data cell, so the R-free of the placed model rises by a few points per % of cell difference (6G8A, a 78.9 c 36.9: R-free +0.04 on `lyso_x06da_ref`). No ions in the model, so `anom_sigma` is the sulfurs' | + | `thau*` (P4₁2₁2) | 5A47 | thaumatin from *T. daniellii*, 1.2 Å, a 57.9 c 150.6 (6G89, 2.4 Å: R-free +0.06) | + | `insu_I*` (I2₁3) | 2BN3 | bovine insulin, cubic, 1.4 Å, 100 K, a 77.9 (9INS, pig, a 78.9, no R-free deposited: R-free +0.07) | + | `insu_H*` (H3) | 4E7T | bovine T6 2Zn insulin, 1.4 Å, a 81.0 c 33.5 (1MSO, human: R-free +0.08 - our insulin is bovine) | + | `cytc*` (P3₁21 / P3₂21) | 6FF5 | bovine heart cytochrome c at high ionic strength, H32, a 83.4 c 92.5. Our crystals are a primitive relative of that form - the R centring survives as a pseudo-translation (TNCS, 1/3 2/3 1/3) and c is 4-6% shorter - so the model explains the centred part only and R-free stays near 0.48; the heme iron is still the strongest anomalous peak (17 sigma). Trend only. (8RKP, the cytochrome c' whose P6₂22 cell matches ours, does not fit: R-free 0.63, no density at the iron) | + | `myob*` (P2₁) | 4DC8 | horse heart myoglobin (b 28.8 Å; sperm whale's P2₁ form has b 30.8), met form with sulfate, 1.5 Å, 100 K, a 35.4 b 28.8 c 63.1 β 106.1 - our setting; the unexposed control of its deposition, so no ligand or modified heme (5ZZE, same form, R-free 0.235 vs 0.233) | + - **`--report-resolution`** (XDS arms): a second statistics table from the same merge, binned over XDS's own range (`dmin_xds` and XDS's d_max as given, 999 included, so it covers exactly what XDS's CORRECT.LP totals cover), and `-A` where XDS merged with `FRIEDEL'S_LAW=FALSE` (`"anomalous": true` in the @@ -415,9 +432,10 @@ was run `--unforced`), so its forced XDS-arm rows are left out the same way. | `isa_ratio`, `r_meas_ratio` | refres_isa / isa_ref and refres_r_meas / r_meas_ref | | `cc_half_noise_ratio` | XDS arms: (1/refres_cc_half - 1) / (1/(cc_half_ref - 0.0005) - 1), reported, not scored | | `lowres_d`, `lowres_r_meas`, `refres_lowres_d`, `refres_lowres_r_meas`, `lowres_d_ref`, `lowres_r_meas_ref`, `lowres_r_meas_ratio` | the lowest-resolution shell's high-resolution limit and R_meas: rugnux's own table, the reference-range table, XDS's; and refres_lowres_r_meas / lowres_r_meas_ref | -| `model`, `model_note` | open arm: the deposited coordinates given to `--model`, or why there were none | -| `rfree`, `rwork`, `cc_model`, `model_fit`, `rfree_deposited`, `rfree_ratio` | open arm with a model: R_FREE, R_WORK, CC_MODEL_OVERALL and MODEL_FIT as rugnux reports them (placement-only, own free set: trend fields), the published R-free, and rfree / rfree_deposited | -| `rmodel`, `rmodel_shell_scaled`, `radial_misfit` | open arm with a model: R_MODEL, R_MODEL_SHELL_SCALED and MODEL_RADIAL_MISFIT - R over all the reflections, with and without one free scale per resolution shell, and how big that rescale was. `rmodel_shell_scaled` is the R that compares between runs (below) | +| `model`, `model_note` | open arm, and in-house sets with a `model`: the coordinates given to `--model`, or why there were none | +| `rfree`, `rwork`, `cc_model`, `model_fit`, `rfree_deposited`, `rfree_ratio` | any row with a model: R_FREE, R_WORK, CC_MODEL_OVERALL and MODEL_FIT as rugnux reports them (placement-only, own free set: trend fields), the published R-free, and rfree / rfree_deposited | +| `anom_sigma` | any row with a model: ANOMALOUS_SCATTERER_MEAN_SIGMA, the anomalous difference map (F+ - F- on the model's phases) read at every model atom from phosphorus up (S of Met/Cys, metals, Cl, I, ...) and averaged, in map sigma - how much anomalous signal the merge carries; null where the merge kept no Bijvoet split or the model has no such atom | +| `rmodel`, `rmodel_shell_scaled`, `radial_misfit` | any row with a model: R_MODEL, R_MODEL_SHELL_SCALED and MODEL_RADIAL_MISFIT - R over all the reflections, with and without one free scale per resolution shell, and how big that rescale was. `rmodel_shell_scaled` is the R that compares between runs (below) | | `refmac_rfree`, `refmac_rwork`, `refmac_rfree_depflags`, `refmac_rfree_depdata`, `refmac_rfree_ratio`, `refmac_twin`, `refmac_untwinned`, `refmac_status`, `refmac_reason`, `refmac_refined_*`, `refmac_shared_free_n` | the REFMAC check (`--model-check`, open arm; see its section for which R-free is which) | | `dep_status`, `dep_reason`, `dep_kind`, `dep_d_min`, `dep_n_common`, `dep_cc_delta_all`, `dep_cc_delta_outer`, `dep_beyond_cc`, `dep_beyond_d` | open arm with a model: our merge against the depositor's data per shell (`depdata_check.py`, above) | | `shx_*` | small molecule with a `cod` structure: the SHELXL check (`shelx_check.py`, above) | @@ -437,7 +455,7 @@ SVG, no external files): the main metrics; - plots per set (HTML only; hovering a point shows the set): d_min(rugnux) / d_min(reference) for each arm; on the XDS arms the reference-range ISa, R_meas, lowest-shell R_meas and CC1/2 - noise over XDS's; on the open arm R_free / published R_free; + noise over XDS's; on every row with a model R_free / published R_free; - on the open arm, **against the depositor's data**: the per-shell CC difference and the CC past the deposited limit, one row per set, sorted by the outer-shell difference; - on the XDS arms the **like-for-like table**: the reference-range numbers beside XDS's, with the diff --git a/tools/battery/battery.py b/tools/battery/battery.py index 05ecefde0..b8f62781d 100644 --- a/tools/battery/battery.py +++ b/tools/battery/battery.py @@ -29,8 +29,9 @@ $JFJOCH_BATTERY_SITE, else site.json beside this script (not committed; site.exa Every set runs once, with one command per arm (COMMAND_DOC): the open arm with the deposited model (--model), the XDS arms with XDS's range as a report-only second -table (--report-resolution). Neither option changes the processing, so the one run is both what a -user gets and the like-for-like comparison. +table (--report-resolution) and, where a set names the PDB entry of its crystal form, that model +(--model). Neither option changes the processing, so the one run is both what a user gets and the +like-for-like comparison. A run writes /__