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
138 lines
6.6 KiB
Python
138 lines
6.6 KiB
Python
#!/usr/bin/env python3
|
|
"""doc_check.py -- the battery manifests against the pages that document their datasets.
|
|
|
|
open.json <-> docs/EXTERNAL_TEST_DATA.md
|
|
still_manifest.json <-> docs/EXTERNAL_TEST_DATA_STILLS.md
|
|
inhouse.json <-> the inhouse row of the Arms table in tools/battery/README.md
|
|
|
|
Open arm: every manifest row is a row of the page's Datasets table (through the "Battery rows
|
|
whose id is not the PDB code" table where the id is not the PDB code) or of "Datasets with no PDB
|
|
entry"; every Datasets row is in the manifest or under "Datasets in the table that are not in the
|
|
battery"; space group, cell (to the page's 0.1 A / 0.1 deg) and d_min (to 0.01 A) agree; the
|
|
stated row count and the per-repository counts are the table's. Still battery: every set is in
|
|
the page's table with its CXIDB entry, PDB entry, space group and d_min, and every set the page
|
|
names is in the manifest. In-house: each set's specimen is named in the README.
|
|
|
|
python3 doc_check.py (exit status 1 on any mismatch; stdlib only, no data needed)
|
|
"""
|
|
import collections
|
|
import json
|
|
import os
|
|
import re
|
|
import sys
|
|
|
|
HERE = os.path.dirname(os.path.abspath(__file__))
|
|
DOCS = os.path.join(HERE, "..", "..", "docs")
|
|
# in-house id prefix -> the name the README's Arms table gives the specimen
|
|
INHOUSE = {"lyso": "lysozyme", "lysoI": "lysozyme", "thau": "thaumatin", "insu": "insulin",
|
|
"cytc": "cytochrome C", "myob": "myoglobin", "nothing": "no-crystal controls",
|
|
"aspirin": "aspirin", "citricacid": "citric acid", "hepes": "HEPES", "yag": "YAG",
|
|
"kdp": "KDP", "lcystine": "L-cystine"}
|
|
|
|
errors = []
|
|
|
|
|
|
def section(text, heading):
|
|
"""The body of a '## heading' section, up to the next '## '."""
|
|
body = text.split("\n## " + heading + "\n", 1)[1]
|
|
return body.split("\n## ", 1)[0]
|
|
|
|
|
|
def table(body, n=0):
|
|
"""Rows of the n-th Markdown table in body, as lists of stripped cells."""
|
|
blocks = re.findall(r"(?:^\|.*\n?)+", body, re.M)
|
|
rows = blocks[n].splitlines()[2:]
|
|
return [[c.strip() for c in r.strip("|").split(" | ")] for r in rows]
|
|
|
|
|
|
def check_open():
|
|
sets = {s["id"]: s for s in json.load(open(os.path.join(HERE, "open.json")))["sets"]}
|
|
text = open(os.path.join(DOCS, "EXTERNAL_TEST_DATA.md")).read()
|
|
rows = {re.match(r"\[(\w{4})\]", r[0]).group(1): r for r in table(section(text, "Datasets"))}
|
|
renamed = {r[0].strip("`"): r[1] for r in table(section(text, "Battery rows whose id is not the PDB code"))}
|
|
absent = {r[0] for r in table(section(text, "Datasets in the table that are not in the battery"))}
|
|
no_pdb = {r[0].strip("`"): r for r in table(section(text, "Datasets with no PDB entry"))}
|
|
small = {r[0].strip("`"): r for r in table(section(text, "Datasets with no PDB entry"), 1)}
|
|
|
|
used = set()
|
|
for sid, s in sets.items():
|
|
if sid in no_pdb:
|
|
ref, row = s.get("ref"), small.get(sid)
|
|
if ref and row and (row[1].split("`")[1] != ref["sg"] or not same_cell(row[2].replace("/", " "), ref["cell"], 0.0005)):
|
|
errors.append(f"open {sid}: space group or cell differ from the small-molecule table")
|
|
continue
|
|
pdb = renamed.get(sid, sid.upper())
|
|
row = rows.get(pdb)
|
|
if row is None:
|
|
errors.append(f"open {sid}: not on EXTERNAL_TEST_DATA.md")
|
|
continue
|
|
used.add(pdb)
|
|
ref = s["ref"]
|
|
if row[4] != ref["sg"]:
|
|
errors.append(f"open {sid}: space group {row[4]!r} on the page, {ref['sg']!r} in the manifest")
|
|
if not same_cell(row[5], ref["cell"], 0.051):
|
|
errors.append(f"open {sid}: cell {row[5]} on the page, {ref['cell']} in the manifest")
|
|
if ref["dmin"] is not None and abs(float(row[3]) - ref["dmin"]) > 0.0051:
|
|
errors.append(f"open {sid}: d_min {row[3]} on the page, {ref['dmin']} in the manifest")
|
|
for pdb in sorted(set(rows) - used - absent):
|
|
errors.append(f"open {pdb}: on the page but not in open.json, nor listed as not in the battery")
|
|
for pdb in sorted(absent & used):
|
|
errors.append(f"open {pdb}: listed as not in the battery, but open.json has it")
|
|
|
|
m = re.search(r"The table holds (\d+) PDB entries", text)
|
|
if not m or int(m.group(1)) != len(rows):
|
|
errors.append(f"open: the page states {m and m.group(1)} PDB entries, its table has {len(rows)}")
|
|
repos = collections.Counter(r[1].split(" [")[0] for r in rows.values())
|
|
repos.update(r[1].split(" record")[0] for r in no_pdb.values())
|
|
stated = dict((name, int(n)) for name, n in re.findall(
|
|
r"([A-Za-z][\w ]*?) (\d+)[,.]", section(text, "The collection in numbers").split("- **Repository**")[1].split(":", 1)[1].split("\n- ")[0]))
|
|
if stated != dict(repos):
|
|
errors.append(f"open: repository counts on the page {stated}, the tables give {dict(repos)}")
|
|
|
|
|
|
def same_cell(text, cell, tol):
|
|
vals = [float(v) for v in text.split()]
|
|
return len(vals) == 6 and all(abs(a - b) <= tol for a, b in zip(vals, cell))
|
|
|
|
|
|
def check_still():
|
|
sets = {s["id"]: s for s in json.load(open(os.path.join(HERE, "still_manifest.json")))["sets"]}
|
|
text = open(os.path.join(DOCS, "EXTERNAL_TEST_DATA_STILLS.md")).read()
|
|
seen = set()
|
|
for row in table(section(text, "Datasets")):
|
|
ids = re.findall(r"`(\w+)`", row[0])
|
|
pdbs = re.findall(r"\[(\w{4})\]\(https://www.rcsb", row[4])
|
|
cxidb = int(re.match(r"\[(\d+)\]", row[1]).group(1))
|
|
sg, dmin = row[5].rsplit(", ", 1)
|
|
for i, sid in enumerate(ids):
|
|
seen.add(sid)
|
|
s = sets.get(sid)
|
|
if s is None:
|
|
errors.append(f"still {sid}: on the page but not in still_manifest.json")
|
|
continue
|
|
pdb = pdbs[i] if len(pdbs) == len(ids) else pdbs[0]
|
|
got = (s["cxidb"], s["pdb"], s["sg"], s["d_cut"])
|
|
if got != (cxidb, pdb, sg, float(dmin)):
|
|
errors.append(f"still {sid}: page {(cxidb, pdb, sg, float(dmin))}, manifest {got}")
|
|
for sid in sorted(set(sets) - seen):
|
|
errors.append(f"still {sid}: in still_manifest.json but not on the page")
|
|
|
|
|
|
def check_inhouse():
|
|
sets = json.load(open(os.path.join(HERE, "inhouse.json")))["sets"]
|
|
readme = open(os.path.join(HERE, "README.md")).read()
|
|
arm = next(l for l in readme.splitlines() if l.startswith("| **inhouse** |"))
|
|
for s in sets:
|
|
name = INHOUSE.get(s["id"].split("_")[0])
|
|
if name is None or name not in arm:
|
|
errors.append(f"inhouse {s['id']}: its specimen is not named in README.md's Arms table")
|
|
|
|
|
|
check_open()
|
|
check_still()
|
|
check_inhouse()
|
|
for e in errors:
|
|
print(e)
|
|
print("doc_check: " + (f"{len(errors)} mismatch(es)" if errors else "manifests and docs agree"))
|
|
sys.exit(1 if errors else 0)
|