diff --git a/licenses/Qt6-NOTICE.txt b/licenses/Qt6-NOTICE.txt index 6a0b7bf03..527ebbf72 100644 --- a/licenses/Qt6-NOTICE.txt +++ b/licenses/Qt6-NOTICE.txt @@ -10,12 +10,18 @@ LGPL-3.0 compliance for the distributed viewer: * Qt is used as provided by The Qt Company under the LGPL-3.0 open-source terms; no Qt source code has been modified. - * The viewer links Qt dynamically. On Windows and macOS the Qt shared libraries are - deployed next to the application by windeployqt / macdeployqt; the user may therefore - replace them with a compatible build of Qt, as the LGPL requires. + * On Windows and macOS the viewer links Qt dynamically: the Qt shared libraries are + deployed next to the application by windeployqt / macdeployqt, and the user may replace + them with a compatible build of Qt, as the LGPL requires. + * The Linux build links Qt 6.11.x (currently 6.11.1) statically. As LGPL-3.0 section 4(d)(0) + provides, the user can relink the viewer with a modified Qt: the complete source of + jfjoch_viewer is distributed with Jungfraujoch, and docker/ubuntu2404/Dockerfile (with + docker/common/build-qt.sh) gives the full recipe that builds the static Qt and the viewer; + point it at the modified Qt and rebuild jfjoch_viewer. * The corresponding source code for the exact version of Qt used can be obtained from - https://download.qt.io/ (and from https://code.qt.io/). The Qt version is reported in - the viewer's Help > About dialog. + https://download.qt.io/ (the Linux build fetches + https://download.qt.io/official_releases/qt/6.11/6.11.1/single/qt-everywhere-src-6.11.1.tar.xz) + and from https://code.qt.io/. The Qt version is reported in the viewer's Help > About dialog. Full license texts: * LGPL-3.0: see licenses/Qt6-LGPL-3.0.txt (verbatim GNU Lesser General Public License v3), diff --git a/rugnux/RugnuxScaleMerge.cpp b/rugnux/RugnuxScaleMerge.cpp index 96a3b7d7d..da3719339 100644 --- a/rugnux/RugnuxScaleMerge.cpp +++ b/rugnux/RugnuxScaleMerge.cpp @@ -2836,7 +2836,11 @@ bool Rugnux::ScaleMergeAndSymmetry(PipelineLocals &p) { // answered by its having run. The two cannot disagree: the ask below only ever replaces the // answer in hand with a STRICTLY higher point group, and it writes all four commit_ values // together, so the group, the cell and the lattice type stay one answer. - if (end_msg.rotation_lattice.has_value() && end_msg.rotation_lattice_type.has_value()) { + // + // A cell given with -C fixes the crystal system, and the indexer already holds it there, so + // a higher class is never asked: the search stays within the system the cell names. + if (end_msg.rotation_lattice.has_value() && end_msg.rotation_lattice_type.has_value() + && !experiment_.GetIndexingSettings().GetFixedLatticeSystem()) { TimingMark metric_mark(logger, "metric lattice re-ask"); // The merge is indexed on the lattice the indexer named, whatever has been committed // since, so the metric is measured on the primitive form of THAT one.