Revert "Auto mode: a triclinic winner on a centred lattice is merged on the primitive cell"

This reverts commit 1b8667e317.
This commit is contained in:
leonarski_f committed 2026-11-15 14:19:41 +01:00
1 parent c3d10e9b19
commit d08ac7f8a7
1 file changed
+3 -17
+3 -17
View File
@@ -3165,28 +3165,14 @@ bool Rugnux::ScaleMergeAndSymmetry(PipelineLocals &p) {
// search there. The enumeration is untouched, so no candidate that JUDGES another moves and
// no chi2 reference changes; the doubled setting still wins its own table, and only the cell
// its answer is expressed on is corrected.
//
// P 1 is the same case without the signal. The table has no centred setting of it, so on a
// centred lattice whose intensities carry no symmetry it wins on the centred cell itself and
// keeps the positions the centring adds as observations - measured, <I/sigma> 0.28 on them
// against 7.0 on the lattice's own nodes, half the merge noise. The lattice's centring stands
// in for the group's there.
const char indexed_centring = end_msg.rotation_lattice_type.has_value()
? end_msg.rotation_lattice_type->centering : 'P';
const bool triclinic_on_centred = sg_search.best_space_group.has_value()
&& sg_search.best_space_group->crystal_system() == gemmi::CrystalSystem::Triclinic
&& indexed_centring != 'P';
// A cell given with -C fixes the lattice, so the cell is never re-expressed on another one.
if (!commit_reindex && sg_search.best_space_group.has_value()
&& !experiment_.GetIndexingSettings().GetFixedLatticeSystem()
&& (sg_search.best_space_group->number > 1 || triclinic_on_centred)
&& sg_search.best_space_group->number > 1
&& end_msg.rotation_lattice.has_value() && end_msg.rotation_lattice_type.has_value()) {
const gemmi::SpaceGroup won = *sg_search.best_space_group;
constexpr double den3 = static_cast<double>(gemmi::Op::DEN) * gemmi::Op::DEN * gemmi::Op::DEN;
const double det = triclinic_on_centred
? 1.0 / (indexed_centring == 'F' ? 4 : indexed_centring == 'R' ? 3 : 2)
: won.basisop().det_rot() / den3;
const char centring = triclinic_on_centred ? indexed_centring : won.centring_type();
const double det = won.basisop().det_rot() / den3;
const int multiple = static_cast<int>(std::lround(1.0 / det)); // 2 for C 1 1 2_1, 4 for F 1
if (det < 0.99 && multiple >= 2 && multiple <= 4) {
// Reduce, then classify. The character table is reached through a Niggli reduction
@@ -3197,7 +3183,7 @@ bool Rugnux::ScaleMergeAndSymmetry(PipelineLocals &p) {
// too (that is how it got here), and an unrestricted search would hand it straight
// back.
const auto cand = LatticeSearchForClass(
end_msg.rotation_lattice->ToPrimitive(centring),
end_msg.rotation_lattice->ToPrimitive(won.centring_type()),
won.crystal_system(), 'P');
// Change of basis from the doubled conventional setting straight to the reduced one,
// P[i][j] = conv_real[i] . doubled_reciprocal[j], as everywhere else here - except