diff --git a/docs/RUGNUX_REPORT.md b/docs/RUGNUX_REPORT.md index bfe6f1c9d..e7a6d5fbf 100644 --- a/docs/RUGNUX_REPORT.md +++ b/docs/RUGNUX_REPORT.md @@ -618,7 +618,8 @@ spots of further lattice domains can land on the half-integer positions too. A ` under the `SUPERCELL_POSSIBLE` flag, and the summary's `Supercell` line carries the same advice. **Both cells merged.** Where the class stands clear of the six empty ones out to the limit (in at least -three shells measured above its noise, at more than twice the strongest of them in standard errors) and +three shells where it is measured above its noise and most of its reflections are resolved from the +lattice's, at more than twice the strongest of them in standard errors) and grows significantly with resolution to a quarter of the lattice's intensity or more in the finest shell both are measured in - the half cell holds at low resolution and not at high, the shape of a pseudo-translation breaking down - the run integrates and merges the doubled cell as well, on the same @@ -626,14 +627,15 @@ orientation and geometry, and decides with both merges in hand. The size of the it - crystals deposited in the half cell carry classes as strong as one deposited in the doubled cell. The doubled cell is the answer only where, in the doubled merge, one translation - half a cell plus a small offset, fitted over the class - modulates at least half of the added class in every resolution -shell, so the two halves of the cell are one content displaced. The doubled pass runs without `--model`. A class that is there whatever the +shell, so the two halves of the cell are one content displaced - and where the doubled merge is not more +symmetric than the half cell's, which a superstructure of it cannot be. A class that is there whatever the direction (copies that differ in content, twin domains, neighbouring reflections) keeps the half cell. **`DOUBLED_CELL_ADOPTED=`** says which was written as the answer and **`DOUBLED_CELL_DECISION=`** why; **`DOUBLED_CELL_OTHER_FILE=`** names the other hypothesis's merged file (`_doubled.mtz`, or `_halfcell.mtz` where the doubled cell was adopted, with the rest of its files under the same prefix), and **`DOUBLED_CELL_OTHER_CELL=`**, **`DOUBLED_CELL_OTHER_SPACE_GROUP=`**, -**`DOUBLED_CELL_OTHER_D_MIN=`**, **`DOUBLED_CELL_OTHER_CC_HALF=`** and, where it is the probed cell and -`--model` was given, **`DOUBLED_CELL_OTHER_R_FREE=`** describe it. Compare the two in refinement. +**`DOUBLED_CELL_OTHER_D_MIN=`**, **`DOUBLED_CELL_OTHER_CC_HALF=`** and, with `--model`, +**`DOUBLED_CELL_OTHER_R_FREE=`** describe it. Compare the two in refinement. ## Further lattices diff --git a/rugnux/RugnuxPasses.cpp b/rugnux/RugnuxPasses.cpp index c8cefa501..e00a0f758 100644 --- a/rugnux/RugnuxPasses.cpp +++ b/rugnux/RugnuxPasses.cpp @@ -1658,9 +1658,7 @@ ProcessResult Rugnux::DoubledCellHypothesis(RugnuxObserver *observer, ProcessRes config_.output_prefix = base_prefix.empty() ? base_prefix : doubled_prefix; force_rotation_result_ = doubled; keep_merged_reflections_ = true; - // No model validation in this pass: a model is placed in a cell, and on a doubled cubic crystal - // (an R-centred 776 A cell) placing it took twenty minutes for a pass that decides nothing by it. - const std::string model_path = std::exchange(config_.model_path, std::string()); + // The quality guard compares a refined pass against the header pass in the same cell; this pass is // in another cell and is judged here instead. quality_guard_pass1_.reset(); @@ -1673,7 +1671,6 @@ ProcessResult Rugnux::DoubledCellHypothesis(RugnuxObserver *observer, ProcessRes } force_rotation_result_.reset(); keep_merged_reflections_ = false; - config_.model_path = model_path; config_.output_prefix = base_prefix; if (!d.has_merge_statistics || !d.consensus_cell) { logger.Warning("Doubled-cell hypothesis: the doubled cell merged nothing - the probed cell stays the answer");