rugnux: emit non-standard mmCIF items under a "jfjoch" reserved prefix, not pdbx_
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m55s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m46s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m37s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m26s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m38s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m43s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m52s
Build Packages / build:windows:nocuda (push) Successful in 16m7s
Build Packages / build:windows:cuda (push) Successful in 18m11s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m59s
Build Packages / build:rpm (rocky8) (push) Successful in 11m13s
Build Packages / XDS test (durin plugin) (push) Successful in 8m13s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 59s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Successful in 12m43s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m21s
Build Packages / DIALS test (push) Successful in 14m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m14s
Build Packages / Unit tests (push) Successful in 1h13m37s
Build Packages / Unit tests (pull_request) Successful in 59m28s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 6m32s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m42s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 10m17s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 11m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 10m33s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 9m36s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m11s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m20s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 11m1s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 12m5s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m27s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 10m50s
Build Packages / DIALS test (pull_request) Successful in 12m38s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 8m23s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m22s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m13s
Build Packages / Generate python client (pull_request) Successful in 27s
Build Packages / Build documentation (pull_request) Successful in 53s
Build Packages / Create release (pull_request) Skipped
Build Packages / build:windows:nocuda (pull_request) Successful in 15m44s
Build Packages / build:windows:cuda (pull_request) Successful in 18m6s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m55s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m46s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m37s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m26s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m38s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m43s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m52s
Build Packages / build:windows:nocuda (push) Successful in 16m7s
Build Packages / build:windows:cuda (push) Successful in 18m11s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m59s
Build Packages / build:rpm (rocky8) (push) Successful in 11m13s
Build Packages / XDS test (durin plugin) (push) Successful in 8m13s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 59s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Successful in 12m43s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m16s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m21s
Build Packages / DIALS test (push) Successful in 14m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m14s
Build Packages / Unit tests (push) Successful in 1h13m37s
Build Packages / Unit tests (pull_request) Successful in 59m28s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 6m32s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m42s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 10m17s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 11m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 10m33s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 9m36s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m11s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 11m20s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 11m1s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 12m5s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 11m27s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 10m50s
Build Packages / DIALS test (pull_request) Successful in 12m38s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 8m23s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m22s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 6m13s
Build Packages / Generate python client (pull_request) Successful in 27s
Build Packages / Build documentation (pull_request) Successful in 53s
Build Packages / Create release (pull_request) Skipped
Build Packages / build:windows:nocuda (pull_request) Successful in 15m44s
Build Packages / build:windows:cuda (pull_request) Successful in 18m6s
ISa and the twinning indicators (L-test means, second moment of I) have no standard mmCIF item. They were written as _reflns.pdbx_* names, borrowing the wwPDB PDBx/mmCIF dictionary's reserved prefix and so masquerading as standard items the dictionary does not actually define. Move them to the IUCr-sanctioned local-data-name extension: a private reserved prefix on the attribute of the existing _reflns category (_reflns.jfjoch_*), matching the DDL2 pattern the spec gives for private items. Write-only tags with no reader, so this is a self-contained, back-compatible rename. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -119,8 +119,11 @@ void WriteMmcifReflections(const std::vector<MergedReflection> &reflections,
|
||||
|
||||
// ---------- merging statistics (_reflns overall + _reflns_shell loop) ----------
|
||||
// cc_half and r_meas are stored as fractions (0-1), which is the mmCIF convention. ISa (the
|
||||
// Diederichs asymptotic I/sigma, 1/b of the a*sigma^2 + (b*I)^2 error model) has no standard CIF
|
||||
// item, so it is written as a free-text pdbx value.
|
||||
// Diederichs asymptotic I/sigma, 1/b of the a*sigma^2 + (b*I)^2 error model) and the twinning
|
||||
// indicators below have no standard mmCIF item. They are written under the "jfjoch" reserved
|
||||
// prefix (_reflns.jfjoch_*), the IUCr-sanctioned local-data-name extension for private items -
|
||||
// NOT the "pdbx_" prefix, which is owned by the wwPDB PDBx/mmCIF dictionary and must not label
|
||||
// items that dictionary does not define. (The other pdbx_ items here are genuine PDBx items.)
|
||||
const auto mult = [](const MergeStatisticsShell &s) {
|
||||
return s.unique_reflections > 0 ? static_cast<double>(s.total_observations) / s.unique_reflections : 0.0; };
|
||||
const auto compl_pct = [](const MergeStatisticsShell &s) {
|
||||
@@ -137,16 +140,16 @@ void WriteMmcifReflections(const std::vector<MergedReflection> &reflections,
|
||||
out << "_reflns.pdbx_netI_over_sigmaI " << Fmt(ov.mean_i_over_sigma, 2) << "\n";
|
||||
out << "_reflns.pdbx_Rrim_I_all " << Fmt(ov.r_meas, 4) << "\n";
|
||||
out << "_reflns.pdbx_CC_half " << Fmt(ov.cc_half, 4) << "\n";
|
||||
out << "_reflns.pdbx_diffrn_ISa " << CifStr(isa) << " # asymptotic I/sigma (Diederichs)\n";
|
||||
// Twinning indicators (no standard CIF item, written as free-text pdbx values like ISa above).
|
||||
out << "_reflns.jfjoch_diffrn_ISa " << CifStr(isa) << " # asymptotic I/sigma (Diederichs)\n";
|
||||
// Twinning indicators (no standard mmCIF item; same jfjoch local prefix as ISa above).
|
||||
if (twinning.l_test_pairs > 0) {
|
||||
out << "_reflns.pdbx_L_test_mean_abs_L " << Fmt(twinning.mean_abs_l, 3)
|
||||
out << "_reflns.jfjoch_L_test_mean_abs_L " << Fmt(twinning.mean_abs_l, 3)
|
||||
<< " # Padilla-Yeates <|L|> (untwinned 0.500, perfect twin 0.375)\n";
|
||||
out << "_reflns.pdbx_L_test_mean_L_squared " << Fmt(twinning.mean_l_squared, 3)
|
||||
out << "_reflns.jfjoch_L_test_mean_L_squared " << Fmt(twinning.mean_l_squared, 3)
|
||||
<< " # <L^2> (untwinned 0.333, perfect twin 0.200)\n";
|
||||
}
|
||||
if (twinning.moment_reflections > 0)
|
||||
out << "_reflns.pdbx_second_moment_I " << Fmt(twinning.second_moment, 3)
|
||||
out << "_reflns.jfjoch_second_moment_I " << Fmt(twinning.second_moment, 3)
|
||||
<< " # <I^2>/<I>^2 (untwinned 2.00, perfect twin 1.50)\n";
|
||||
out << "#\n";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user